Changeset 196

Timestamp:

01/16/08 13:40:36 (4 years ago)

Author:

ath

Message:

Fixes for FmElement's new API.

Location:

fm_server/trunk/src

Files:

• fm_djmixer.c (modified) (4 diffs)
• fm_input_cdj.c (modified) (6 diffs)
• fm_mixer.c (modified) (2 diffs)
• fm_mixer.h (modified) (1 diff)

fm_server/trunk/src/fm_djmixer.c

@@ -47 +47 @@
 static gboolean fm_djmixer_activate     (FmElement      *element);
 static void fm_djmixer_get_buffer       (FmElement      *element,
-                                         FmBuffer       *buffer);
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync);
 static void fm_djmixer_set_gain         (FmDJMixer      *djm,
                                          gint           port_n,
@@ -57 +58 @@
                                          guint          port_n,
                                          gdouble        value);
+static void fm_djmixer_become_sync_ref  (FmElement      *element,
+                                         FmSync         *sync);
 
 
@@ -132 +135 @@
         element_class->activate = fm_djmixer_activate;
         element_class->get_buffer = fm_djmixer_get_buffer;
+        element_class->become_sync_ref = fm_djmixer_become_sync_ref;
 }
 
@@ -299 +303 @@
 static void
 fm_djmixer_get_buffer                   (FmElement      *element,
-                                         FmBuffer       *buffer)
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync)
 {
         FmDJMixer *djm = FM_DJMIXER (element);
 
-        fm_element_get_buffer (FM_ELEMENT (djm->master_level), buffer);
-}
+        fm_element_get_buffer (FM_ELEMENT (djm->master_level), buffer, element->sync_ref);
+}
+
+
+static void
+fm_djmixer_become_sync_ref              (FmElement      *element,
+                                         FmSync         *sync)
+{
+        FmDJMixer *djm = FM_DJMIXER (element);
+
+        g_print ("FmDJMixer has become sync ref!\n");
+
+        FmElement *mixer_el = FM_ELEMENT (djm->mixer);
+        mixer_el->sync_ref = sync;
+}

fm_server/trunk/src/fm_input_cdj.c

@@ -64 +64 @@
 FmInputState fm_input_cdj_get_state     (FmInput        *input);
 static void fm_input_cdj_update_bpm     (FmInputCDJ     *input_cdj);
-static void fm_input_cdj_become_sync_master (FmElement  *element);
+static void fm_input_cdj_become_sync_master (FmElement  *element,
+                                         FmSync         *sync);
 static void fm_input_cdj_get_buffer     (FmElement      *element,
-                                         FmBuffer       *buffer);
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync);
 static void fm_input_cdj_input_state_changed_cb (FmInput *input,
                                          FmInputState   state,
@@ -277 +279 @@
 
 static void
-fm_input_cdj_become_sync_master         (FmElement      *element)
-{
-#define BPM 120
+fm_input_cdj_become_sync_master         (FmElement      *element,
+                                         FmSync         *sync)
+{
         g_print ("FmInputCDJ has become sync master!\n");
 
-        FmSync *sync = fm_element_pipeline_get_sync_info (element);
-
-        sync->bpm = BPM;
+        sync->in_use = TRUE;
+
+        sync->bpm = 120.0;
         sync->beat_per_bar = 4;
 }
@@ -291 +293 @@
 static void
 fm_input_cdj_get_buffer                 (FmElement      *element,
-                                         FmBuffer       *buffer)
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync)
 {
         FmInputCDJ *input_cdj = FM_INPUT_CDJ (element);
@@ -300 +303 @@
 
         
-        fm_element_get_buffer (FM_ELEMENT (input_cdj->rate), buffer);
+//      fm_element_get_buffer (FM_ELEMENT (input_cdj->rate), buffer, sync);
+        fm_element_get_buffer (FM_ELEMENT (input_cdj->input), buffer, sync);
+//      g_print ("went %lld nsec ahead\n", (long long int) FM_BUFFER_DURATION (buffer));
 
         //g_print ("Used %d samples\n", fm_effect_rate_input_frames_used (input_cdj->rate));
 
-//      if (fm_element_is_sync_master (element))
-//              fm_sync_master_played_samples (sync, fm_effect_rate_input_frames_used (input_cdj->rate));
+
+
+        if (fm_element_is_sync_master (element)) {
+                if (FM_BUFFER_DISCONT (buffer)) {
+                        g_print ("**************************************************************************************************\n");
+                        g_print ("DISCONT buffer! new pos %llu\n", (long long unsigned int) FM_BUFFER_TIMESTAMP (buffer));
+                        fm_sync_set (sync, 0, FM_BUFFER_TIMESTAMP (buffer));
+                        FM_BUFFER_DISCONT (buffer) = FALSE;
+                } else {
+                        fm_sync_master_played_ns (sync, FM_BUFFER_DURATION (buffer));
+                        fm_sync_update_cycle (sync);
+                }
+
+                if (FM_BUFFER_DURATION (buffer) > 0)
+                        fm_sync_show_pos (sync);
+        }
 }
 
@@ -453 +472 @@
                                          gint           value)
 {
-#define SAMPLES_FOR_UNIT 10000
+#define NSECS_FOR_UNIT (1000L * 1000 * 100)
 
         g_print ("A seek button pressed while ");
@@ -465 +484 @@
         g_return_if_fail (value != 0);
 
-        glong offset = value * SAMPLES_FOR_UNIT;
+        gint64 offset = value * NSECS_FOR_UNIT;
         fm_input_gst_seek_relative (input_cdj->input, offset);
 }

fm_server/trunk/src/fm_mixer.c

@@ -222 +222 @@
 void
 fm_mixer_get_buffer                     (FmElement      *element,
-                                         FmBuffer       *buffer)
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync)
 {
         FmMixer *mixer = FM_MIXER (element);
@@ -236 +237 @@
         GList *port = element->sink_ports;
         gint i = 0;
+
+//g_print("%p\n", element->sync_ref);
+
+        if (element->peer_sync_master) {
+                FM_BUFFER_REQUESTED (mixer->buffers[i]) = FM_BUFFER_REQUESTED (buffer);
+                
+                fm_element_get_buffer (element->peer_sync_master, mixer->buffers[i++], sync);
+        }
+
         while (port) {
                 FmElementSinkPort *our_port = (FmElementSinkPort *) port->data;
                 FmElementSrcPort *peer_port = our_port->peer;
 
+                if (element->peer_sync_master == peer_port->owner)
+                        continue;
+
                 FM_BUFFER_REQUESTED (mixer->buffers[i]) = FM_BUFFER_REQUESTED (buffer);
 //              g_print("i %d\n", i);
-                fm_element_get_buffer (FM_ELEMENT (peer_port->owner), mixer->buffers[i++]);
+                fm_element_get_buffer (FM_ELEMENT (peer_port->owner), mixer->buffers[i++], sync);
 
                 port = g_list_next (port);

fm_server/trunk/src/fm_mixer.h

@@ -70 +70 @@
 void
 fm_mixer_get_buffer                     (FmElement      *element,
-                                         FmBuffer       *buffer);
+                                         FmBuffer       *buffer,
+                                         FmSync         *sync);