use home-grown solution for path_expand(), rather than wordexp() which is broken...

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index c1f06a18c1c18a100b0864302c4cc954ee933524..f66b7d02c63808b6485c3588e08430b2cce91fe3 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -765,7 +765,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
        if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
 
                if (transport_marker_menu == 0) {
-                       build_range_marker_menu (true);
+                       build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
                }
 
                marker_menu_item = item;
@@ -795,7 +795,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 
        } else if (loc->is_range_marker()) {
                if (range_marker_menu == 0) {
-                       build_range_marker_menu (false);
+                       build_range_marker_menu (false, false);
                }
                marker_menu_item = item;
                range_marker_menu->popup (1, ev->time);
@@ -813,16 +813,6 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite
 
 }
 
-void
-Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
-{
-       if (transport_marker_menu == 0) {
-               build_range_marker_menu (true);
-       }
-
-       transport_marker_menu->popup (1, ev->time);
-}
-
 void
 Editor::build_marker_menu (Location* loc)
 {
@@ -841,7 +831,7 @@ Editor::build_marker_menu (Location* loc)
        items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
 
        items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
-       items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+       items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
 
        items.push_back (CheckMenuElem (_("Lock")));
        CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back());
@@ -863,10 +853,12 @@ Editor::build_marker_menu (Location* loc)
 }
 
 void
-Editor::build_range_marker_menu (bool loop_or_punch_or_session)
+Editor::build_range_marker_menu (bool loop_or_punch, bool session)
 {
        using namespace Menu_Helpers;
 
+       bool const loop_or_punch_or_session = loop_or_punch | session;
+
        Menu *markerMenu = new Menu;
        if (loop_or_punch_or_session) {
                transport_marker_menu = markerMenu;
@@ -888,16 +880,22 @@ Editor::build_range_marker_menu (bool loop_or_punch_or_session)
        }
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
+       items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
        items.push_back (SeparatorElem());
 
        if (!loop_or_punch_or_session) {
                items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
-               items.push_back (MenuElem (_("Rename Range"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+               items.push_back (MenuElem (_("Rename Range..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+       }
+
+       if (!session) {
                items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
-               items.push_back (SeparatorElem());
        }
 
+       if (loop_or_punch_or_session) {
+               items.push_back (SeparatorElem());
+       }
+       
        items.push_back (MenuElem (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
        items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
        if (!Profile->get_sae()) {
@@ -1507,3 +1505,15 @@ Editor::remove_sorted_marker (Marker* m)
                i->second.remove (m);
        }
 }
+
+Marker *
+Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const
+{
+       for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+               if (i->first->id() == id) {
+                       return is_start ? i->second->start : i->second->end;
+               }
+       }
+
+       return 0;
+}