Changeset 265 for trunk

Timestamp:

08/18/08 14:42:40 (4 years ago)

Author:

ath

Message:

Add an option to disable the use of FmEffectRubber? in FmInputCdj.

Files:

• trunk/fm_server/src/fm_input_cdj.c (modified) (4 diffs)

trunk/fm_server/src/fm_input_cdj.c

@@ -40 +40 @@
 #include "fm_song_db/fm_song_db.h"
 #include "fm_input_cdj.h"
+
+
+#undef USE_PITCH
+
 
 extern FmSongDB *global_song_db;
@@ -194 +198 @@
         static gint serial = 0;
         input_cdj->input = fm_input_gst_new ();
+        g_object_set_data (G_OBJECT (input_cdj->input), "name", g_strdup_printf ("input%d", serial));
+
+#ifdef USE_PITCH
         input_cdj->rate = fm_effect_rubber_new ();
-        g_object_set_data (G_OBJECT (input_cdj->input), "name", g_strdup_printf ("input%d", serial));
         g_object_set_data (G_OBJECT (input_cdj->rate), "name", g_strdup_printf ("rubber%d", serial));
-        serial++;
-
         fm_element_connect_src (FM_ELEMENT (input_cdj->rate), FM_ELEMENT (input_cdj->input));
+#endif
+
+serial++;
 
         rgc_signal_catch (G_OBJECT(input_cdj->input), "state_changed", rgc_marshal_VOID__INT,
@@ -260 +267 @@
         fm_pipeline_add_element (element->pipeline, FM_ELEMENT (input_cdj->input));
 
+#ifdef USE_PITCH
         fm_element_activate (FM_ELEMENT (input_cdj->rate));
+#else
+        fm_element_activate (FM_ELEMENT (input_cdj->input));
+#endif
         
         rgc_signal_change_owner (input_cdj->input, input_cdj, "tick");
@@ -303 +314 @@
 //      g_print ("We're at bar %d, beat %d, ns %lf, next beat in %d samples\n", sync->bar, sync->beat, sync->beat_offset_ns, next_beat_offset);
 
-        
+#ifdef USE_PITCH
         fm_element_get_buffer (FM_ELEMENT (input_cdj->rate), buffer, sync);
-//      fm_element_get_buffer (FM_ELEMENT (input_cdj->input), buffer, sync);
+#else
+        fm_element_get_buffer (FM_ELEMENT (input_cdj->input), buffer, sync);
+#endif
 //      g_print ("went %lld nsec ahead\n", (long long int) FM_BUFFER_DURATION (buffer));