diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
| commit | 64dc5427e4f5339a16a018692dd94f476c53cae9 (patch) | |
| tree | 83b76bb578698dbfcde040aa9013a7351190a9b5 /gtk2_ardour/midi_region_view.cc | |
| parent | d7de23db0f325aaa1dd573739bc9e33925ebdfce (diff) | |
make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_region_view.cc')
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 4760bf593b..6ebee3ec24 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -201,13 +201,13 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) } group->raise_to_top(); - group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false); + group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false); midi_view()->signal_channel_mode_changed().connect( - mem_fun(this, &MidiRegionView::midi_channel_mode_changed)); + sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed)); midi_view()->signal_midi_patch_settings_changed().connect( - mem_fun(this, &MidiRegionView::midi_patch_settings_changed)); + sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed)); } bool @@ -1072,7 +1072,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv) } } - ghost->GoingAway.connect (mem_fun(*this, &MidiRegionView::remove_ghost)); + ghost->GoingAway.connect (sigc::mem_fun(*this, &MidiRegionView::remove_ghost)); return ghost; } @@ -1153,7 +1153,7 @@ MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note) const double note_length_beats = (note->off_event().time() - note->on_event().time()); nframes_t note_length_ms = beats_to_frames(note_length_beats) * (1000 / (double)route_ui->session().nominal_frame_rate()); - Glib::signal_timeout().connect(bind(mem_fun(this, &MidiRegionView::play_midi_note_off), note), + Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(this, &MidiRegionView::play_midi_note_off), note), note_length_ms, G_PRIORITY_DEFAULT); } |