Changeset 120

Timestamp:

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

Author:

ath

Message:

Improve FmDJMixer.

Files:

• fm_gui/trunk/src/fm_djmixer_gui.c (modified) (4 diffs)
• fm_gui/trunk/src/fm_djmixer_gui.h (modified) (1 diff)
• fm_server/trunk/src/fm_djmixer.c (modified) (7 diffs)
• fm_server/trunk/src/fm_level_meter.c (modified) (4 diffs)
• fm_server/trunk/src/fm_level_meter.h (modified) (2 diffs)

fm_gui/trunk/src/fm_djmixer_gui.c

@@ -23 +23 @@
 static void fm_djmixer_gui_chan_vscale_fader_value_changed      (GtkRange        *range,
                                          gpointer       user_data);
+static void fm_djmixer_gui_dial_master_level_value_changed (GtkAdjustment        *adj,
+                                         gpointer       user_data);
 static void fm_djmixer_gui_level_changed_cb                     (RgcRemoteObject *obj,
-                                                 guint          port_n,
+                                                 gint           port_n,
                                                  gfloat         level_l,
                                                  gfloat         level_r,
@@ -93 +95 @@
 
         gui->dial_master_level = glade_xml_get_widget(gui->xml_mixer, "dial_master_level");
+        gui->dial_master_level_adj = gtk_tx_dial_get_adjustment (GTK_TX_DIAL (gui->dial_master_level));
         gui->dial_cue_level = glade_xml_get_widget(gui->xml_mixer, "dial_cue_level");
+        gui->dial_cue_level_adj = gtk_tx_dial_get_adjustment (GTK_TX_DIAL (gui->dial_cue_level));
         gui->flash_master = glade_xml_get_widget(gui->xml_mixer, "flash_master");
+
+        g_signal_connect (gui->dial_master_level_adj, "value-changed", G_CALLBACK(fm_djmixer_gui_dial_master_level_value_changed), gui);
 
         fm_djmixer_gui_add_channel (gui, 0);
@@ -160 +166 @@
 
 static void
+fm_djmixer_gui_dial_master_level_value_changed (GtkAdjustment    *adj,
+                                         gpointer       user_data)
+{
+        FmDJMixerGui *gui = (FmDJMixerGui *) user_data;
+        FmDJMixerData *mixer_data = (FmDJMixerData *) gui->client;
+
+        gdouble orig_value = gtk_adjustment_get_value (adj);
+        gdouble value = orig_value + 1;
+        g_print("fm_djmixer_gui_dial_master_level_changed %f\n", value);
+
+        GValue *p = g_value_init_int (-1);
+        GValue *val = g_value_init_double (value);
+        rgc_remote_object_call (mixer_data->element, "set_gain", p, val, NULL);
+        g_value_destroy (val);
+}
+
+
+static void
 fm_djmixer_gui_level_changed_cb                 (RgcRemoteObject *obj,
-                                                 guint          port_n,
+                                                 gint           port_n,
                                                  gfloat         level_l,
                                                  gfloat         level_r,
@@ -167 +191 @@
 {
         FmDJMixerGui *gui = (FmDJMixerGui *) user_data;
-        FmDJMixerGuiChannel *chan = (FmDJMixerGuiChannel *) g_list_nth_data (gui->channels, port_n);
-
-        gtk_tx_flash_set_level (GTK_WIDGET(chan->flash_level), level_l, level_r);
-}
+
+        GtkWidget *flash;
+        if (port_n > -1) {
+                FmDJMixerGuiChannel *chan = (FmDJMixerGuiChannel *) g_list_nth_data (gui->channels, port_n);
+                flash = chan->flash_level;
+        } else if (port_n == -1) {
+                flash = gui->flash_master;
+        } else {
+                g_warning ("Unknown channel %d", port_n);
+                return;
+        }
+
+        gtk_tx_flash_set_level (flash, level_l, level_r);
+}

fm_gui/trunk/src/fm_djmixer_gui.h

@@ -28 +28 @@
 
         GtkWidget *dial_master_level;
+        GtkAdjustment   *dial_master_level_adj;
         GtkWidget *dial_cue_level;
+        GtkAdjustment   *dial_cue_level_adj;
         GtkWidget *flash_master;
         

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);
 }

fm_server/trunk/src/fm_level_meter.c

@@ -30 +30 @@
 #include "fm_buffer.h"
 #include "fm_element.h"
-//#include "fm_input.h"
 #include "fm_effect.h"
 #include "fm_level_meter.h"
@@ -118 +117 @@
         g_print ("Activating level meter...\n");
 
-        meter->last_values = g_new0(gfloat, FM_CHANNELS_STEREO);
         meter->current_values = g_new0(gfloat, FM_CHANNELS_STEREO);
         
@@ -134 +132 @@
         fm_element_get_buffer_from_src (element, buffer);
 
+        meter->sample_count += buffer->requested_samples;
+
         guint i, m;
-        gboolean changed = FALSE;
+        gboolean nonzero = FALSE;
         for (i = 0; i < FM_CHANNELS_STEREO; i++) {
                 meter->current_values[i] = 0.0;
@@ -141 +141 @@
                         if (buffer->channel_data[i][m] > meter->current_values[i]) {
                                 meter->current_values[i] = buffer->channel_data[i][m];
-                                changed = TRUE;
+                                nonzero = TRUE;
                         }
         }
 
-        if (changed) {
-                for (i = 0; i < FM_CHANNELS_STEREO; i++)
-                        meter->last_values[i] = meter->current_values[i];
+        if (nonzero)
+                meter->zero_count = 0;
+        else
+                meter->zero_count++;
+
+        if (meter->zero_count > ZERO_N)
+                return;
+
+        if (meter->sample_count > SIGNAL_EVERY_N_SAMPLES) {
+                meter->sample_count = 0;
 
                 GValue *val1 = g_value_init_float (meter->current_values[0]);

fm_server/trunk/src/fm_level_meter.h

@@ -30 +30 @@
 #define FM_LEVEL_METER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), FM_TYPE_LEVEL_METER, FmLevelMeterClass))
 
+
+#define ZERO_N 1000
+#define SIGNAL_EVERY_N_SAMPLES 2000
+
 typedef struct _FmLevelMeter FmLevelMeter;
 typedef struct _FmLevelMeterClass FmLevelMeterClass;
@@ -37 +41 @@
         FmEffect effect;
         
-        gfloat *last_values;
+        //gfloat *last_values;
         gfloat *current_values;
+
+        guint zero_count;
+        guint sample_count;
 };