diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-04-20 22:33:13 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-04-20 22:33:13 +0000 |
| commit | e8c2b6f371b1d01f208bce8f831a82f9668f3e60 (patch) | |
| tree | 172b21ea0eb6068733450758cbd38ae7699b73f7 /gtk2_ardour/midi_time_axis.cc | |
| parent | 20cfa08aeac02b6bd743fa1517a2cc90ff175cc0 (diff) | |
* made notes whose channel is not selected in the track appear gray, see http://www.flickr.com/photos/24012642@N02/2429528120/
git-svn-id: svn://localhost/ardour2/branches/3.0@3272 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 3ad66f4b9f..a199d2e676 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -91,7 +91,7 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar , _note_mode_item(NULL) , _percussion_mode_item(NULL) , _midi_expander("MIDI") - , _channel_selector(0) + , _channel_selector(0xFFFF) { subplugin_menu.set_name ("ArdourContextMenu"); @@ -137,15 +137,14 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar _view->attach (); } - // add channel selector - _channel_selector = manage(new MidiMultipleChannelSelector(0xFFFF)); + // add channel selector expander HBox *channel_selector_box = manage(new HBox()); - channel_selector_box->pack_start(*_channel_selector, SHRINK, 0); + channel_selector_box->pack_start(_channel_selector, SHRINK, 0); _midi_expander.add(*channel_selector_box); _midi_expander.property_expanded().signal_changed().connect( mem_fun(this, &MidiTimeAxisView::channel_selector_toggled)); controls_vbox.pack_end(_midi_expander, SHRINK, 0); - _channel_selector->selection_changed.connect( + _channel_selector.selection_changed.connect( mem_fun(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mask)); } @@ -389,7 +388,6 @@ void MidiTimeAxisView::channel_selector_toggled() { static TimeAxisView::TrackHeight previous_height; - assert(_channel_selector); if(_midi_expander.property_expanded()) { previous_height = height_style; @@ -401,3 +399,5 @@ MidiTimeAxisView::channel_selector_toggled() } } + + |