Create and make default the new rc file ardour2_ui.rc, with new font definitions

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index e5b7bbaab25c1a358e3d13ec9257ec21f16776a2..47982ff72897963d4cd0b01928ade70dd3fa3392 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -30,8 +30,10 @@
 #include "editor.h"
 #include "marker.h"
 #include "selection.h"
+#include "simplerect.h"
 #include "editing.h"
 #include "gui_thread.h"
+#include "simplerect.h"
 
 #include "i18n.h"
 
@@ -69,31 +71,30 @@ Editor::add_new_location (Location *location)
        }
 
        if (location->is_mark()) {
-               lam->start = new Marker (*this, *marker_group, color, 
-                                        location->name(), Marker::Mark, PublicEditor::canvas_marker_event, location->start());
+               lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
                lam->end   = 0;
 
        } else if (location->is_auto_loop()) {
                // transport marker
                lam->start = new Marker (*this, *transport_marker_group, color, 
-                                        location->name(), Marker::LoopStart, PublicEditor::canvas_marker_event, location->start());
+                                        location->name(), Marker::LoopStart, location->start());
                lam->end   = new Marker (*this, *transport_marker_group, color, 
-                                        location->name(), Marker::LoopEnd, PublicEditor::canvas_marker_event, location->end());
+                                        location->name(), Marker::LoopEnd, location->end());
                
        } else if (location->is_auto_punch()) {
                // transport marker
                lam->start = new Marker (*this, *transport_marker_group, color, 
-                                        location->name(), Marker::PunchIn, PublicEditor::canvas_marker_event, location->start());
+                                        location->name(), Marker::PunchIn, location->start());
                lam->end   = new Marker (*this, *transport_marker_group, color, 
-                                        location->name(), Marker::PunchOut, PublicEditor::canvas_marker_event, location->end());
+                                        location->name(), Marker::PunchOut, location->end());
                
        } else {
 
                // range marker
                lam->start = new Marker (*this, *range_marker_group, color, 
-                                        location->name(), Marker::Start, PublicEditor::canvas_marker_event, location->start());
+                                        location->name(), Marker::Start, location->start());
                lam->end   = new Marker (*this, *range_marker_group, color, 
-                                        location->name(), Marker::End, PublicEditor::canvas_marker_event, location->end());
+                                        location->name(), Marker::End, location->end());
        }
 
        if (location->is_hidden ()) {
@@ -293,12 +294,12 @@ Editor::mouse_add_new_marker (jack_nframes_t where)
 }
 
 void
-Editor::remove_marker (Gnome::Canvas::Item& item, GdkEvent* event)
+Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
 {
        Marker* marker;
        bool is_start;
 
-       if ((marker = item.get_data ("marker")) == 0) {
+       if ((marker = static_cast<Marker*> (item.get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -356,7 +357,7 @@ Editor::location_gone (Location *location)
 }
 
 void
-Editor::tm_marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
+Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
        if (tm_marker_menu == 0) {
                build_tm_marker_menu ();
@@ -369,10 +370,10 @@ Editor::tm_marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
 
 
 void
-Editor::marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
+Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
        Marker * marker;
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -391,8 +392,8 @@ Editor::marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
                        build_marker_menu ();
                }
 
-               Menu_Helpers::MenuList & children = marker_menu->items();
-               // XXX: should really find this some other way
+               // GTK2FIX use action group sensitivity
+#ifdef GTK2FIX
                if (children.size() >= 3) {
                        MenuItem * loopitem = &children[2];
                        if (loopitem) {
@@ -404,7 +405,7 @@ Editor::marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
                                }
                        }
                }
-               
+#endif         
                marker_menu_item = item;
                marker_menu->popup (1, ev->time);
        }
@@ -412,7 +413,7 @@ Editor::marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
 
 
 void
-Editor::new_transport_marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
+Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
        if (new_transport_marker_menu == 0) {
                build_new_transport_marker_menu ();
@@ -423,7 +424,7 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, Gnome::Canvas::It
 }
 
 void
-Editor::transport_marker_context_menu (GdkEventButton* ev, Gnome::Canvas::Item* item)
+Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
        if (transport_marker_menu == 0) {
                build_transport_marker_menu ();
@@ -504,7 +505,7 @@ Editor::marker_menu_hide ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -522,7 +523,7 @@ Editor::marker_menu_play_from ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -552,7 +553,7 @@ Editor::marker_menu_set_playhead ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -580,7 +581,7 @@ Editor::marker_menu_set_from_playhead ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -608,7 +609,7 @@ Editor::marker_menu_set_from_selection ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -646,7 +647,7 @@ Editor::marker_menu_loop_range ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -673,7 +674,7 @@ Editor::marker_menu_edit ()
        TempoMarker* tm;
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -696,7 +697,7 @@ Editor::marker_menu_remove ()
        TempoMarker* tm;
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -715,7 +716,7 @@ Editor::marker_menu_rename ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -849,8 +850,8 @@ Editor::update_loop_range_view (bool visibility)
                double x1 = frame_to_pixel (tll->start());
                double x2 = frame_to_pixel (tll->end());
                
-               transport_loop_range_rect->set_property ("x1", x1);
-               transport_loop_range_rect->set_property ("x2", x2);
+               transport_loop_range_rect->property_x1() = x1;
+               transport_loop_range_rect->property_x2() = x2;
                
                if (visibility) {
                        transport_loop_range_rect->show();
@@ -875,8 +876,8 @@ Editor::update_punch_range_view (bool visibility)
                double x1 = frame_to_pixel (tpl->start());
                double x2 = frame_to_pixel (tpl->end());
                
-               transport_punch_range_rect->set_property ("x1", x1);
-               transport_punch_range_rect->set_property ("x2", x2);
+               transport_punch_range_rect->property_x1() = x1;
+               transport_punch_range_rect->property_x2() = x2;
                
                if (visibility) {
                        transport_punch_range_rect->show();