diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-07 17:40:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-07 17:40:05 +0000 |
| commit | f6e67fa3dd7ddbb2315887af37a7cb20c3e8157f (patch) | |
| tree | cb2d583c7a21369a73e9d717e91714c6a683ddc6 /gtk2_ardour/audio_clock.cc | |
| parent | be1abb12ffcd8ded8638742e96ac60d754dac8f5 (diff) | |
allow mode changes in the time info box, all synced
git-svn-id: svn://localhost/ardour2/branches/3.0@9681 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 83a0b8719b..40ff8f3f14 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -917,8 +917,6 @@ AudioClock::button_press (GdkEventButton *ev, CairoCell* cell) bool AudioClock::button_release (GdkEventButton *ev, CairoCell* cell) { - cerr << "button press, cell = " << cell << endl; - if (dragging) { gdk_pointer_ungrab (GDK_CURRENT_TIME); dragging = false; @@ -950,7 +948,7 @@ AudioClock::button_release (GdkEventButton *ev, CairoCell* cell) bool AudioClock::scroll (GdkEventScroll *ev, CairoCell* cell) { - if (_session == 0) { + if (_session == 0 || !editable) { return false; } @@ -1745,11 +1743,9 @@ AudioClock::connect_signals () { disconnect_signals (); - if (editable) { - scroll_connection = display->scroll.connect (sigc::mem_fun (*this, &AudioClock::scroll)); - button_press_connection = display->button_press.connect (sigc::mem_fun (*this, &AudioClock::button_press)); - button_release_connection = display->button_release.connect (sigc::mem_fun (*this, &AudioClock::button_release)); - } + scroll_connection = display->scroll.connect (sigc::mem_fun (*this, &AudioClock::scroll)); + button_press_connection = display->button_press.connect (sigc::mem_fun (*this, &AudioClock::button_press)); + button_release_connection = display->button_release.connect (sigc::mem_fun (*this, &AudioClock::button_release)); } void |