diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 15:48:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 15:48:24 +0000 |
| commit | 67e21fd82ee3a2bf326b652b99484941bbb7efbb (patch) | |
| tree | a1f13e395fc89e825e2c01a4ab9f90c1726fc71e /gtk2_ardour/mixer_strip.cc | |
| parent | 10e12dc28774afa92ce64ebc76d9b3a55dd81c91 (diff) | |
add MIDI input control column to editor route list; tweak SVG for MIDI not DIN
git-svn-id: svn://localhost/ardour2/branches/3.0@9779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 4211e30953..fe9ad7d1c6 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -409,10 +409,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) midi_input_enable_button->set_image (*img); midi_input_enable_button->signal_toggled().connect (sigc::mem_fun (*this, &MixerStrip::midi_input_toggled)); ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input")); + } else { + input_button_box.remove (*midi_input_enable_button); } /* get current state */ midi_input_status_changed (); input_button_box.pack_start (*midi_input_enable_button, false, false); + /* follow changes */ + midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context()); } else { if (midi_input_enable_button) { /* removal from the container will delete it */ @@ -1807,7 +1811,6 @@ MixerStrip::on_key_press_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_press (&fake); return true; break; @@ -1860,7 +1863,6 @@ MixerStrip::on_key_release_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_release (&fake); return true; break; @@ -1931,7 +1933,6 @@ MixerStrip::midi_input_status_changed () if (midi_input_enable_button) { boost::shared_ptr<MidiTrack> mt = midi_track (); assert (mt); - cerr << "track input active? " << mt->input_active() << endl; midi_input_enable_button->set_active (mt->input_active ()); } } |