diff options
author | Doug McLain <doug@nostar.net> | 2007-05-14 05:09:04 +0000 |
---|---|---|
committer | Doug McLain <doug@nostar.net> | 2007-05-14 05:09:04 +0000 |
commit | 20cdab6416b1b70994ae4eb21d70856792ab1221 (patch) | |
tree | b62203244ed2ce8aa4938e4dbf576e764c75f39a /gtk2_ardour/audio_clock.cc | |
parent | 9383499ce675fe046b9143c0380fcbc7447b79cc (diff) |
code readability change I forgot to add before committing, and removal of debug output
git-svn-id: svn://localhost/ardour2/trunk@1839 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.cc')
-rw-r--r-- | gtk2_ardour/audio_clock.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index a86b51d1fb..8c24f42998 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -385,7 +385,7 @@ AudioClock::on_realize () } void -AudioClock::set (nframes_t when, bool force, nframes_t offset, int which) +AudioClock::set (nframes_t when, bool force, nframes_t offset, char which) { if ((!force && !is_visible()) || session == 0) { @@ -399,23 +399,22 @@ AudioClock::set (nframes_t when, bool force, nframes_t offset, int which) bool pdelta = Config->get_primary_clock_delta_edit_cursor(); bool sdelta = Config->get_secondary_clock_delta_edit_cursor(); - if (offset && which == 1 && pdelta) { + if (offset && which == 'p' && pdelta) { when = (when > offset) ? when - offset : offset - when; - } else if (offset && which == 2 && sdelta) { + } else if (offset && which == 's' && sdelta) { when = (when > offset) ? when - offset : offset - when; } - if (which == 1 && pdelta && !last_pdelta) { - cout << "set_widget_name() called" << endl; + if (which == 'p' && pdelta && !last_pdelta) { set_widget_name("TransportClockDisplayDelta"); last_pdelta = true; - } else if (which == 1 && !pdelta && last_pdelta) { + } else if (which == 'p' && !pdelta && last_pdelta) { set_widget_name("TransportClockDisplay"); last_pdelta = false; - } else if (which == 2 && sdelta && !last_sdelta) { + } else if (which == 's' && sdelta && !last_sdelta) { set_widget_name("SecondaryClockDisplayDelta"); last_sdelta = true; - } else if (which == 2 && !sdelta && last_sdelta) { + } else if (which == 's' && !sdelta && last_sdelta) { set_widget_name("SecondaryClockDisplay"); last_sdelta = false; } |