X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=c9a151f96ea0073b7acb2b20ac233b79e7ec1309;hb=11619a37bff79c050e39e434bc9899b516cbe4a1;hp=3f9c65a4c2a6b7851f418731cc142d4d019333db;hpb=8496f57fd49f1fd74d2c8662a91088374fb662ba;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 3f9c65a4c2..c9a151f96e 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -17,11 +17,9 @@ */ -#include #include #include -#include #include #include "ardour/session.h" @@ -29,12 +27,15 @@ #include "ardour/profile.h" #include "pbd/memento_command.h" +#include "canvas/canvas.h" +#include "canvas/item.h" +#include "canvas/rectangle.h" + #include "editor.h" #include "marker.h" #include "selection.h" #include "editing.h" #include "gui_thread.h" -#include "simplerect.h" #include "actions.h" #include "prompter.h" #include "editor_drag.h" @@ -55,13 +56,27 @@ Editor::clear_marker_display () } location_markers.clear (); + _sorted_marker_lists.clear (); } void Editor::add_new_location (Location *location) { - ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location) + ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location); + + ArdourCanvas::Group* group = add_new_location_internal (location); + /* Do a full update of the markers in this group */ + update_marker_labels (group); +} + +/** Add a new location, without a time-consuming update of all marker labels; + * the caller must call update_marker_labels () after calling this. + * @return canvas group that the location's marker was added to. + */ +ArdourCanvas::Group* +Editor::add_new_location_internal (Location* location) +{ LocationMarkers *lam = new LocationMarkers; uint32_t color; @@ -83,52 +98,52 @@ Editor::add_new_location (Location *location) if (location->is_mark()) { if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *marker_group, *cursor_group, color, location->name(), Marker::Mark, location->start()); + lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); group = marker_group; } - + lam->end = 0; } else if (location->is_auto_loop()) { - + // transport marker - lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopStart, location->start()); - lam->end = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopEnd, location->end()); group = transport_marker_group; } else if (location->is_auto_punch()) { - + // transport marker - lam->start = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchIn, location->start()); - lam->end = new Marker (*this, *transport_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchOut, location->end()); group = transport_marker_group; - + } else if (location->is_session_range()) { // session range - lam->start = new Marker (*this, *marker_group, *cursor_group, color, _("start"), Marker::SessionStart, location->start()); - lam->end = new Marker (*this, *marker_group, *cursor_group, color, _("end"), Marker::SessionEnd, location->end()); + lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start()); + lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end()); group = marker_group; - + } else { // range marker if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *cd_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *cd_marker_group, color, location->name(), Marker::RangeEnd, location->end()); group = cd_marker_group; } else { - lam->start = new Marker (*this, *range_marker_group, *cursor_group, color, + lam->start = new Marker (*this, *range_marker_group, color, location->name(), Marker::RangeStart, location->start()); - lam->end = new Marker (*this, *range_marker_group, *cursor_group, color, + lam->end = new Marker (*this, *range_marker_group, color, location->name(), Marker::RangeEnd, location->end()); group = range_marker_group; } @@ -140,11 +155,11 @@ Editor::add_new_location (Location *location) lam->show (); } - location->start_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); - location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); - location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); - location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); - location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context()); + location->start_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); + location->end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); + location->changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); + location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); + location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, _1, _2), gui_context()); pair newpair; @@ -158,19 +173,18 @@ Editor::add_new_location (Location *location) select_new_marker = false; } - lam->canvas_height_set (_canvas_height); + lam->canvas_height_set (_visible_canvas_height); lam->set_show_lines (_show_marker_lines); /* Add these markers to the appropriate sorted marker lists, which will render - them unsorted until the update_marker_labels() below sorts them out. + them unsorted until a call to update_marker_labels() sorts them out. */ _sorted_marker_lists[group].push_back (lam->start); if (lam->end) { _sorted_marker_lists[group].push_back (lam->end); } - /* Do a full update of the markers in this group */ - update_marker_labels (group); + return group; } void @@ -209,7 +223,7 @@ Editor::check_marker_label (Marker* m) { /* Get a time-ordered list of markers from the last time anything changed */ std::list& sorted = _sorted_marker_lists[m->get_parent()]; - + list::iterator i = find (sorted.begin(), sorted.end(), m); list::iterator prev = sorted.end (); @@ -243,15 +257,15 @@ Editor::check_marker_label (Marker* m) if (prev != sorted.end()) { /* Update just the available space between the previous marker and this one */ - - double const p = frame_to_pixel (m->position() - (*prev)->position()); + + double const p = sample_to_pixel (m->position() - (*prev)->position()); if (m->label_on_left()) { (*prev)->set_right_label_limit (p / 2); } else { (*prev)->set_right_label_limit (p); } - + if ((*prev)->label_on_left ()) { m->set_left_label_limit (p); } else { @@ -262,8 +276,8 @@ Editor::check_marker_label (Marker* m) if (next != sorted.end()) { /* Update just the available space between this marker and the next */ - - double const p = frame_to_pixel ((*next)->position() - m->position()); + + double const p = sample_to_pixel ((*next)->position() - m->position()); if ((*next)->label_on_left()) { m->set_right_label_limit (p / 2); @@ -305,7 +319,7 @@ Editor::update_marker_labels (ArdourCanvas::Group* group) } /* We sort the list of markers and then set up the space available between each one */ - + sorted.sort (MarkerComparator ()); list::iterator i = sorted.begin (); @@ -313,22 +327,22 @@ Editor::update_marker_labels (ArdourCanvas::Group* group) list::iterator prev = sorted.end (); list::iterator next = i; ++next; - + while (i != sorted.end()) { if (prev != sorted.end()) { - double const p = frame_to_pixel ((*i)->position() - (*prev)->position()); - + double const p = sample_to_pixel ((*i)->position() - (*prev)->position()); + if ((*prev)->label_on_left()) { (*i)->set_left_label_limit (p); } else { (*i)->set_left_label_limit (p / 2); } - + } if (next != sorted.end()) { - double const p = frame_to_pixel ((*next)->position() - (*i)->position()); + double const p = sample_to_pixel ((*next)->position() - (*i)->position()); if ((*next)->label_on_left()) { (*i)->set_right_label_limit (p / 2); @@ -482,7 +496,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) continue; } - add_new_location (*i); + add_new_location_internal (*i); } /* remove dead ones */ @@ -495,8 +509,15 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) ++tmp; if (!i->second->valid) { - delete i->second; + + remove_sorted_marker (i->second->start); + if (i->second->end) { + remove_sorted_marker (i->second->end); + } + + LocationMarkers* m = i->second; location_markers.erase (i); + delete m; } i = tmp; @@ -514,16 +535,8 @@ Editor::refresh_location_display () if (_session) { _session->locations()->apply (*this, &Editor::refresh_location_display_internal); } -} - -void -Editor::refresh_location_display_s (const PropertyChange&) -{ - ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display_s, ignored) - if (_session) { - _session->locations()->apply (*this, &Editor::refresh_location_display_internal); - } + update_marker_labels (); } void @@ -561,7 +574,7 @@ Editor::LocationMarkers::set_name (const string& str) if (start->type() != Marker::SessionStart) { start->set_name (str); } - + if (end && end->type() != Marker::SessionEnd) { end->set_name (str); } @@ -649,6 +662,31 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun) } } +void +Editor::mouse_add_new_range (framepos_t where) +{ + if (!_session) { + return; + } + + /* Make this marker 1/8th of the visible area of the session so that + it's reasonably easy to manipulate after creation. + */ + + framepos_t const end = where + current_page_samples() / 8; + + string name; + _session->locations()->next_available_name (name, _("range")); + Location* loc = new Location (*_session, where, end, name, Location::IsRangeMarker); + + begin_reversible_command (_("new range marker")); + XMLNode& before = _session->locations()->get_state (); + _session->locations()->add (loc, true); + XMLNode& after = _session->locations()->get_state (); + _session->add_command (new MementoCommand (*_session->locations(), &before, &after)); + commit_reversible_command (); +} + void Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) { @@ -699,9 +737,16 @@ Editor::location_gone (Location *location) } for (i = location_markers.begin(); i != location_markers.end(); ++i) { - if ((*i).first == location) { - delete (*i).second; + if (i->first == location) { + + remove_sorted_marker (i->second->start); + if (i->second->end) { + remove_sorted_marker (i->second->end); + } + + LocationMarkers* m = i->second; location_markers.erase (i); + delete m; break; } } @@ -711,7 +756,7 @@ void Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { marker_menu_item = item; - + MeterMarker* mm; TempoMarker* tm; dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); @@ -725,7 +770,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It } else { return; } - + delete tempo_or_meter_marker_menu; build_tempo_or_meter_marker_menu (can_remove); tempo_or_meter_marker_menu->popup (1, ev->time); @@ -742,52 +787,44 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) bool is_start; Location * loc = find_location_from_marker (marker, is_start); - if (loc == transport_loop_location() || loc == transport_punch_location()) { + + 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; transport_marker_menu->popup (1, ev->time); - } else { - if (loc->is_mark()) { - Menu *markerMenu; - if (loc->is_session_range ()) { - delete session_range_marker_menu; - build_marker_menu (true, loc); - markerMenu = session_range_marker_menu; - } else { - delete marker_menu; - build_marker_menu (false, loc); - markerMenu = marker_menu; - } + } else if (loc->is_mark()) { + delete marker_menu; + build_marker_menu (loc); // GTK2FIX use action group sensitivity #ifdef GTK2FIX - if (children.size() >= 3) { - MenuItem * loopitem = &children[2]; - if (loopitem) { - if (loc->is_mark()) { - loopitem->set_sensitive(false); - } - else { - loopitem->set_sensitive(true); + if (children.size() >= 3) { + MenuItem * loopitem = &children[2]; + if (loopitem) { + if (loc->is_mark()) { + loopitem->set_sensitive(false); + } + else { + loopitem->set_sensitive(true); + } } } - } #endif - marker_menu_item = item; - markerMenu->popup (1, ev->time); - } + marker_menu_item = item; + marker_menu->popup (1, ev->time); - if (loc->is_range_marker()) { - if (range_marker_menu == 0){ - build_range_marker_menu (false); - } - marker_menu_item = item; - range_marker_menu->popup (1, ev->time); - } + } else if (loc->is_range_marker()) { + if (range_marker_menu == 0) { + build_range_marker_menu (false, false); + } + marker_menu_item = item; + range_marker_menu->popup (1, ev->time); } } @@ -803,28 +840,13 @@ 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 (bool session_range, Location* loc) +Editor::build_marker_menu (Location* loc) { using namespace Menu_Helpers; - Menu *markerMenu = new Menu; - if (session_range) { - session_range_marker_menu = markerMenu; - } else { - marker_menu = markerMenu; - } - MenuList& items = markerMenu->items(); - markerMenu->set_name ("ArdourContextMenu"); + marker_menu = new Menu; + MenuList& items = marker_menu->items(); + marker_menu->set_name ("ArdourContextMenu"); items.push_back (MenuElem (_("Locate to Here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); items.push_back (MenuElem (_("Play from Here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); @@ -835,10 +857,7 @@ Editor::build_marker_menu (bool session_range, 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))); - if (session_range) { - return; - } - 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 (&items.back()); @@ -853,19 +872,21 @@ Editor::build_marker_menu (bool session_range, Location* loc) glue_item->set_active (); } glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue)); - + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); } void -Editor::build_range_marker_menu (bool loop_or_punch) +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) { + if (loop_or_punch_or_session) { transport_marker_menu = markerMenu; } else { range_marker_menu = markerMenu; @@ -874,27 +895,34 @@ Editor::build_range_marker_menu (bool loop_or_punch) markerMenu->set_name ("ArdourContextMenu"); items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range))); - items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); - if (! loop_or_punch) { - items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); - } - items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); + items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); + + items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Set Range from Range Selection"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection))); + items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false))); } + items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range))); + 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) { + 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 || !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()) { @@ -911,7 +939,7 @@ Editor::build_tempo_or_meter_marker_menu (bool can_remove) MenuList& items = tempo_or_meter_marker_menu->items(); tempo_or_meter_marker_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Edit"), sigc::mem_fun(*this, &Editor::marker_menu_edit))); + items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit))); items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); items.back().set_sensitive (can_remove); @@ -1126,7 +1154,7 @@ Editor::marker_menu_set_from_playhead () } void -Editor::marker_menu_set_from_selection () +Editor::marker_menu_set_from_selection (bool /*force_regions*/) { Marker* marker; @@ -1141,23 +1169,15 @@ Editor::marker_menu_set_from_selection () if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - // nothing for now - } - else { - /* if range selection use first to last */ + // nothing for now - if (mouse_mode == Editing::MouseRange) { - if (!selection->time.empty()) { - l->set_start (selection->time.start()); - l->set_end (selection->time.end_frame()); - } - } - else { - if (!selection->regions.empty()) { - l->set_start (selection->regions.start()); - l->set_end (selection->regions.end_frame()); - } + } else { + + if (!selection->time.empty()) { + l->set (selection->time.start(), selection->time.end_frame()); + } else if (!selection->regions.empty()) { + l->set (selection->regions.start(), selection->regions.end_frame()); } } } @@ -1214,6 +1234,33 @@ Editor::marker_menu_loop_range () } } +/** Temporal zoom to the range of the marker_menu_item (plus 5% either side) */ +void +Editor::marker_menu_zoom_to_range () +{ + Marker* marker = reinterpret_cast (marker_menu_item->get_data ("marker")); + assert (marker); + + bool is_start; + Location* l = find_location_from_marker (marker, is_start); + if (l == 0) { + return; + } + + framecnt_t const extra = l->length() * 0.05; + framepos_t a = l->start (); + if (a >= extra) { + a -= extra; + } + + framepos_t b = l->end (); + if (b < (max_framepos - extra)) { + b += extra; + } + + temporal_zoom_by_frame (a, b); +} + void Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const { @@ -1371,11 +1418,11 @@ Editor::update_loop_range_view (bool visibility) if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) { - double x1 = frame_to_pixel (tll->start()); - double x2 = frame_to_pixel (tll->end()); + double x1 = sample_to_pixel (tll->start()); + double x2 = sample_to_pixel (tll->end()); - transport_loop_range_rect->property_x1() = x1; - transport_loop_range_rect->property_x2() = x2; + transport_loop_range_rect->set_x0 (x1); + transport_loop_range_rect->set_x1 (x2); if (visibility) { transport_loop_range_rect->show(); @@ -1396,14 +1443,13 @@ Editor::update_punch_range_view (bool visibility) Location* tpl; if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) { - guint track_canvas_width,track_canvas_height; - track_canvas->get_size(track_canvas_width,track_canvas_height); + ArdourCanvas::Rect const v = _track_canvas->visible_area (); if (_session->config.get_punch_in()) { - transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start()); - transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES)); + transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start())); + transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES)); } else { - transport_punch_range_rect->property_x1() = 0; - transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width); + transport_punch_range_rect->set_x0 (0); + transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ()); } if (visibility) { @@ -1491,8 +1537,28 @@ void Editor::toggle_marker_lines () { _show_marker_lines = !_show_marker_lines; - + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { i->second->set_show_lines (_show_marker_lines); } } + +void +Editor::remove_sorted_marker (Marker* m) +{ + for (std::map >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) { + 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; +}