Changeset 366

Timestamp:

02/23/06 20:12:37 (3 years ago)

Author:

conrad

Message:

restructure jack.c a little; add a thread for rendering for remix (currently empty)

Files:

• beatfish/trunk/src/jack.c (modified) (4 diffs)

beatfish/trunk/src/jack.c

@@ -34 +34 @@
-static RemixPCM * pcm = NULL;
-
+static const size_t sample_size = sizeof(RemixPCM);
+
+static pthread_t remix_thread_id = 0;
+
+/* Synchronization between jack thread and remix thread */
+#define DEFAULT_RB_SIZE 16384  /* ringbuffer size in frames */
+pthread_mutex_t remix_thread_lock = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t data_ready = PTHREAD_COND_INITIALIZER;
+long overruns = 0;
+
+static const char ** ports;
+
+void *
+remix_thread (void * arg)
+{
+  return 0;
+}
+
-static int
-beatfish_
+
-{
-  RemixCount length, offset;
@@ -66 +84 @@
-
-static void
-beatfish_
+
-{
-  printf ("Beatfish JACK client shut down!\n");
@@ -72 +90 @@
-}
-
+static void
+setup_remix_thread (void)
+{
+  pthread_create (&remix_thread_id, NULL, remix_thread, NULL);
+}
+
+static void
+run_remix_thread (void)
+{
+  pthread_join (remix_thread_id, NULL);
+}
+
-void
-jack (char * client_name
+ports (jack_client_t * client
-{
-  jack_client_t * client;
-  const char ** ports;
-
-  if ((client = jack_client_new (client_name)) == 0) {
-    fprintf (stderr, "%s: Could not connect to Jack server\n",
-             progname);
-    exit (1);
-  }
-
-  jack_set_process_callback (client, beatfish_process, 0);
-
-  jack_on_shutdown (client, beatfish_shutdown, 0);
-
-  remix_set_samplerate (remix, jack_get_sample_rate(client));
-
-  output_port = jack_port_register (client, "output",
-                                    JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput,
-                                    0);
-
-  jack_activate (client);
-
-  if ((ports = jack_get_ports (client, NULL, NULL,
-                               JackPortIsPhysical|JackPortIsInput)) == NULL) {
@@ -109 +118 @@
-    fprintf (stderr, "Cannot connect output port 1\n");
-  }
+}
+
+void
+setup_jack (char * client_name)
+{
+  jack_client_t * client;
+
+  if ((client = jack_client_new (client_name)) == 0) {
+    fprintf (stderr, "%s: Could not connect to Jack server\n",
+             progname);
+    exit (1);
+  }
+
+  setup_remix_thread ();
+
+  jack_set_process_callback (client, process, 0);
+
+  jack_on_shutdown (client, shutdown, 0);
+
+  remix_set_samplerate (remix, jack_get_sample_rate(client));
+
+  output_port = jack_port_register (client, "output",
+                                    JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput,
+                                    0);
+
+  jack_activate (client);
+
+  setup_ports (client);
+
+  run_remix_thread ();
-
-  free (ports);