Changeset 120 for fm_server/trunk/src/fm_djmixer.c

Timestamp:

09/09/06 22:44:03 (6 years ago)

Author:

ath

Message:

Improve FmDJMixer.

Files:

• fm_server/trunk/src/fm_djmixer.c (modified) (7 diffs)

fm_server/trunk/src/fm_djmixer.c

@@ -16 +16 @@
 static void fm_djmixer_class_init       (FmDJMixerClass *class);
 static void fm_djmixer_init             (FmDJMixer      *mixer);
+static void fm_djmixer_master_level_changed (GObject    *instance,
+                                         gfloat         level_l,
+                                         gfloat         level_r,
+                                         gpointer       user_data);
 static void fm_djmixer_connect_src      (FmElement      *element,
                                          FmElement      *src);
@@ -22 +26 @@
                                          FmBuffer       *buffer);
 static void fm_djmixer_set_gain         (FmDJMixer      *djm,
-                                         guint          port_n,
+                                         gint           port_n,
                                          gdouble        value);
 static void fm_djmixer_set_pan          (FmDJMixer      *djm,
@@ -128 +132 @@
         fm_element_connect_src (FM_ELEMENT (djm->master_level), FM_ELEMENT (djm->master_gain));
         fm_element_connect_src (FM_ELEMENT (djm->master_gain), FM_ELEMENT (djm->mixer));
+        rgc_signal_catch (G_OBJECT(djm->master_level), "level_changed", rgc_marshal_VOID__FLOAT_FLOAT,
+                          G_CALLBACK(fm_djmixer_master_level_changed), djm);
 }
 
@@ -160 +166 @@
 
 
+static void
+fm_djmixer_master_level_changed         (GObject        *instance,
+                                         gfloat         level_l,
+                                         gfloat         level_r,
+                                         gpointer       user_data)
+{
+        FmDJMixer *djm = FM_DJMIXER (user_data);
+        
+        GValue *ch = g_value_init_int (-1);
+        GValue *val1 = g_value_init_float (level_l);
+        GValue *val2 = g_value_init_float (level_r);
+        rgc_signal_emit (djm, "level_changed", ch, val1, val2, NULL);
+        g_value_destroy (ch);
+        g_value_destroy (val1);
+        g_value_destroy (val2); 
+}
+
+
 
 static void
@@ -192 +216 @@
 static void
 fm_djmixer_set_gain                     (FmDJMixer      *djm,
+                                         gint           port_n,
+                                         gdouble        value)
+{
+        FmEffectGain *gain;
+
+        if (port_n > -1) {
+                g_return_if_fail (port_n < djm->total_ports);
+                FmDJMixerChannel *chan = djm->channels[port_n];
+                g_return_if_fail (chan);
+                gain = chan->gain;
+        } else if (port_n == -1) {
+                gain = djm->master_gain;
+        } else
+                g_warning ("Unknown port %d", port_n);
+
+        fm_effect_gain_set_gain (gain, value);
+}
+
+
+static void
+fm_djmixer_set_pan                      (FmDJMixer      *djm,
                                          guint          port_n,
                                          gdouble        value)
@@ -200 +245 @@
         g_return_if_fail (chan);
 
-        fm_effect_gain_set_gain (chan->gain, value);
-}
-
-
-static void
-fm_djmixer_set_pan                      (FmDJMixer      *djm,
+        fm_effect_pan_set_pan (chan->pan, value);
+}
+
+
+static void
+fm_djmixer_set_fader                    (FmDJMixer      *djm,
                                          guint          port_n,
                                          gdouble        value)
@@ -214 +259 @@
         g_return_if_fail (chan);
 
-        fm_effect_pan_set_pan (chan->pan, value);
-}
-
-
-static void
-fm_djmixer_set_fader                    (FmDJMixer      *djm,
-                                         guint          port_n,
-                                         gdouble        value)
-{
-        g_return_if_fail (port_n < djm->total_ports);
-
-        FmDJMixerChannel *chan = djm->channels[port_n];
-        g_return_if_fail (chan);
-
         fm_effect_gain_set_gain (chan->fader, value);
 }