Give just one system tab rather than mono / stereo. Fix bundles-only mode of the...

[ardour.git] / gtk2_ardour / marker_time_axis.cc

diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index 973bb5d221b941d780f4d0c472eb274822199a4d..d3517bd673a16c52c8cd492b5c6deba59e22b550 100644 (file)
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,19 +15,18 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include <gtkmm/menu.h>
 
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
@@ -42,6 +41,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 
@@ -57,13 +57,13 @@ using namespace Gtk;
  * @param name the name/id of this time axis
  * @param tav the associated track view that this MarkerTimeAxis is marking up
  */
-MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, std::string name, TimeAxisView* tav)
+MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, const string & name, TimeAxisView* tav)
        : AxisView(sess),
          VisualTimeAxis(name, ed, sess, canvas)
 {
        /* the TimeAxisView these markers are associated with */
        marked_time_axis = tav ;
-       
+
        _color = unique_random_color() ;
        time_axis_name = name ;
 
@@ -71,7 +71,6 @@ MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas&
        selection_group->hide();
 
        // intialize our data items
-       name_prompter = 0 ;
        marker_menu = 0 ;
 
        y_position = -1 ;
@@ -81,9 +80,9 @@ MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas&
 
        // set the initial time axis text label
        label_view() ;
-               
+
        // set the initial height of this time axis
-       set_height(Small) ;
+       set_height(hSmall) ;
 }
 
 /**
@@ -106,23 +105,18 @@ MarkerTimeAxis::~MarkerTimeAxis()
 
 //---------------------------------------------------------------------------------------//
 // ui methods & data
-       
-/**
- * Sets the height of this TrackView to one of the defined TrackHeights
- *
- * @param h the TrackHeight value to set
- */    
+
 void
-MarkerTimeAxis::set_height (TrackHeight h)
+MarkerTimeAxis::set_height (uint32_t h)
 {
        VisualTimeAxis::set_height(h) ;
-       
+
        // tell out view helper of the change too
        if (view != 0)
        {
                view->set_height((double) height) ;
        }
-       
+
        // tell those interested that we have had our height changed
         gui_changed("track_height",(void*)0) ; /* EMIT_SIGNAL */
 }
@@ -167,7 +161,7 @@ MarkerTimeAxis::popup_marker_time_axis_edit_menu(int button, int32_t time, Marke
        {
                marker_item_menu->set_sensitive(false) ;
        }
-       
+
        marker_menu->popup(button,time) ;
 }
 
@@ -211,7 +205,7 @@ MarkerTimeAxis::build_display_menu()
        items.push_back(MenuElem (_("Height"), *size_menu));
        items.push_back(MenuElem (_("Color"), mem_fun(*this, &MarkerTimeAxis::select_track_color)));
        items.push_back(SeparatorElem()) ;
-       
+
        items.push_back(MenuElem (_("Remove"), bind(mem_fun(*this, &MarkerTimeAxis::remove_this_time_axis), (void*)this)));
 }
 
@@ -227,7 +221,7 @@ MarkerTimeAxis::build_marker_menu()
        marker_menu = manage(new Menu) ;
        marker_menu->set_name ("ArdourContextMenu");
        MenuList& items = marker_menu->items();
-       
+
        marker_item_menu = manage(new Menu) ;
        marker_item_menu->set_name ("ArdourContextMenu");
        MenuList& marker_sub_items = marker_item_menu->items() ;
@@ -236,7 +230,7 @@ MarkerTimeAxis::build_marker_menu()
        Menu* duration_menu = manage(new Menu) ;
        duration_menu->set_name ("ArdourContextMenu");
        MenuList& duration_items = duration_menu->items() ;
-       
+
        if(view)
        {
                duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.0))) ;
@@ -252,7 +246,7 @@ MarkerTimeAxis::build_marker_menu()
 
        marker_sub_items.push_back(SeparatorElem()) ;
        marker_sub_items.push_back(MenuElem (_("Remove Marker"), bind(mem_fun(view, &MarkerTimeAxisView::remove_selected_marker_view),(void*)this))) ;
-       
+
        items.push_back(MenuElem(_("Marker"), *marker_item_menu)) ;
        items.push_back(MenuElem (_("Rename Track"), mem_fun(*this,&MarkerTimeAxis::start_time_axis_rename))) ;