}
location_markers.clear ();
+ _sorted_marker_lists.clear ();
}
void
LocationMarkers *lam = new LocationMarkers;
uint32_t color;
+ /* make a note here of which group this marker ends up in */
+ ArdourCanvas::Group* group = 0;
+
if (location->is_cd_marker()) {
color = location_cd_marker_color;
} else if (location->is_mark()) {
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start());
- }
- else {
+ group = cd_marker_group;
+ } else {
lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+ group = marker_group;
}
- lam->end = 0;
+
+ lam->end = 0;
} else if (location->is_auto_loop()) {
+
// transport marker
lam->start = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::LoopStart, location->start());
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, color,
location->name(), Marker::PunchIn, location->start());
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, color, _("start"), Marker::Start, location->start());
- lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::End, 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, color,
- location->name(), Marker::Start, location->start());
+ location->name(), Marker::RangeStart, location->start());
lam->end = new Marker (*this, *cd_marker_group, color,
- location->name(), Marker::End, location->end());
- }
- else {
+ location->name(), Marker::RangeEnd, location->end());
+ group = cd_marker_group;
+ } else {
lam->start = new Marker (*this, *range_marker_group, color,
- location->name(), Marker::Start, location->start());
+ location->name(), Marker::RangeStart, location->start());
lam->end = new Marker (*this, *range_marker_group, color,
- location->name(), Marker::End, location->end());
+ location->name(), Marker::RangeEnd, location->end());
+ group = range_marker_group;
}
}
selection->set (lam->start);
select_new_marker = false;
}
+
+ lam->canvas_height_set (_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.
+ */
+ _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);
}
void
} else if (location->is_auto_punch()) {
update_punch_range_view ();
}
+
+ check_marker_label (lam->start);
+ if (lam->end) {
+ check_marker_label (lam->end);
+ }
+}
+
+/** Look at a marker and check whether its label, and those of the previous and next markers,
+ * need to have their labels updated (in case those labels need to be shortened or can be
+ * lengthened)
+ */
+void
+Editor::check_marker_label (Marker* m)
+{
+ /* 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 ();
+ list<Marker*>::iterator next = i;
+ ++next;
+
+ /* Look to see if the previous marker is still behind `m' in time */
+ if (i != sorted.begin()) {
+
+ prev = i;
+ --prev;
+
+ if ((*prev)->position() > m->position()) {
+ /* This marker is no longer in the correct order with the previous one, so
+ * update all the markers in this group.
+ */
+ update_marker_labels (m->get_parent ());
+ return;
+ }
+ }
+
+ /* Look to see if the next marker is still ahead of `m' in time */
+ if (next != sorted.end() && (*next)->position() < m->position()) {
+ /* This marker is no longer in the correct order with the next one, so
+ * update all the markers in this group.
+ */
+ update_marker_labels (m->get_parent ());
+ return;
+ }
+
+ 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()) {
+ (*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 {
+ m->set_left_label_limit (p / 2);
+ }
+ }
+
+ 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()) {
+ m->set_right_label_limit (p / 2);
+ } else {
+ m->set_right_label_limit (p);
+ }
+
+ if (m->label_on_left()) {
+ (*next)->set_left_label_limit (p);
+ } else {
+ (*next)->set_left_label_limit (p / 2);
+ }
+ }
+}
+
+struct MarkerComparator {
+ bool operator() (Marker const * a, Marker const * b) {
+ return a->position() < b->position();
+ }
+};
+
+/** Update all marker labels in all groups */
+void
+Editor::update_marker_labels ()
+{
+ for (std::map<ArdourCanvas::Group *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+ update_marker_labels (i->first);
+ }
+}
+
+/** Look at all markers in a group and update label widths */
+void
+Editor::update_marker_labels (ArdourCanvas::Group* group)
+{
+ list<Marker*>& sorted = _sorted_marker_lists[group];
+
+ if (sorted.empty()) {
+ return;
+ }
+
+ /* 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()) {
+ double const p = frame_to_pixel ((*next)->position() - (*i)->position());
+
+ if ((*next)->label_on_left()) {
+ (*i)->set_right_label_limit (p / 2);
+ } else {
+ (*i)->set_right_label_limit (p);
+ }
+ }
+
+ prev = i;
+ ++i;
+ ++next;
+ }
}
void
++tmp;
if (!i->second->valid) {
+
+ remove_sorted_marker (i->second->start);
+ if (i->second->end) {
+ remove_sorted_marker (i->second->end);
+ }
+
delete i->second;
location_markers.erase (i);
}
Editor::LocationMarkers::hide()
{
start->hide ();
- if (end) { end->hide(); }
+ if (end) {
+ end->hide ();
+ }
}
void
Editor::LocationMarkers::show()
{
start->show ();
- if (end) { end->show(); }
+ if (end) {
+ end->show ();
+ }
+}
+
+void
+Editor::LocationMarkers::canvas_height_set (double h)
+{
+ start->canvas_height_set (h);
+ if (end) {
+ end->canvas_height_set (h);
+ }
}
void
Editor::LocationMarkers::set_name (const string& str)
{
/* XXX: hack: don't change names of session start/end markers */
-
- if (start->type() != Marker::Start) {
+
+ if (start->type() != Marker::SessionStart) {
start->set_name (str);
}
- if (end && end->type() != Marker::End) {
+ if (end && end->type() != Marker::SessionEnd) {
end->set_name (str);
}
}
void
-Editor::LocationMarkers::set_position (nframes64_t startf,
- nframes64_t endf)
+Editor::LocationMarkers::set_position (framepos_t startf,
+ framepos_t endf)
{
start->set_position (startf);
- if (end) { end->set_position (endf); }
+ if (end) {
+ end->set_position (endf);
+ }
}
void
Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
{
start->set_color_rgba (rgba);
- if (end) { end->set_color_rgba (rgba); }
+ if (end) {
+ end->set_color_rgba (rgba);
+ }
}
void
-Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
+Editor::LocationMarkers::set_show_lines (bool s)
+{
+ start->set_show_line (s);
+ if (end) {
+ end->set_show_line (s);
+ }
+}
+
+void
+Editor::LocationMarkers::set_selected (bool s)
+{
+ start->set_selected (s);
+ if (end) {
+ end->set_selected (s);
+ }
+}
+
+void
+Editor::LocationMarkers::setup_lines ()
+{
+ start->setup_line ();
+ if (end) {
+ end->setup_line ();
+ }
+}
+
+void
+Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
{
string markername, markerprefix;
int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
}
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);
+ }
+
+
+ delete i->second;
location_markers.erase (i);
break;
}
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);
}
+
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);
+
+ } else if (loc->is_range_marker()) {
+ if (range_marker_menu == 0) {
+ build_range_marker_menu (false);
}
-
- 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);
- }
+ marker_menu_item = item;
+ range_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 (CheckMenuElem (_("Lock")));
}
void
-Editor::build_range_marker_menu (bool loop_or_punch)
+Editor::build_range_marker_menu (bool loop_or_punch_or_session)
{
using namespace Menu_Helpers;
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 (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 (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
return;
}
- nframes64_t start;
- nframes64_t end;
+ framepos_t start;
+ framepos_t end;
_session->locations()->marks_either_side (marker->position(), start, end);
if (end != max_framepos) {
}
for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
- LocationMarkers* lam = i->second;
-
- if (lam->start) {
- lam->start->hide_line();
- }
-
- if (lam->end) {
- lam->end->hide_line();
- }
+ i->second->set_selected (false);
}
for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
- (*x)->add_line (cursor_group, 0, _canvas_height);
- (*x)->show_line ();
+ (*x)->set_selected (true);
}
}
}
}
+
+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<ArdourCanvas::Group *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+ i->second.remove (m);
+ }
+}
projects / ardour.git / blobdiff