X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=7bd09379d8245bc0252c510eb06b7b54dbe99400;hb=1f2a518ee20a9e011f75fa2d961fd14f018445c0;hp=75776a7844c02513a1da1f9b353a63e326d70a82;hpb=b01bdb7e70f021da764e81a4b55722e746e4885d;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 75776a7844..7bd09379d8 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,10 @@ #include #include -#include -#include -#include +#include "ardour/location.h" +#include "ardour/profile.h" +#include "pbd/memento_command.h" #include "editor.h" #include "marker.h" @@ -77,30 +77,44 @@ Editor::add_new_location (Location *location) } if (location->is_mark()) { - lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start()); + + 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, + lam->start = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopStart, location->start()); - lam->end = new Marker (*this, *transport_marker_group, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::LoopEnd, location->end()); - + } else if (location->is_auto_punch()) { // transport marker - lam->start = new Marker (*this, *transport_marker_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, color, + lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchOut, location->end()); - - } else { + } 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 +135,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 @@ -134,7 +153,7 @@ Editor::location_changed (Location *location) /* a location that isn't "marked" with markers */ return; } - + lam->set_name (location->name()); lam->set_position (location->start(), location->end()); @@ -149,14 +168,17 @@ void Editor::location_flags_changed (Location *location, void *src) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src)); - + LocationMarkers *lam = find_location_markers (location); - + if (lam == 0) { /* a location that isn't "marked" with markers */ 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()) { @@ -168,7 +190,7 @@ Editor::location_flags_changed (Location *location, void *src) } else { lam->set_color_rgba (location_range_color); } - + if (location->is_hidden()) { lam->hide(); } else { @@ -176,15 +198,56 @@ 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 * @@ -228,7 +291,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) 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) { @@ -255,18 +318,20 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) if (!i->second->valid) { delete i->second; location_markers.erase (i); - } + } i = tmp; } - + + update_punch_range_view (false); + update_loop_range_view (false); } void Editor::refresh_location_display () { ENSURE_GUI_THREAD(mem_fun(*this, &Editor::refresh_location_display)); - + if (session) { session->locations()->apply (*this, &Editor::refresh_location_display_internal); } @@ -283,52 +348,64 @@ Editor::refresh_location_display_s (Change ignored) } void -Editor::LocationMarkers::hide() +Editor::LocationMarkers::hide() { start->hide (); if (end) { end->hide(); } } void -Editor::LocationMarkers::show() +Editor::LocationMarkers::show() { start->show (); if (end) { end->show(); } } void -Editor::LocationMarkers::set_name (const string& str) +Editor::LocationMarkers::set_name (const string& str) { start->set_name (str); if (end) { end->set_name (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); } } void -Editor::LocationMarkers::set_color_rgba (uint32_t rgba) +Editor::LocationMarkers::set_color_rgba (uint32_t rgba) { start->set_color_rgba (rgba); if (end) { end->set_color_rgba (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(); + XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); + XMLNode &after = session->locations()->get_state(); session->add_command (new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); @@ -343,7 +420,7 @@ Editor::mouse_add_new_marker (nframes_t where) } void -Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event) +Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) { Marker* marker; bool is_start; @@ -353,6 +430,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) { @@ -376,7 +457,7 @@ void Editor::location_gone (Location *location) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location)); - + LocationMarkerMap::iterator i; if (location == transport_loop_location()) { @@ -386,7 +467,7 @@ Editor::location_gone (Location *location) if (location == transport_punch_location()) { update_punch_range_view (true); } - + for (i = location_markers.begin(); i != location_markers.end(); ++i) { if ((*i).first == location) { delete (*i).second; @@ -416,7 +497,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } - + bool is_start; Location * loc = find_location_from_marker (marker, is_start); if (loc == transport_loop_location() || loc == transport_punch_location()) { @@ -454,7 +535,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } } } -#endif +#endif marker_menu_item = item; markerMenu->popup (1, ev->time); } @@ -470,7 +551,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } void -Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) +Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) { if (new_transport_marker_menu == 0) { build_new_transport_marker_menu (); @@ -481,7 +562,7 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite } void -Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) +Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) { if (transport_marker_menu == 0) { build_range_marker_menu (true); @@ -510,6 +591,8 @@ Editor::build_marker_menu (bool start_or_end) items.push_back (SeparatorElem()); + 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"), mem_fun(*this, &Editor::marker_menu_rename))); @@ -535,29 +618,33 @@ 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))); + items.push_back (SeparatorElem()); } - items.push_back (SeparatorElem()); - 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 @@ -585,7 +672,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 @@ -600,7 +687,7 @@ Editor::marker_menu_hide () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { l->set_hidden (true, this); } @@ -640,7 +727,7 @@ Editor::marker_menu_select_all_selectables_using_range () 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); } - + } void @@ -659,7 +746,7 @@ Editor::marker_menu_separate_regions_using_location () if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { separate_regions_using_location (*l); } - + } void @@ -674,7 +761,7 @@ Editor::marker_menu_play_from () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { @@ -682,7 +769,7 @@ Editor::marker_menu_play_from () } else { //session->request_bounded_roll (l->start(), l->end()); - + if (is_start) { session->request_locate (l->start(), true); } else { @@ -704,7 +791,7 @@ Editor::marker_menu_set_playhead () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { @@ -720,6 +807,39 @@ 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; + } + + nframes64_t start; + nframes64_t end; + session->locations()->marks_either_side (marker->position(), start, end); + + 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 () { @@ -732,17 +852,17 @@ Editor::marker_menu_set_from_playhead () Location* l; bool is_start; - + 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 ()); } } } @@ -760,7 +880,7 @@ Editor::marker_menu_set_from_selection () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { @@ -799,7 +919,7 @@ Editor::marker_menu_play_range () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { @@ -807,7 +927,7 @@ Editor::marker_menu_play_range () } else { session->request_bounded_roll (l->start(), l->end()); - + } } } @@ -824,12 +944,12 @@ Editor::marker_menu_loop_range () Location* l; bool is_start; - + if ((l = find_location_from_marker (marker, is_start)) != 0) { Location* l2; if ((l2 = transport_loop_location()) != 0) { l2->set (l->start(), l->end()); - + // enable looping, reposition and start rolling session->request_play_loop(true); session->request_locate (l2->start(), true); @@ -922,21 +1042,18 @@ Editor::marker_menu_rename () loc = find_location_from_marker (marker, is_start); if (!loc) return; - + ArdourPrompter dialog (true); string txt; dialog.set_prompt (_("New Name:")); - WindowTitle title(Glib::get_application_name()); if (loc->is_mark()) { - title += _("Rename Mark"); + dialog.set_title (_("Rename Mark")); } else { - title += _("Rename Range"); + dialog.set_title (_("Rename Range")); } - dialog.set_title(title.get_string()); - dialog.set_name ("MarkRenameWindow"); dialog.set_size_request (250, -1); dialog.set_position (Gtk::WIN_POS_MOUSE); @@ -955,24 +1072,23 @@ Editor::marker_menu_rename () } begin_reversible_command ( _("rename marker") ); - XMLNode &before = session->locations()->get_state(); + XMLNode &before = session->locations()->get_state(); dialog.get_result(txt); loc->set_name (txt); - - XMLNode &after = session->locations()->get_state(); + + XMLNode &after = session->locations()->get_state(); session->add_command (new MementoCommand(*(session->locations()), &before, &after)); 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; + break_drag (); } void @@ -1000,10 +1116,10 @@ Editor::update_loop_range_view (bool visibility) double x1 = frame_to_pixel (tll->start()); double x2 = frame_to_pixel (tll->end()); - + transport_loop_range_rect->property_x1() = x1; transport_loop_range_rect->property_x2() = x2; - + if (visibility) { transport_loop_range_rect->show(); } @@ -1022,57 +1138,38 @@ Editor::update_punch_range_view (bool visibility) Location* tpl; - if ((Config->get_punch_in() || Config->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) { + 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); + 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)); + } 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); + } - 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; - 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); -// } - -// 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); -// } } 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(); @@ -1088,7 +1185,7 @@ Editor::marker_selection_changed () } for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { - (*x)->add_line (cursor_group, canvas_height); + (*x)->add_line (cursor_group, 0, _canvas_height); (*x)->show_line (); } @@ -1108,3 +1205,33 @@ 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); + + 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; + } + } +}