diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-09-26 18:24:59 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-09-26 18:24:59 +0000 |
commit | 4b233612261e2d13ebbd1931f4d999c6da1451e9 (patch) | |
tree | e2b0cbcb2c870a2197a0c065c5d451a85c055d7d /gtk2_ardour/editor_rulers.cc | |
parent | 08d33fcb0d35b6448ac1b5a4bcc54095cacbfccd (diff) |
continuing fixes to get this shibboleth to compile
git-svn-id: svn://localhost/trunk/ardour2@43 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
-rw-r--r-- | gtk2_ardour/editor_rulers.cc | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 21adb46bce..397af41b98 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -89,25 +89,25 @@ Editor::initialize_rulers () ruler_shown[ruler_metric_frames] = false; ruler_shown[ruler_metric_minsec] = false; - smpte_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - bbt_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - frames_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - minsec_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - - smpte_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - bbt_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - frames_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - minsec_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - - smpte_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - bbt_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - frames_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - minsec_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); + smpte_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + bbt_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + frames_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + minsec_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + + smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + frames_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + minsec_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + + smpte_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + bbt_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + frames_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + minsec_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - smpte_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - bbt_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - frames_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - minsec_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + smpte_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); visible_timebars = 7; /* 4 here, 3 in time_canvas */ ruler_pressed_button = 0; @@ -552,25 +552,25 @@ Editor::update_ruler_visibility () gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]); - smpte_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - bbt_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - frames_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - minsec_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - - smpte_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - bbt_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - frames_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - minsec_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); - - smpte_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - bbt_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - frames_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); - minsec_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); + smpte_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + bbt_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + frames_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + minsec_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + + smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + frames_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + minsec_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); + + smpte_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + bbt_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + frames_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); + minsec_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - smpte_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - bbt_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - frames_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - minsec_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + smpte_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); if (ruler_shown[ruler_metric_minsec]) { |