diff options
| author | David Robillard <d@drobilla.net> | 2009-02-16 05:13:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-16 05:13:05 +0000 |
| commit | 458c588e2c7dfe7c0e62647fb5e0d0c06cdf8f04 (patch) | |
| tree | 32ebd393dd6aae397a1e272ec51a6e2d548b704b /gtk2_ardour/midi_time_axis.cc | |
| parent | fb254fb2fc89f89142a2c991d9b09364ca1dac02 (diff) | |
Don't bind playlist_modified with a shared_ptr<Playlist> parameter.
Clean up.
git-svn-id: svn://localhost/ardour2/branches/3.0@4599 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 2c852fb211..3df63d11f7 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -88,7 +88,8 @@ using namespace Editing; static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 162; static const uint32_t KEYBOARD_MIN_HEIGHT = 140; -MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas) +MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, + boost::shared_ptr<Route> rt, Canvas& canvas) : AxisView(sess) // virtually inherited , RouteTimeAxisView(ed, sess, rt, canvas) , _ignore_signals(false) @@ -150,10 +151,9 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar MIDI::Name::MidiPatchManager& patch_manager = MIDI::Name::MidiPatchManager::instance(); - for (MIDI::Name::MasterDeviceNames::Models::const_iterator model = patch_manager.all_models().begin(); - model != patch_manager.all_models().end(); - ++model) { - _model_selector.append_text(model->c_str()); + MIDI::Name::MasterDeviceNames::Models::const_iterator m = patch_manager.all_models().begin(); + for (; m != patch_manager.all_models().end(); ++m) { + _model_selector.append_text(m->c_str()); } _model_selector.signal_changed().connect(mem_fun(*this, &MidiTimeAxisView::model_changed)); @@ -178,7 +178,8 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar boost::shared_ptr<MidiDiskstream> diskstream = midi_track()->midi_diskstream(); // restore channel selector settings - _channel_selector.set_channel_mode(diskstream->get_channel_mode(), diskstream->get_channel_mask()); + _channel_selector.set_channel_mode(diskstream->get_channel_mode(), + diskstream->get_channel_mask()); _channel_selector.mode_changed.connect( mem_fun(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mode)); @@ -207,7 +208,8 @@ void MidiTimeAxisView::model_changed() _custom_device_mode_selector.clear_items(); - for (std::list<std::string>::const_iterator i = device_modes.begin(); i != device_modes.end(); ++i) { + for (std::list<std::string>::const_iterator i = device_modes.begin(); + i != device_modes.end(); ++i) { cerr << "found custom device mode " << *i << " thread_id: " << pthread_self() << endl; _custom_device_mode_selector.append_text(*i); } @@ -217,7 +219,8 @@ void MidiTimeAxisView::model_changed() void MidiTimeAxisView::custom_device_mode_changed() { - _midi_patch_settings_changed.emit(_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text()); + _midi_patch_settings_changed.emit(_model_selector.get_active_text(), + _custom_device_mode_selector.get_active_text()); } MidiStreamView* @@ -556,6 +559,3 @@ MidiTimeAxisView::route_active_changed () } } - - - |