X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=c6a75015b52863f7d573000aff338a6d05924983;hb=28d7542d23181f82a62c319ff4689fc8cc2b83c0;hp=60f838f06aba865bbcd1f80c9e6035176f555168;hpb=cb413146428ce5db5e281d70f2b3b7df27c1aaab;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 60f838f06a..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 @@ -23,11 +23,11 @@ #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" @@ -86,34 +86,34 @@ Editor::add_new_location (Location *location) 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 { // range marker if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { - lam->start = new Marker (*this, *cd_marker_group, color, + lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Start, location->start()); - lam->end = new Marker (*this, *cd_marker_group, color, + 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, + + lam->start = new Marker (*this, *range_marker_group, color, location->name(), Marker::Start, location->start()); - lam->end = new Marker (*this, *range_marker_group, color, + lam->end = new Marker (*this, *range_marker_group, color, location->name(), Marker::End, location->end()); } } @@ -154,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()); @@ -169,9 +169,9 @@ 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; @@ -191,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 { @@ -222,8 +222,8 @@ void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * locatio 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)) + 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()) { @@ -247,13 +247,8 @@ void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * locatio Editor::LocationMarkers::~LocationMarkers () { - if (start) { - delete start; - } - - if (end) { - delete end; - } + delete start; + delete end; } Editor::LocationMarkers * @@ -297,7 +292,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) { @@ -324,7 +319,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) if (!i->second->valid) { delete i->second; location_markers.erase (i); - } + } i = tmp; } @@ -337,7 +332,7 @@ 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); } @@ -354,43 +349,43 @@ 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, bool is_cd, bool is_xrun) +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); @@ -404,11 +399,14 @@ Editor::mouse_add_new_marker (nframes_t where, bool is_cd, bool is_xrun) if (session) { 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 (); @@ -423,7 +421,7 @@ Editor::mouse_add_new_marker (nframes_t where, bool is_cd, bool is_xrun) } void -Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event) +Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) { Marker* marker; bool is_start; @@ -460,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()) { @@ -470,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; @@ -500,7 +498,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()) { @@ -538,7 +536,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } } } -#endif +#endif marker_menu_item = item; markerMenu->popup (1, ev->time); } @@ -554,7 +552,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 (); @@ -565,7 +563,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); @@ -594,6 +592,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))); @@ -630,16 +630,17 @@ Editor::build_range_marker_menu (bool loop_or_punch) 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) { + 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))); if (!Profile->get_sae()) { @@ -672,7 +673,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 @@ -687,7 +688,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); } @@ -727,7 +728,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 @@ -746,7 +747,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 @@ -761,7 +762,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()) { @@ -769,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 { @@ -791,7 +792,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()) { @@ -807,6 +808,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 () { @@ -819,7 +853,7 @@ 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()) { @@ -847,7 +881,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()) { @@ -886,7 +920,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()) { @@ -894,7 +928,7 @@ Editor::marker_menu_play_range () } else { session->request_bounded_roll (l->start(), l->end()); - + } } } @@ -911,12 +945,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); @@ -1009,21 +1043,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); @@ -1042,24 +1073,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 @@ -1087,10 +1117,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(); } @@ -1109,52 +1139,23 @@ 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()); - + 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); - - transport_punch_range_rect->property_x1() = x1; - transport_punch_range_rect->property_x2() = x2; - - transport_punch_range_rect->property_x1() = (Config->get_punch_in() ? x1 : 0); - transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? x2 : track_canvas_width); - + 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); + } + 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 @@ -1169,44 +1170,20 @@ Editor::marker_selection_changed () 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, vertical_adjustment.get_value(), canvas_height); + (*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 { +struct SortLocationsByPosition { bool operator() (Location* a, Location* b) { return a->start() < b->start(); } @@ -1224,7 +1201,7 @@ Editor::goto_nth_marker (int n) 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) {