X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=c6a75015b52863f7d573000aff338a6d05924983;hb=3b4beb03b2a92ebfd1a9610b822360135c18038d;hp=8c2cbabb787fffa7d565af3d1b3a20eb34c54ba5;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 8c2cbabb78..c6a75015b5 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 @@ -15,30 +15,37 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include +#include #include #include #include #include -#include +#include "ardour/session.h" +#include "ardour/location.h" +#include "ardour/profile.h" +#include "pbd/memento_command.h" #include "editor.h" #include "marker.h" #include "selection.h" #include "editing.h" #include "gui_thread.h" +#include "simplerect.h" +#include "actions.h" +#include "prompter.h" #include "i18n.h" using namespace std; using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; +using namespace Gtkmm2ext; void Editor::clear_marker_display () @@ -53,6 +60,8 @@ Editor::clear_marker_display () void Editor::add_new_location (Location *location) { + ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location)); + LocationMarkers *lam = new LocationMarkers; uint32_t color; @@ -69,31 +78,44 @@ Editor::add_new_location (Location *location) } if (location->is_mark()) { - lam->start = new Marker (*this, GNOME_CANVAS_GROUP(marker_group), color, - location->name(), Marker::Mark, PublicEditor::canvas_marker_event, 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, GNOME_CANVAS_GROUP(transport_marker_group), color, - location->name(), Marker::LoopStart, PublicEditor::canvas_marker_event, location->start()); - lam->end = new Marker (*this, GNOME_CANVAS_GROUP(transport_marker_group), color, - location->name(), Marker::LoopEnd, PublicEditor::canvas_marker_event, location->end()); - + 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()); + } else if (location->is_auto_punch()) { // transport marker - lam->start = new Marker (*this, GNOME_CANVAS_GROUP(transport_marker_group), color, - location->name(), Marker::PunchIn, PublicEditor::canvas_marker_event, location->start()); - lam->end = new Marker (*this, GNOME_CANVAS_GROUP(transport_marker_group), color, - location->name(), Marker::PunchOut, PublicEditor::canvas_marker_event, location->end()); - - } else { + 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()); + } else { // range marker - lam->start = new Marker (*this, GNOME_CANVAS_GROUP(range_marker_group), color, - location->name(), Marker::Start, PublicEditor::canvas_marker_event, location->start()); - lam->end = new Marker (*this, GNOME_CANVAS_GROUP(range_marker_group), color, - location->name(), Marker::End, PublicEditor::canvas_marker_event, 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 ()) { @@ -114,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 @@ -127,7 +154,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()); @@ -142,14 +169,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()) { @@ -161,7 +191,7 @@ Editor::location_flags_changed (Location *location, void *src) } else { lam->set_color_rgba (location_range_color); } - + if (location->is_hidden()) { lam->hide(); } else { @@ -169,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) { @@ -195,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; @@ -216,18 +287,52 @@ 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 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); } @@ -244,79 +349,96 @@ 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 (jack_nframes_t startf, - jack_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 (jack_nframes_t where) +Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun) { + 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) { - Location *location = new Location (where, where, "mark", 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")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); - session->add_redo_no_execute (session->locations()->get_memento()); + 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); + } } } void -Editor::remove_marker (GnomeCanvasItem* item, GdkEvent* event) +Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) { Marker* marker; bool is_start; - if ((marker = static_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = static_cast (item.get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } + if (entered_marker == marker) { + entered_marker = NULL; + } + Location* loc = find_location_from_marker (marker, is_start); if (session && loc) { - if (loc->is_end()) { - /* you can't hide or delete this marker */ - return; - } - if (loc->is_auto_loop() || loc->is_auto_punch()) { - // just hide them - loc->set_hidden (true, this); - } - else { - Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc)); - } + Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc)); } } @@ -324,9 +446,10 @@ gint Editor::really_remove_marker (Location* loc) { session->begin_reversible_command (_("remove marker")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->remove (loc); - session->add_redo_no_execute (session->locations()->get_memento()); + XMLNode &after = session->locations()->get_state(); + session->add_command (new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); return FALSE; } @@ -335,7 +458,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()) { @@ -345,7 +468,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; @@ -356,7 +479,7 @@ Editor::location_gone (Location *location) } void -Editor::tm_marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) +Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { if (tm_marker_menu == 0) { build_tm_marker_menu (); @@ -367,34 +490,43 @@ Editor::tm_marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) } - void -Editor::marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) +Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { Marker * marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) { + if ((marker = reinterpret_cast (item->get_data("marker"))) == 0) { 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()) { if (transport_marker_menu == 0) { - build_transport_marker_menu (); + build_range_marker_menu (true); } marker_menu_item = item; transport_marker_menu->popup (1, ev->time); - } - else { - if (marker_menu == 0) { - build_marker_menu (); - } + } else { + + if (loc->is_mark()) { + bool start_or_end = loc->is_start() || loc->is_end(); + Menu *markerMenu; + if (start_or_end) { + if (start_end_marker_menu == 0) + build_marker_menu (true); + markerMenu = start_end_marker_menu; + } else { + if (marker_menu == 0) + build_marker_menu (false); + markerMenu = marker_menu; + } - Menu_Helpers::MenuList & children = marker_menu->items(); - // XXX: should really find this some other way + + // GTK2FIX use action group sensitivity +#ifdef GTK2FIX if (children.size() >= 3) { - MenuItem * loopitem = children[2]; + MenuItem * loopitem = &children[2]; if (loopitem) { if (loc->is_mark()) { loopitem->set_sensitive(false); @@ -404,15 +536,23 @@ Editor::marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) } } } - +#endif marker_menu_item = item; - marker_menu->popup (1, ev->time); + markerMenu->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); + } } } - void -Editor::new_transport_marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) +Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) { if (new_transport_marker_menu == 0) { build_new_transport_marker_menu (); @@ -423,37 +563,91 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* } void -Editor::transport_marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item) +Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) { if (transport_marker_menu == 0) { - build_transport_marker_menu (); + build_range_marker_menu (true); } transport_marker_menu->popup (1, ev->time); } void -Editor::build_marker_menu () +Editor::build_marker_menu (bool start_or_end) { using namespace Menu_Helpers; - marker_menu = new Menu; - MenuList& items = marker_menu->items(); - marker_menu->set_name ("ArdourContextMenu"); + Menu *markerMenu = new Menu; + if (start_or_end) { + start_end_marker_menu = markerMenu; + } else { + marker_menu = markerMenu; + } + MenuList& items = markerMenu->items(); + markerMenu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Locate to"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::marker_menu_loop_range))); - items.push_back (MenuElem (_("Set from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - items.push_back (MenuElem (_("Set from range"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); + 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 (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename))); + 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))); + 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 +Editor::build_range_marker_menu (bool loop_or_punch) +{ + using namespace Menu_Helpers; + + Menu *markerMenu = new Menu; + if (loop_or_punch) { + transport_marker_menu = markerMenu; + } else { + range_marker_menu = markerMenu; + } + 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 (_("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))); + 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()); + + 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 (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))); + if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range))); + } +} + void Editor::build_tm_marker_menu () { @@ -479,57 +673,96 @@ 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->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 -Editor::build_transport_marker_menu () +Editor::marker_menu_hide () { - using namespace Menu_Helpers; + Marker* marker; - transport_marker_menu = new Menu; - MenuList& items = transport_marker_menu->items(); - transport_marker_menu->set_name ("ArdourContextMenu"); + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; + /*NOTREACHED*/ + } - items.push_back (MenuElem (_("Locate to"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Set from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - items.push_back (MenuElem (_("Set from range"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide))); + Location* l; + bool is_start; + + if ((l = find_location_from_marker (marker, is_start)) != 0) { + l->set_hidden (true, this); + } } void -Editor::marker_menu_hide () +Editor::marker_menu_select_using_range () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { - l->set_hidden (true, this); + + if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { + set_selection_from_range (*l); } } +void +Editor::marker_menu_select_all_selectables_using_range () +{ + 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* l; + 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); + } + +} + +void +Editor::marker_menu_separate_regions_using_location () +{ + 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* l; + bool is_start; + + if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) { + separate_regions_using_location (*l); + } + +} + void Editor::marker_menu_play_from () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { if (l->is_mark()) { @@ -537,7 +770,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 { @@ -552,14 +785,14 @@ Editor::marker_menu_set_playhead () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { if (l->is_mark()) { @@ -575,29 +808,62 @@ 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 () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { 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 ()); } } } @@ -608,14 +874,14 @@ Editor::marker_menu_set_from_selection () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { if (l->is_mark()) { @@ -632,35 +898,61 @@ Editor::marker_menu_set_from_selection () } } else { - if (!selection->audio_regions.empty()) { - l->set_start (selection->audio_regions.start()); - l->set_end (selection->audio_regions.end_frame()); + if (!selection->regions.empty()) { + l->set_start (selection->regions.start()); + l->set_end (selection->regions.end_frame()); } } } } } + +void +Editor::marker_menu_play_range () +{ + 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* l; + bool is_start; + + if ((l = find_location_from_marker (marker, is_start)) != 0) { + + if (l->is_mark()) { + session->request_locate (l->start(), true); + } + else { + session->request_bounded_roll (l->start(), l->end()); + + } + } +} + void Editor::marker_menu_loop_range () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + 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) { Location* l2; if ((l2 = transport_loop_location()) != 0) { l2->set (l->start(), l->end()); - + // enable looping, reposition and start rolling - session->request_auto_loop(true); + session->request_play_loop(true); session->request_locate (l2->start(), true); } } @@ -673,7 +965,7 @@ Editor::marker_menu_edit () TempoMarker* tm; Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -696,7 +988,7 @@ Editor::marker_menu_remove () TempoMarker* tm; Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -706,7 +998,32 @@ Editor::marker_menu_remove () } else if ((tm = dynamic_cast (marker)) != 0) { remove_tempo_marker (marker_menu_item); } else { - remove_marker (marker_menu_item, (GdkEvent*) 0); + remove_marker (*marker_menu_item, (GdkEvent*) 0); + } +} + +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 (); } } @@ -715,7 +1032,7 @@ Editor::marker_menu_rename () { Marker* marker; - if ((marker = reinterpret_cast (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) { + if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } @@ -726,113 +1043,65 @@ Editor::marker_menu_rename () loc = find_location_from_marker (marker, is_start); if (!loc) return; - - Dialog dialog; - Entry entry; - Button ok_button (_("OK")); - Button cancel_button (_("Cancel")); - + + ArdourPrompter dialog (true); + string txt; + + dialog.set_prompt (_("New Name:")); + if (loc->is_mark()) { - dialog.set_title (_("ardour: rename mark")); + dialog.set_title (_("Rename Mark")); } else { - dialog.set_title (_("ardour: rename range")); + dialog.set_title (_("Rename Range")); } dialog.set_name ("MarkRenameWindow"); - dialog.set_size_request (300, -1); + dialog.set_size_request (250, -1); dialog.set_position (Gtk::WIN_POS_MOUSE); - dialog.set_modal (true); - - dialog.get_vbox()->set_border_width (10); - dialog.get_vbox()->pack_start (entry); - dialog.get_action_area()->pack_start (ok_button); - dialog.get_action_area()->pack_start (cancel_button); - - entry.set_text (loc->name()); - entry.set_name ("MarkerNameDisplay"); - ok_button.set_name ("EditorGTKButton"); - cancel_button.set_name ("EditorGTKButton"); - entry.activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1)); - cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1)); - ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1)); - dialog.delete_event.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1)); + dialog.add_button (_("Rename"), RESPONSE_ACCEPT); + dialog.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); + dialog.set_initial_text (loc->name()); - dialog.show_all (); - entry.grab_focus (); + dialog.show (); - run_sub_event_loop (); + switch (dialog.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } - if (sub_event_loop_status == 1) { + begin_reversible_command ( _("rename marker") ); + XMLNode &before = session->locations()->get_state(); - Location* l; - bool is_start; + dialog.get_result(txt); + loc->set_name (txt); - if ((l = find_location_from_marker (marker, is_start)) != 0) { - l->set_name (entry.get_text()); - } - } + 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 - gnome_canvas_item_hide (transport_bar_drag_rect); - gnome_canvas_item_hide (range_marker_drag_rect); + transport_bar_drag_rect->hide(); - return FALSE; + break_drag (); } void Editor::new_transport_marker_menu_set_loop () { - if (!session) return; - - begin_reversible_command (_("set loop range")); - - Location* tll; - - if ((tll = transport_loop_location()) == 0) { - Location* loc = new Location (temp_location->start(), temp_location->end(), _("Loop"), Location::IsAutoLoop); - session->add_undo (session->locations()->get_memento()); - session->locations()->add (loc, true); - session->set_auto_loop_location (loc); - session->add_redo_no_execute (session->locations()->get_memento()); - } - else { - session->add_undo (rettype(bind (mem_fun (*tll, &Location::set), tll->start(), tll->end()))); - session->add_redo (rettype(bind (mem_fun (*tll, &Location::set), temp_location->start(), temp_location->end()))); - tll->set_hidden (false, this); - tll->set (temp_location->start(), temp_location->end()); - } - - commit_reversible_command (); + set_loop_range (temp_location->start(), temp_location->end(), _("set loop range")); } void Editor::new_transport_marker_menu_set_punch () { - if (!session) return; - - begin_reversible_command (_("set punch range")); - - Location* tpl; - - if ((tpl = transport_punch_location()) == 0) { - tpl = new Location (temp_location->start(), temp_location->end(), _("Punch"), Location::IsAutoPunch); - session->add_undo (session->locations()->get_memento()); - session->locations()->add (tpl, true); - session->set_auto_punch_location (tpl); - session->add_redo_no_execute (session->locations()->get_memento()); - } else { - session->add_undo (rettype(bind (mem_fun (*tpl, &Location::set), tpl->start(), tpl->end()))); - session->add_redo (rettype(bind (mem_fun (*tpl, &Location::set), temp_location->start(), temp_location->end()))); - tpl->set_hidden(false, this); - tpl->set(temp_location->start(), temp_location->end()); - } - - commit_reversible_command (); + set_punch_range (temp_location->start(), temp_location->end(), _("set punch range")); } void @@ -844,19 +1113,20 @@ Editor::update_loop_range_view (bool visibility) Location* tll; - if (session->get_auto_loop() && ((tll = transport_loop_location()) != 0)) { + if (session->get_play_loop() && ((tll = transport_loop_location()) != 0)) { double x1 = frame_to_pixel (tll->start()); double x2 = frame_to_pixel (tll->end()); - - gnome_canvas_item_set (transport_loop_range_rect, "x1", x1, "x2", x2, NULL); - + + transport_loop_range_rect->property_x1() = x1; + transport_loop_range_rect->property_x2() = x2; + if (visibility) { - gnome_canvas_item_show (transport_loop_range_rect); + transport_loop_range_rect->show(); } - } - else if (visibility) { - gnome_canvas_item_hide (transport_loop_range_rect); + + } else if (visibility) { + transport_loop_range_rect->hide(); } } @@ -869,43 +1139,76 @@ Editor::update_punch_range_view (bool visibility) Location* tpl; - if ((session->get_punch_in() || session->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()); - - gnome_canvas_item_set (transport_punch_range_rect, "x1", x1, "x2", x2, NULL); - if (visibility) { - gnome_canvas_item_show (transport_punch_range_rect); - } - } - else if (visibility) { - gnome_canvas_item_hide (transport_punch_range_rect); - } - -// 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); -// } + transport_punch_range_rect->show(); + } + } else if (visibility) { + transport_punch_range_rect->hide(); + } +} + +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(); + } + } + + for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) { + (*x)->add_line (cursor_group, 0, _canvas_height); + (*x)->show_line (); + } +} + +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; + } + } }