X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=3000fb07efbe63e676e1a550326e365ea2cf5ff5;hb=70d246fbe30d24197781384fa4825f32fb0f4235;hp=81ad022ce0c5bf28f363987026c4cf6518b891c6;hpb=895bad1dcd817cb8ad32dc255a90271edd6659fb;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 81ad022ce0..3000fb07ef 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -55,6 +55,7 @@ Editor::clear_marker_display () } location_markers.clear (); + _sorted_marker_lists.clear (); } void @@ -65,6 +66,9 @@ Editor::add_new_location (Location *location) 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()) { @@ -81,44 +85,53 @@ Editor::add_new_location (Location *location) 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; } } @@ -145,6 +158,20 @@ Editor::add_new_location (Location *location) 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 @@ -167,6 +194,154 @@ Editor::location_changed (Location *location) } 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& sorted = _sorted_marker_lists[m->get_parent()]; + + list::iterator i = find (sorted.begin(), sorted.end(), m); + + list::iterator prev = sorted.end (); + list::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 >::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& 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::iterator i = sorted.begin (); + + 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()); + + 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 @@ -321,6 +496,12 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) ++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); } @@ -356,47 +537,91 @@ void 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); @@ -413,7 +638,7 @@ Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun) if (!is_xrun && !choose_new_marker_name(markername)) { return; } - Location *location = new Location (where, where, markername, (Location::Flags) flags); + Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags); _session->begin_reversible_command (_("add marker")); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (location, true); @@ -481,8 +706,15 @@ 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); + } + + + delete i->second; location_markers.erase (i); break; } @@ -490,15 +722,27 @@ Editor::location_gone (Location *location) } void -Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) +Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { - if (tm_marker_menu == 0) { - build_tm_marker_menu (); - } - marker_menu_item = item; - tm_marker_menu->popup (1, ev->time); + + MeterMarker* mm; + TempoMarker* tm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + bool can_remove = false; + + if (mm) { + can_remove = mm->meter().movable (); + } else if (tm) { + can_remove = tm->tempo().movable (); + } 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); } void @@ -512,53 +756,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); } + marker_menu_item = item; transport_marker_menu->popup (1, ev->time); - } else { - - if (loc->is_mark()) { - Menu *markerMenu; - if (loc->is_session_range ()) { - if (session_range_marker_menu == 0) { - build_marker_menu (true); - } - markerMenu = session_range_marker_menu; - } else { - if (marker_menu == 0) - build_marker_menu (false); - 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); } } @@ -584,47 +819,51 @@ Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) } void -Editor::build_marker_menu (bool session_range) +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 (_("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 (_("Move Mark to Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Create range to next marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next))); + 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 (_("Lock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), true))); - items.push_back (MenuElem (_("Unlock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), false))); + items.push_back (CheckMenuElem (_("Lock"))); + CheckMenuItem* lock_item = static_cast (&items.back()); + if (loc->locked ()) { + lock_item->set_active (); + } + lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock)); + + items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); + CheckMenuItem* glue_item = static_cast (&items.back()); + if (loc->position_lock_style() == MusicTime) { + 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_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; @@ -635,7 +874,7 @@ Editor::build_range_marker_menu (bool loop_or_punch) 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))); @@ -647,7 +886,7 @@ Editor::build_range_marker_menu (bool loop_or_punch) 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))); @@ -662,16 +901,18 @@ Editor::build_range_marker_menu (bool loop_or_punch) } void -Editor::build_tm_marker_menu () +Editor::build_tempo_or_meter_marker_menu (bool can_remove) { using namespace Menu_Helpers; - tm_marker_menu = new Menu; - MenuList& items = tm_marker_menu->items(); - tm_marker_menu->set_name ("ArdourContextMenu"); + tempo_or_meter_marker_menu = new Menu; + 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 (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); + + items.back().set_sensitive (can_remove); } void @@ -739,7 +980,7 @@ Editor::marker_menu_select_all_selectables_using_range () bool is_start; if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { - select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set); + select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set, false); } } @@ -841,15 +1082,15 @@ Editor::marker_menu_range_to_next () 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_frames) { + if (end != max_framepos) { string range_name = l->name(); range_name += "-range"; - Location* newrange = new Location (marker->position(), end, range_name, Location::IsRangeMarker); + Location* newrange = new Location (*_session, marker->position(), end, range_name, Location::IsRangeMarker); _session->locations()->add (newrange); } } @@ -972,25 +1213,29 @@ Editor::marker_menu_loop_range () } void -Editor::marker_menu_edit () +Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const { - MeterMarker* mm; - TempoMarker* tm; - Marker* marker; - - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + Marker* marker = reinterpret_cast (p); + if (!marker) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } - if ((mm = dynamic_cast (marker)) != 0) { + *m = dynamic_cast (marker); + *t = dynamic_cast (marker); +} + +void +Editor::marker_menu_edit () +{ + MeterMarker* mm; + TempoMarker* tm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (mm) { edit_meter_section (&mm->meter()); - } else if ((tm = dynamic_cast (marker)) != 0) { + } else if (tm) { edit_tempo_section (&tm->tempo()); - } else { - fatal << X_("programming erorr: unhandled marker type in Editor::marker_menu_edit") - << endmsg; - /*NOTREACHED*/ } } @@ -999,16 +1244,11 @@ Editor::marker_menu_remove () { MeterMarker* mm; TempoMarker* tm; - Marker* marker; - - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { - fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ - } + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); - if ((mm = dynamic_cast (marker)) != 0) { + if (mm) { remove_meter_marker (marker_menu_item); - } else if ((tm = dynamic_cast (marker)) != 0) { + } else if (tm) { remove_tempo_marker (marker_menu_item); } else { remove_marker (*marker_menu_item, (GdkEvent*) 0); @@ -1016,9 +1256,8 @@ Editor::marker_menu_remove () } void -Editor::marker_menu_lock (bool yn) +Editor::toggle_marker_menu_lock () { - Marker* marker; if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { @@ -1031,12 +1270,14 @@ Editor::marker_menu_lock (bool yn) loc = find_location_from_marker (marker, ignored); - if (!loc) return; + if (!loc) { + return; + } - if (yn) { - loc->lock(); - } else { + if (loc->locked()) { loc->unlock (); + } else { + loc->lock (); } } @@ -1102,7 +1343,7 @@ Editor::new_transport_marker_menu_popdown () // hide rects transport_bar_drag_rect->hide(); - _drags->break_drag (); + _drags->abort (); } void @@ -1179,20 +1420,11 @@ Editor::marker_selection_changed () } 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); } } @@ -1225,3 +1457,48 @@ Editor::goto_nth_marker (int n) } } } + +void +Editor::toggle_marker_menu_glue () +{ + Marker* marker; + + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; + /*NOTREACHED*/ + } + + Location* loc; + bool ignored; + + loc = find_location_from_marker (marker, ignored); + + if (!loc) { + return; + } + + if (loc->position_lock_style() == MusicTime) { + loc->set_position_lock_style (AudioTime); + } else { + loc->set_position_lock_style (MusicTime); + } + +} + +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); + } +}