Move selection/punch clocks to editor Sidebar

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 9e05e1e4d6fd5da3dde10729ac045f2278c9f387..60f280930594d44eefb76860c57f52bdbc27b8dd 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -525,10 +525,9 @@ ArdourMarker::set_right_label_limit (double p)
 
 TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::TempoSection& temp)
-       : ArdourMarker (editor, parent, rgba, text, Tempo, 0, false),
+       : ArdourMarker (editor, parent, rgba, text, Tempo, temp.frame(), false),
          _tempo (temp)
 {
-       set_position (_tempo.frame());
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), group, this));
 }
 
@@ -556,58 +555,16 @@ TempoMarker::update_height_mark (const double& ratio)
        mark->set (*points);
 }
 
-void
-TempoMarker::set_enter_color ()
-{
-       if (_tempo.position_lock_style() == MusicTime) {
-               set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
-       } else {
-               set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
-       }
-}
-
-void
-TempoMarker::set_leave_color ()
-{
-       if (_tempo.position_lock_style() == MusicTime) {
-               set_color_rgba (UIConfiguration::instance().color ("tempo marker music"));
-       } else {
-               set_color_rgba (UIConfiguration::instance().color ("tempo marker"));
-       }
-}
-
 /***********************************************************************/
 
 MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text,
                          ARDOUR::MeterSection& m)
-       : ArdourMarker (editor, parent, rgba, text, Meter, 0, false),
+       : ArdourMarker (editor, parent, rgba, text, Meter, m.frame(), false),
          _meter (m)
 {
-       set_position (_meter.frame());
        group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), group, this));
 }
 
 MeterMarker::~MeterMarker ()
 {
 }
-
-void
-MeterMarker::set_enter_color ()
-{
-       if (_meter.position_lock_style() == MusicTime) {
-               set_color_rgba (UIConfiguration::instance().color ("meter marker"));
-       } else {
-               set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
-       }
-}
-
-void
-MeterMarker::set_leave_color ()
-{
-       if (_meter.position_lock_style() == MusicTime) {
-               set_color_rgba (UIConfiguration::instance().color ("meter marker music"));
-       } else {
-               set_color_rgba (UIConfiguration::instance().color ("meter marker"));
-       }
-}
-