MIDI metering.

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index ab1e54aa5b6e864ae43eaeb9869680b0f08426f8..9bb481966e4091d365233821e43b02ac8abe56ab 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -15,10 +15,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
+#include <glibmm/miscutils.h>
 #include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+
+#include <pbd/enumwriter.h>
+
 #include <ardour/audioengine.h>
 
 #include "editor.h"
@@ -30,6 +34,9 @@
 
 #include "i18n.h"
 
+using namespace Gtkmm2ext;
+using namespace PBD;
+
 void
 Editor::editor_mixer_button_toggled ()
 {
@@ -104,8 +111,8 @@ Editor::show_editor_mixer (bool yn)
                        current_mixer_strip->set_embedded (true);
                        current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden));
                        current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed));
-                       current_mixer_strip->set_width (editor_mixer_strip_width);
-                       
+                       current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this);
+
                        global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
                        global_hpacker.reorder_child (*current_mixer_strip, 0);
 
@@ -126,10 +133,10 @@ Editor::show_editor_mixer (bool yn)
 void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
-       AudioTimeAxisView* at;
+       RouteTimeAxisView* rt;
        bool show = false;
 
-       if (!session || (at = dynamic_cast<AudioTimeAxisView*>(&view)) == 0) {
+       if (!session || (rt = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
                return;
        }
        
@@ -137,7 +144,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
                /* might be nothing to do */
 
-               if (current_mixer_strip->route() == at->route()) {
+               if (current_mixer_strip->route() == rt->route()) {
                        return;
                }
 
@@ -150,7 +157,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
        current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
                                              *session,
-                                             at->route());
+                                             rt->route());
        current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
        
        if (show) {
@@ -164,7 +171,7 @@ bool currentInitialized = 0;
 void
 Editor::update_current_screen ()
 {
-       if (session && engine.running()) {
+       if (session && session->engine().running()) {
 
                nframes_t frame;
 
@@ -182,6 +189,9 @@ Editor::update_current_screen ()
 
                        if (frame != last_update_frame) {
 
+
+#undef CONTINUOUS_SCROLL
+#ifndef  CONTINUOUS_SCROLL
                                if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
                                        
                                        if (session->transport_speed() < 0) {
@@ -197,35 +207,26 @@ Editor::update_current_screen ()
 
                                playhead_cursor->set_position (frame);
 
-#undef CONTINUOUS_SCROLL
-#ifdef  CONTINUOUS_SCROLL
-
+#else  // CONTINUOUS_SCROLL
+                               
                                /* don't do continuous scroll till the new position is in the rightmost quarter of the 
                                   editor canvas
                                */
                                
-#if 0
-                               if (frame > leftmost_frame + (3 * current_page_frames() / 4)) {
-                               
-                                       if (frame > playhead_cursor->current_frame) {
-                                               nframes_t delta = frame - playhead_cursor->current_frame;
-                                               horizontal_adjustment.set_value (horizontal_adjustment.get_value() + (delta/frames_per_unit));
+                               if (session->transport_speed()) {
+                                       double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit;
+                                       if (target <= 0.0) target = 0.0;
+                                       if ( fabs(target - current) < current_page_frames()/frames_per_unit ) {
+                                               target = (target * 0.15) + (current * 0.85);
                                        } else {
-                                               nframes_t delta = playhead_cursor->current_frame - frame;
-                                               horizontal_adjustment.set_value (horizontal_adjustment.get_value() - (delta/frames_per_unit));
+                                               /* relax */
                                        }
+                                       //printf("frame: %d,  cpf: %d,  fpu: %6.6f, current: %6.6f, target : %6.6f\n", frame, current_page_frames(), frames_per_unit, current, target );
+                                       current = target;
+                                       horizontal_adjustment.set_value ( current );
                                }
-#else
-                               if (!currentInitialized) {
-                                       current = (frame - current_page_frames()/2) / frames_per_unit;
-                                       currentInitialized = 1;
-                               }
-
-                               double target = (frame - current_page_frames()/2) / frames_per_unit;
-                               target = (target * 0.1) + (current * 0.9);
-                               horizontal_adjustment.set_value ( target );
-                               current = target;
-#endif
+                               
+                               playhead_cursor->set_position (frame);
 
 #endif // CONTINUOUS_SCROLL
 
@@ -295,8 +296,8 @@ Editor::session_going_away ()
        cut_buffer->clear ();
 
        clicked_regionview = 0;
-       clicked_trackview = 0;
-       clicked_audio_trackview = 0;
+       clicked_axisview = 0;
+       clicked_routeview = 0;
        clicked_crossfadeview = 0;
        entered_regionview = 0;
        entered_track = 0;
@@ -351,7 +352,18 @@ Editor::session_going_away ()
 
        current_mixer_strip = 0;
 
-       set_title (_("ardour: editor"));
+       WindowTitle title(Glib::get_application_name());
+       title += _("Editor");
+
+       set_title (title.get_string());
 
        session = 0;
 }
+
+void
+Editor::maybe_add_mixer_strip_width (XMLNode& node)
+{
+       if (current_mixer_strip) {
+               node.add_property ("mixer-width", enum_2_string (current_mixer_strip->get_width()));
+       }
+}