Remove unnecessary c interface funcs. Fix volume text failing to update

diff --git a/channel.py b/channel.py
index 23947b2eedbaf3d9bd2b0c64a3e108a0c8482896..fffc3b7dad33e3839b43a5cafb06f44780454253 100644 (file)
--- a/channel.py
+++ b/channel.py
@@ -117,6 +117,7 @@ class Channel(Gtk.VBox, SerializedObject):
             self.channel.out_mute = self.future_out_mute
 
         self.slider_adjustment.connect("volume-changed", self.on_volume_changed)
+        self.slider_adjustment.connect("volume-changed-from-midi", self.on_volume_changed_from_midi)
         self.balance_adjustment.connect("balance-changed", self.on_balance_changed)
 
         self.slider = None
@@ -327,8 +328,6 @@ class Channel(Gtk.VBox, SerializedObject):
         if update_engine:
             if not from_midi:
                 self.channel.volume = db
-            else:
-                self.channel.set_volume_from_midi(db)
             self.app.update_monitor(self)
 
     def on_volume_changed(self, adjustment):
@@ -343,12 +342,6 @@ class Channel(Gtk.VBox, SerializedObject):
         self.channel.balance = balance
         self.app.update_monitor(self)
 
-    def on_volume_changed_from_midi(self, adjustment):
-        balance = self.balance_adjustment.get_value()
-        log.debug("%s balance from midi: %f", self.channel_name, balance)
-        self.channel.set_balance_from_midi(balance)
-        self.app.update_monitor(self)
-
     def on_key_pressed(self, widget, event):
         if (event.keyval == Gdk.KEY_Up):
             log.debug(self.channel_name + " Up")

diff --git a/jack_mixer_c.c b/jack_mixer_c.c
index 43ed8441ce86b11319600f5bd9c08b9e9ff77f15..1ba9b08916e65e53afd517ddb4c212b503e7600f 100644 (file)
--- a/jack_mixer_c.c
+++ b/jack_mixer_c.c
@@ -594,34 +594,6 @@ Channel_autoset_solo_midi_cc(ChannelObject *self, PyObject *args)
        return Py_None;
 }
 
-static int
-Channel_set_volume_from_midi(ChannelObject *self, PyObject *args)
-{
-       double value;
-
-       if (! PyArg_ParseTuple(args, "f", &value)) return NULL;
-       if (self->channel == NULL) {
-               PyErr_SetString(PyExc_RuntimeError, "unitialized channel");
-               return -1;
-       }
-       channel_volume_write(self->channel, value);
-       return 0;
-}
-
-static int
-Channel_set_balance_from_midi(ChannelObject *self, PyObject *args)
-{
-       double value;
-
-       if (! PyArg_ParseTuple(args, "f", &value)) return NULL;
-       if (self->channel == NULL) {
-               PyErr_SetString(PyExc_RuntimeError, "unitialized channel");
-               return -1;
-       }
-       channel_balance_write(self->channel, value);
-       return 0;
-}
-
 static PyMethodDef channel_methods[] = {
        {"remove", (PyCFunction)Channel_remove, METH_VARARGS, "Remove"},
        {"autoset_volume_midi_cc",
@@ -632,10 +604,6 @@ static PyMethodDef channel_methods[] = {
                (PyCFunction)Channel_autoset_mute_midi_cc, METH_VARARGS, "Autoset Mute MIDI CC"},
        {"autoset_solo_midi_cc",
                (PyCFunction)Channel_autoset_solo_midi_cc, METH_VARARGS, "Autoset Solo MIDI CC"},
-       {"set_volume_from_midi",
-               (PyCFunction)Channel_set_volume_from_midi, METH_VARARGS, "Set Volume From MIDI"},
-       {"set_balance_from_midi",
-               (PyCFunction)Channel_set_volume_from_midi, METH_VARARGS, "Set Balance From MIDI"},
        {NULL}
 };
 

diff --git a/slider.py b/slider.py
index 89f271685ab06713222fd8b8de83e077330896b0..e4dd015b90cde24f69921f16cc544adf23d0bd81 100644 (file)
--- a/slider.py
+++ b/slider.py
@@ -87,8 +87,6 @@ class BalanceAdjustment(Gtk.Adjustment):
         self.disable_value_notify = False
         if not from_midi:
             self.emit("balance-changed")
-        else:
-            self.emit("balance-changed-from-midi")
 
     def on_value_changed(self, adjustment):
         if not self.disable_value_notify:
@@ -97,10 +95,6 @@ class BalanceAdjustment(Gtk.Adjustment):
 GObject.signal_new("balance-changed", BalanceAdjustment,
                    GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION, None, [])
 
-GObject.signal_new("balance-changed-from-midi", BalanceAdjustment,
-                   GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION, None, [])
-
-
 class GtkSlider(Gtk.VScale):
     def __init__(self, adjustment):
         Gtk.VScale.__init__(self)#, adjustment)