X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=0504c08095a52cab0a917a1f6c6625721e38e2d5;hb=beb3eea62bf217d0a7b2a86a96d5c375329df10a;hp=724ff2c31ac9de4b34293c06966346d01b9558e4;hpb=f7f9d6fdc40248b190ec9c6e1a886261d55777ae;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 724ff2c31a..0504c08095 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -26,6 +26,7 @@ #include #include +#include #include #include "editor.h" @@ -77,9 +78,15 @@ Editor::add_new_location (Location *location) } if (location->is_mark()) { - lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); - lam->end = 0; + 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 { + lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); + } + lam->end = 0; + } else if (location->is_auto_loop()) { // transport marker lam->start = new Marker (*this, *transport_marker_group, color, @@ -95,12 +102,20 @@ Editor::add_new_location (Location *location) location->name(), Marker::PunchOut, location->end()); } else { - // range marker - lam->start = new Marker (*this, *range_marker_group, color, - location->name(), Marker::Start, location->start()); - lam->end = new Marker (*this, *range_marker_group, color, - location->name(), Marker::End, location->end()); + 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()); + lam->end = new Marker (*this, *cd_marker_group, color, + location->name(), Marker::End, location->end()); + } + else { + + lam->start = new Marker (*this, *range_marker_group, color, + location->name(), Marker::Start, location->start()); + lam->end = new Marker (*this, *range_marker_group, color, + location->name(), Marker::End, location->end()); + } } if (location->is_hidden ()) { @@ -121,6 +136,11 @@ Editor::add_new_location (Location *location) newpair.second = lam; location_markers.insert (newpair); + + if (select_new_marker && location->is_mark()) { + selection->set (lam->start); + select_new_marker = false; + } } void @@ -157,6 +177,9 @@ Editor::location_flags_changed (Location *location, void *src) return; } + // move cd markers to/from cd marker bar as appropriate + ensure_cd_marker_updated (lam, location); + if (location->is_cd_marker()) { lam->set_color_rgba (location_cd_marker_color); } else if (location->is_mark()) { @@ -176,21 +199,62 @@ Editor::location_flags_changed (Location *location, void *src) } } -Editor::LocationMarkers::~LocationMarkers () +void Editor::update_cd_marker_display () { - if (start) { - delete start; + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { + LocationMarkers * lam = i->second; + Location * location = i->first; + + ensure_cd_marker_updated (lam, location); } +} - if (end) { - delete end; +void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * location) +{ + if (location->is_cd_marker() + && (ruler_cd_marker_action->get_active() && lam->start->get_parent() != cd_marker_group)) + { + //cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl; + if (lam->start) { + lam->start->reparent (*cd_marker_group); + } + if (lam->end) { + lam->end->reparent (*cd_marker_group); + } + } + else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active()) + && (lam->start->get_parent() == cd_marker_group)) + { + //cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl; + if (location->is_mark()) { + if (lam->start) { + lam->start->reparent (*marker_group); + } + if (lam->end) { + lam->end->reparent (*marker_group); + } + } + else { + if (lam->start) { + lam->start->reparent (*range_marker_group); + } + if (lam->end) { + lam->end->reparent (*range_marker_group); + } + } } } +Editor::LocationMarkers::~LocationMarkers () +{ + delete start; + delete end; +} + Editor::LocationMarkers * -Editor::find_location_markers (Location *location) +Editor::find_location_markers (Location *location) const { - LocationMarkerMap::iterator i; + LocationMarkerMap::const_iterator i; for (i = location_markers.begin(); i != location_markers.end(); ++i) { if ((*i).first == location) { @@ -202,9 +266,9 @@ Editor::find_location_markers (Location *location) } Location * -Editor::find_location_from_marker (Marker *marker, bool& is_start) +Editor::find_location_from_marker (Marker *marker, bool& is_start) const { - LocationMarkerMap::iterator i; + LocationMarkerMap::const_iterator i; for (i = location_markers.begin(); i != location_markers.end(); ++i) { LocationMarkers *lm = (*i).second; @@ -223,11 +287,45 @@ Editor::find_location_from_marker (Marker *marker, bool& is_start) void Editor::refresh_location_display_internal (Locations::LocationList& locations) { - clear_marker_display (); + /* invalidate all */ + + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { + i->second->valid = false; + } + /* add new ones */ + for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) { + + LocationMarkerMap::iterator x; + + if ((x = location_markers.find (*i)) != location_markers.end()) { + x->second->valid = true; + continue; + } + add_new_location (*i); } + + /* remove dead ones */ + + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ) { + + LocationMarkerMap::iterator tmp; + + tmp = i; + ++tmp; + + if (!i->second->valid) { + delete i->second; + location_markers.erase (i); + } + + i = tmp; + } + + update_punch_range_view (false); + update_loop_range_view (false); } void @@ -272,8 +370,8 @@ Editor::LocationMarkers::set_name (const string& str) } void -Editor::LocationMarkers::set_position (nframes_t startf, - nframes_t endf) +Editor::LocationMarkers::set_position (nframes64_t startf, + nframes64_t endf) { start->set_position (startf); if (end) { end->set_position (endf); } @@ -287,18 +385,38 @@ Editor::LocationMarkers::set_color_rgba (uint32_t rgba) } void -Editor::mouse_add_new_marker (nframes_t where) +Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun) { - string markername; + string markername, markerprefix; + int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark); + + if (is_xrun) { + markerprefix = "xrun"; + flags = Location::IsMark; + } else { + markerprefix = "mark"; + } + if (session) { - session->locations()->next_available_name(markername,"mark"); - Location *location = new Location (where, where, markername, Location::IsMark); + session->locations()->next_available_name(markername, markerprefix); + if (!is_xrun && !choose_new_marker_name(markername)) { + return; + } + Location *location = new Location (where, where, markername, (Location::Flags) flags); session->begin_reversible_command (_("add marker")); XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); XMLNode &after = session->locations()->get_state(); session->add_command (new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); + + /* find the marker we just added */ + + LocationMarkers *lam = find_location_markers (location); + if (lam) { + /* make it the selected marker */ + selection->set (lam->start); + } } } @@ -313,6 +431,10 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event) /*NOTREACHED*/ } + if (entered_marker == marker) { + entered_marker = NULL; + } + Location* loc = find_location_from_marker (marker, is_start); if (session && loc) { @@ -464,17 +586,23 @@ Editor::build_marker_menu (bool start_or_end) MenuList& items = markerMenu->items(); markerMenu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Locate to Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from Mark"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Set Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); + items.push_back (MenuElem (_("Locate to here"), mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from here"), mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Move Mark to Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide Mark"), mem_fun(*this, &Editor::marker_menu_hide))); + items.push_back (MenuElem (_("Create range to next marker"), mem_fun(*this, &Editor::marker_menu_range_to_next))); + + items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide))); if (start_or_end) return; - items.push_back (MenuElem (_("Rename Mark"), mem_fun(*this, &Editor::marker_menu_rename))); - items.push_back (MenuElem (_("Remove Mark"), mem_fun(*this, &Editor::marker_menu_remove))); + items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename))); + items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, &Editor::marker_menu_lock), true))); + items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, &Editor::marker_menu_lock), false))); + items.push_back (SeparatorElem()); + + items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove))); } void @@ -491,19 +619,23 @@ Editor::build_range_marker_menu (bool loop_or_punch) MenuList& items = markerMenu->items(); markerMenu->set_name ("ArdourContextMenu"); + items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::marker_menu_play_range))); items.push_back (MenuElem (_("Locate to Range Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); items.push_back (MenuElem (_("Play from Range Mark"), mem_fun(*this, &Editor::marker_menu_play_from))); if (! loop_or_punch) { - items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::marker_menu_play_range))); items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range))); } items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); + if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); + } + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::export_range))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide))); - if (! loop_or_punch) { + if (!loop_or_punch) { + items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide))); items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename))); items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove))); } @@ -512,8 +644,9 @@ Editor::build_range_marker_menu (bool loop_or_punch) items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); - items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range))); - + if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range))); + } } void @@ -541,7 +674,7 @@ Editor::build_new_transport_marker_menu () items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop))); items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch))); - new_transport_marker_menu->signal_unmap_event().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); + new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); } void @@ -676,6 +809,37 @@ Editor::marker_menu_set_playhead () } } +void +Editor::marker_menu_range_to_next () +{ + Marker* marker; + if (!session) { + return; + } + + 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* l; + bool is_start; + + if ((l = find_location_from_marker (marker, is_start)) == 0) { + return; + } + + nframes_t end = session->locations()->first_mark_after (marker->position()); + + if (end != max_frames) { + string range_name = l->name(); + range_name += "-range"; + + Location* newrange = new Location (marker->position(), end, range_name, Location::IsRangeMarker); + session->locations()->add (newrange); + } +} + void Editor::marker_menu_set_from_playhead () { @@ -692,13 +856,13 @@ Editor::marker_menu_set_from_playhead () if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - l->set_start (session->transport_frame ()); + l->set_start (session->audible_frame ()); } else { if (is_start) { - l->set_start (session->transport_frame ()); + l->set_start (session->audible_frame ()); } else { - l->set_end (session->transport_frame ()); + l->set_end (session->audible_frame ()); } } } @@ -837,6 +1001,31 @@ Editor::marker_menu_remove () } } +void +Editor::marker_menu_lock (bool yn) +{ + + 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 (yn) { + loc->lock(); + } else { + loc->unlock (); + } +} + void Editor::marker_menu_rename () { @@ -896,14 +1085,12 @@ Editor::marker_menu_rename () commit_reversible_command (); } -gint -Editor::new_transport_marker_menu_popdown (GdkEventAny *ev) +void +Editor::new_transport_marker_menu_popdown () { // hide rects transport_bar_drag_rect->hide(); range_marker_drag_rect->hide(); - - return FALSE; } void @@ -954,43 +1141,99 @@ Editor::update_punch_range_view (bool visibility) Location* tpl; if ((Config->get_punch_in() || Config->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) { - - double x1 = frame_to_pixel (tpl->start()); - double x2 = frame_to_pixel (tpl->end()); - - transport_punch_range_rect->property_x1() = x1; - transport_punch_range_rect->property_x2() = x2; + guint track_canvas_width,track_canvas_height; + track_canvas->get_size(track_canvas_width,track_canvas_height); + if (Config->get_punch_in()) { + transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start()); + transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES)); + } else { + transport_punch_range_rect->property_x1() = 0; + transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width); + } if (visibility) { transport_punch_range_rect->show(); } - } - else if (visibility) { + } else if (visibility) { transport_punch_range_rect->hide(); } +} -// if (session->get_punch_in()) { -// double x = frame_to_pixel (transport_punch_location->start()); -// gnome_canvas_item_set (transport_punchin_line, "x1", x, "x2", x, NULL); - -// if (visibility) { -// gnome_canvas_item_show (transport_punchin_line); -// } -// } -// else if (visibility) { -// gnome_canvas_item_hide (transport_punchin_line); -// } +void +Editor::marker_selection_changed () +{ + if (session && session->deletion_in_progress()) { + return; + } + + 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(); + } + } + + edit_point_clock_connection_a.disconnect(); + edit_point_clock_connection_b.disconnect(); + + if (selection->markers.empty()) { + edit_point_clock.set (0); + return; + } + + for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { + (*x)->add_line (cursor_group, 0, canvas_height); + (*x)->show_line (); + } + + edit_point_clock.set (selection->markers.front()->position()); + + bool ignored; + Location* loc = find_location_from_marker (selection->markers.front(), ignored); + + if (loc) { + edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved)); + edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved)); + } +} + +void +Editor::selected_marker_moved (Location* loc) +{ + edit_point_clock.set (loc->start()); +} + +struct SortLocationsByPosition { + bool operator() (Location* a, Location* b) { + return a->start() < b->start(); + } +}; + +void +Editor::goto_nth_marker (int n) +{ + if (!session) { + return; + } + const Locations::LocationList& l (session->locations()->list()); + Locations::LocationList ordered; + ordered = l; + + SortLocationsByPosition cmp; + ordered.sort (cmp); -// if (session->get_punch_out()) { -// double x = frame_to_pixel (transport_punch_location->end()); - -// gnome_canvas_item_set (transport_punchout_line, "x1", x, "x2", x, NULL); - -// if (visibility) { -// gnome_canvas_item_show (transport_punchout_line); -// } -// } -// else if (visibility) { -// gnome_canvas_item_hide (transport_punchout_line); -// } + for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) { + if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_start()) { + if (n == 0) { + session->request_locate ((*i)->start(), session->transport_rolling()); + break; + } + --n; + } + } }