summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_mixer.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-05-16 13:57:51 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-05-16 13:57:51 +0000
commitcd44c8241c868b47c11ea8a669e5c37484fee25f (patch)
tree44fe6243c3e04fdfe983cb9a449bc4a09782888e /gtk2_ardour/editor_mixer.cc
parent5f61efff8f4d80c9576fb8524f37cb8905ba51a8 (diff)
add GotoWallClock command; switch Editor class to use nframes64_t throughout; fix up some glitches in playhead/screen handling when locating ; never save keybindings to user's ~/.ardour2 dir unless the user changed them (well, nearly)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
-rw-r--r--gtk2_ardour/editor_mixer.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 715b9c467f..651360d1fd 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -173,7 +173,7 @@ Editor::update_current_screen ()
{
if (session && session->engine().running()) {
- nframes_t frame;
+ nframes64_t frame;
frame = session->audible_frame();
@@ -235,11 +235,7 @@ Editor::update_current_screen ()
} else {
if (frame != last_update_frame) {
- if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
- playhead_cursor->canvas_item.hide();
- } else {
- playhead_cursor->set_position (frame);
- }
+ playhead_cursor->set_position (frame);
}
}