Merged with trunk R992.

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index f9ce22ed4b0e31b43e90c62ba3fa06e861f4fd81..da09a956880c7a13095e51df9c137d8f02615c6c 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -157,7 +157,7 @@ Editor::update_current_screen ()
 {
        if (session && engine.running()) {
 
-               jack_nframes_t frame;
+               nframes_t frame;
 
                frame = session->audible_frame();