when calculating average slave/master delta, use absolute value.

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 0c052924bd5a7dba8940d88c95dd078733e4259e..87beab6b0e417faddad7fd0b2bafae52d61f638c 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -153,7 +153,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
        using namespace std;
        Gtk::Notebook* nb = 0;
        Gtk::Window* win = 0;
-       Gtkmm2ext::Tabbable* tabbable = 0;
+       ArdourWidgets::Tabbable* tabbable = 0;
 
 
        if (w == GTK_WIDGET(editor->contents().gobj())) {
@@ -219,10 +219,10 @@ ARDOUR_UI::main_window_delete_event (GdkEventAny* ev)
 
 static GtkNotebook*
 tab_window_root_drop (GtkNotebook* src,
-                     GtkWidget* w,
-                     gint x,
-                     gint y,
-                     gpointer user_data)
+                      GtkWidget* w,
+                      gint x,
+                      gint y,
+                      gpointer user_data)
 {
        return ARDOUR_UI::instance()->tab_window_root_drop (src, w, x, y, user_data);
 }
@@ -271,7 +271,7 @@ ARDOUR_UI::setup_windows ()
        mixer->add_to_notebook (_tabs, _("Mixer"));
        editor->add_to_notebook (_tabs, _("Editor"));
 
-       time_info_box = new TimeInfoBox (false);
+       time_info_box = new TimeInfoBox ("ToolbarTimeInfo", false);
        /* all other dialogs are created conditionally */
 
        we_have_dependents ();