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;
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;
}
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
{
/* Get a time-ordered list of markers from the last time anything changed */
std::list<Marker*>& sorted = _sorted_marker_lists[m->get_parent()];
-
+
list<Marker*>::iterator i = find (sorted.begin(), sorted.end(), m);
list<Marker*>::iterator prev = sorted.end ();
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());
if (m->label_on_left()) {
} else {
(*prev)->set_right_label_limit (p);
}
-
+
if ((*prev)->label_on_left ()) {
m->set_left_label_limit (p);
} else {
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());
if ((*next)->label_on_left()) {
}
/* We sort the list of markers and then set up the space available between each one */
-
+
sorted.sort (MarkerComparator ());
list<Marker*>::iterator i = sorted.begin ();
list<Marker*>::iterator prev = sorted.end ();
list<Marker*>::iterator next = i;
++next;
-
+
while (i != sorted.end()) {
if (prev != sorted.end()) {
double const p = frame_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()) {
continue;
}
- add_new_location (*i);
+ add_new_location_internal (*i);
}
/* remove dead ones */
if (i->second->end) {
remove_sorted_marker (i->second->end);
}
-
- delete i->second;
+
+ LocationMarkers* m = i->second;
location_markers.erase (i);
+ delete m;
}
i = tmp;
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
if (start->type() != Marker::SessionStart) {
start->set_name (str);
}
-
+
if (end && end->type() != Marker::SessionEnd) {
end->set_name (str);
}
if (i->second->end) {
remove_sorted_marker (i->second->end);
}
-
-
- delete i->second;
+
+ LocationMarkers* m = i->second;
location_markers.erase (i);
+ delete m;
break;
}
}
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);
} 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);
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);
}
}
}
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)));
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<CheckMenuItem*> (&items.back());
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;
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) {
+ if (!loop_or_punch_or_session) {
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 (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) {
+ 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()) {
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);
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);
}
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;
+}
projects / ardour.git / blobdiff