X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=ae11b5bfbee0f2205361cc496be17e2671be2c88;hb=035de2a367acd7ee27c3dbfba2f6c71f3c137eb8;hp=7989b83e2d7f918d7f0400471b56fd92edee415e;hpb=c83e48e07a0b4790512c6251d8ad8f941c881021;p=ardour.git diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 7989b83e2d..ae11b5bfbe 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -37,11 +37,11 @@ #include "simplerect.h" #include "actions.h" #include "prompter.h" +#include "editor_drag.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -60,7 +60,7 @@ Editor::clear_marker_display () void Editor::add_new_location (Location *location) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location)); + ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location) LocationMarkers *lam = new LocationMarkers; uint32_t color; @@ -101,6 +101,11 @@ Editor::add_new_location (Location *location) lam->end = new Marker (*this, *transport_marker_group, color, location->name(), Marker::PunchOut, location->end()); + } else if (location->is_session_range()) { + // session range + lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::Start, location->start()); + lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::End, location->end()); + } else { // range marker if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) { @@ -110,7 +115,6 @@ Editor::add_new_location (Location *location) 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, @@ -124,11 +128,11 @@ Editor::add_new_location (Location *location) lam->show (); } - location->start_changed.connect (mem_fun(*this, &Editor::location_changed)); - location->end_changed.connect (mem_fun(*this, &Editor::location_changed)); - location->changed.connect (mem_fun(*this, &Editor::location_changed)); - location->name_changed.connect (mem_fun(*this, &Editor::location_changed)); - location->FlagsChanged.connect (mem_fun(*this, &Editor::location_flags_changed)); + location->start_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); + location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); + location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); + location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context()); + location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context()); pair newpair; @@ -146,7 +150,7 @@ Editor::add_new_location (Location *location) void Editor::location_changed (Location *location) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location)); + ENSURE_GUI_THREAD (*this, &Editor::location_changed, location) LocationMarkers *lam = find_location_markers (location); @@ -155,7 +159,7 @@ Editor::location_changed (Location *location) return; } - lam->set_name (location->name()); + lam->set_name (location->name ()); lam->set_position (location->start(), location->end()); if (location->is_auto_loop()) { @@ -166,9 +170,9 @@ Editor::location_changed (Location *location) } void -Editor::location_flags_changed (Location *location, void *src) +Editor::location_flags_changed (Location *location, void*) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src)); + ENSURE_GUI_THREAD (*this, &Editor::location_flags_changed, location, src) LocationMarkers *lam = find_location_markers (location); @@ -331,20 +335,20 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations) void Editor::refresh_location_display () { - ENSURE_GUI_THREAD(mem_fun(*this, &Editor::refresh_location_display)); + ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display) - if (session) { - session->locations()->apply (*this, &Editor::refresh_location_display_internal); + if (_session) { + _session->locations()->apply (*this, &Editor::refresh_location_display_internal); } } void -Editor::refresh_location_display_s (Change ignored) +Editor::refresh_location_display_s (const PropertyChange&) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored)); + ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display_s, ignored) - if (session) { - session->locations()->apply (*this, &Editor::refresh_location_display_internal); + if (_session) { + _session->locations()->apply (*this, &Editor::refresh_location_display_internal); } } @@ -365,8 +369,15 @@ Editor::LocationMarkers::show() void Editor::LocationMarkers::set_name (const string& str) { - start->set_name (str); - if (end) { end->set_name (str); } + /* XXX: hack: don't change names of session start/end markers */ + + if (start->type() != Marker::Start) { + start->set_name (str); + } + + if (end && end->type() != Marker::End) { + end->set_name (str); + } } void @@ -397,18 +408,18 @@ Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun) markerprefix = "mark"; } - if (session) { - session->locations()->next_available_name(markername, markerprefix); + 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(); - session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _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 */ @@ -437,27 +448,27 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) Location* loc = find_location_from_marker (marker, is_start); - if (session && loc) { - Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc)); + if (_session && loc) { + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); } } gint Editor::really_remove_marker (Location* loc) { - session->begin_reversible_command (_("remove marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->remove (loc); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _session->begin_reversible_command (_("remove marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->remove (loc); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); return FALSE; } void Editor::location_gone (Location *location) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location)); + ENSURE_GUI_THREAD (*this, &Editor::location_gone, location) LocationMarkerMap::iterator i; @@ -479,15 +490,27 @@ Editor::location_gone (Location *location) } void -Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) +Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) { - if (tm_marker_menu == 0) { - build_tm_marker_menu (); - } - marker_menu_item = item; - tm_marker_menu->popup (1, ev->time); + + MeterMarker* mm; + TempoMarker* tm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + bool can_remove = false; + + if (mm) { + can_remove = mm->meter().movable (); + } else if (tm) { + can_remove = tm->tempo().movable (); + } else { + return; + } + + delete tempo_or_meter_marker_menu; + build_tempo_or_meter_marker_menu (can_remove); + tempo_or_meter_marker_menu->popup (1, ev->time); } void @@ -510,12 +533,12 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) } 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) + if (loc->is_session_range ()) { + if (session_range_marker_menu == 0) { build_marker_menu (true); - markerMenu = start_end_marker_menu; + } + markerMenu = session_range_marker_menu; } else { if (marker_menu == 0) build_marker_menu (false); @@ -573,36 +596,38 @@ Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*) } void -Editor::build_marker_menu (bool start_or_end) +Editor::build_marker_menu (bool session_range) { using namespace Menu_Helpers; Menu *markerMenu = new Menu; - if (start_or_end) { - start_end_marker_menu = markerMenu; + if (session_range) { + session_range_marker_menu = markerMenu; } else { marker_menu = markerMenu; } MenuList& items = markerMenu->items(); markerMenu->set_name ("ArdourContextMenu"); - 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 (MenuElem (_("Locate to here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Move Mark to Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Create range to next marker"), mem_fun(*this, &Editor::marker_menu_range_to_next))); + items.push_back (MenuElem (_("Create range to next marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next))); - items.push_back (MenuElem (_("Hide"), 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 (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide))); + if (session_range) { + return; + } + items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename))); + items.push_back (MenuElem (_("Lock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), true))); + items.push_back (MenuElem (_("Unlock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), false))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove))); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); } void @@ -619,46 +644,48 @@ 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))); + items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range))); + items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); if (! loop_or_punch) { - items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range))); + items.push_back (MenuElem (_("Loop Range"), sigc::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 Mark from Playhead"), sigc::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 (MenuElem (_("Set Range from Range Selection"), sigc::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 (MenuElem (_("Export Range"), sigc::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 (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide))); + items.push_back (MenuElem (_("Rename Range"), sigc::mem_fun(*this, &Editor::marker_menu_rename))); + items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); 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 (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); + items.push_back (MenuElem (_("Select All in Range"), sigc::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))); + items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range))); } } void -Editor::build_tm_marker_menu () +Editor::build_tempo_or_meter_marker_menu (bool can_remove) { using namespace Menu_Helpers; - tm_marker_menu = new Menu; - MenuList& items = tm_marker_menu->items(); - tm_marker_menu->set_name ("ArdourContextMenu"); + tempo_or_meter_marker_menu = new Menu; + MenuList& items = tempo_or_meter_marker_menu->items(); + tempo_or_meter_marker_menu->set_name ("ArdourContextMenu"); + + items.push_back (MenuElem (_("Edit"), sigc::mem_fun(*this, &Editor::marker_menu_edit))); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); - items.push_back (MenuElem (_("Edit"), mem_fun(*this, &Editor::marker_menu_edit))); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove))); + items.back().set_sensitive (can_remove); } void @@ -670,10 +697,10 @@ Editor::build_new_transport_marker_menu () MenuList& items = new_transport_marker_menu->items(); new_transport_marker_menu->set_name ("ArdourContextMenu"); - 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))); + items.push_back (MenuElem (_("Set Loop Range"), sigc::mem_fun(*this, &Editor::new_transport_marker_menu_set_loop))); + items.push_back (MenuElem (_("Set Punch Range"), sigc::mem_fun(*this, &Editor::new_transport_marker_menu_set_punch))); - new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); + new_transport_marker_menu->signal_unmap().connect ( sigc::mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); } void @@ -766,15 +793,15 @@ Editor::marker_menu_play_from () if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - session->request_locate (l->start(), true); + _session->request_locate (l->start(), true); } else { - //session->request_bounded_roll (l->start(), l->end()); + //_session->request_bounded_roll (l->start(), l->end()); if (is_start) { - session->request_locate (l->start(), true); + _session->request_locate (l->start(), true); } else { - session->request_locate (l->end(), true); + _session->request_locate (l->end(), true); } } } @@ -796,13 +823,13 @@ Editor::marker_menu_set_playhead () if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - session->request_locate (l->start(), false); + _session->request_locate (l->start(), false); } else { if (is_start) { - session->request_locate (l->start(), false); + _session->request_locate (l->start(), false); } else { - session->request_locate (l->end(), false); + _session->request_locate (l->end(), false); } } } @@ -812,7 +839,7 @@ void Editor::marker_menu_range_to_next () { Marker* marker; - if (!session) { + if (!_session) { return; } @@ -830,14 +857,14 @@ Editor::marker_menu_range_to_next () nframes64_t start; nframes64_t end; - session->locations()->marks_either_side (marker->position(), start, 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); + _session->locations()->add (newrange); } } @@ -857,13 +884,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->audible_frame ()); + l->set_start (_session->audible_frame ()); } else { if (is_start) { - l->set_start (session->audible_frame ()); + l->set_start (_session->audible_frame ()); } else { - l->set_end (session->audible_frame ()); + l->set_end (_session->audible_frame ()); } } } @@ -924,10 +951,10 @@ Editor::marker_menu_play_range () if ((l = find_location_from_marker (marker, is_start)) != 0) { if (l->is_mark()) { - session->request_locate (l->start(), true); + _session->request_locate (l->start(), true); } else { - session->request_bounded_roll (l->start(), l->end()); + _session->request_bounded_roll (l->start(), l->end()); } } @@ -952,32 +979,36 @@ Editor::marker_menu_loop_range () l2->set (l->start(), l->end()); // enable looping, reposition and start rolling - session->request_play_loop(true); - session->request_locate (l2->start(), true); + _session->request_play_loop(true); + _session->request_locate (l2->start(), true); } } } void -Editor::marker_menu_edit () +Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const { - MeterMarker* mm; - TempoMarker* tm; - Marker* marker; - - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { + Marker* marker = reinterpret_cast (p); + if (!marker) { fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; /*NOTREACHED*/ } - if ((mm = dynamic_cast (marker)) != 0) { + *m = dynamic_cast (marker); + *t = dynamic_cast (marker); +} + +void +Editor::marker_menu_edit () +{ + MeterMarker* mm; + TempoMarker* tm; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); + + if (mm) { edit_meter_section (&mm->meter()); - } else if ((tm = dynamic_cast (marker)) != 0) { + } else if (tm) { edit_tempo_section (&tm->tempo()); - } else { - fatal << X_("programming erorr: unhandled marker type in Editor::marker_menu_edit") - << endmsg; - /*NOTREACHED*/ } } @@ -986,16 +1017,11 @@ Editor::marker_menu_remove () { MeterMarker* mm; TempoMarker* tm; - Marker* marker; + dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm); - if ((marker = reinterpret_cast (marker_menu_item->get_data ("marker"))) == 0) { - fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg; - /*NOTREACHED*/ - } - - if ((mm = dynamic_cast (marker)) != 0) { + if (mm) { remove_meter_marker (marker_menu_item); - } else if ((tm = dynamic_cast (marker)) != 0) { + } else if (tm) { remove_tempo_marker (marker_menu_item); } else { remove_marker (*marker_menu_item, (GdkEvent*) 0); @@ -1073,13 +1099,13 @@ 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(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); commit_reversible_command (); } @@ -1089,7 +1115,7 @@ Editor::new_transport_marker_menu_popdown () // hide rects transport_bar_drag_rect->hide(); - break_drag (); + _drags->abort (); } void @@ -1107,13 +1133,13 @@ Editor::new_transport_marker_menu_set_punch () void Editor::update_loop_range_view (bool visibility) { - if (session == 0) { + if (_session == 0) { return; } Location* tll; - if (session->get_play_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()); @@ -1133,21 +1159,21 @@ Editor::update_loop_range_view (bool visibility) void Editor::update_punch_range_view (bool visibility) { - if (session == 0) { + if (_session == 0) { return; } Location* tpl; - if ((session->config.get_punch_in() || session->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()) { + 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)); + 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); + transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width); } if (visibility) { @@ -1161,7 +1187,7 @@ Editor::update_punch_range_view (bool visibility) void Editor::marker_selection_changed () { - if (session && session->deletion_in_progress()) { + if (_session && _session->deletion_in_progress()) { return; } @@ -1177,34 +1203,10 @@ Editor::marker_selection_changed () } } - 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 { @@ -1216,10 +1218,10 @@ struct SortLocationsByPosition { void Editor::goto_nth_marker (int n) { - if (!session) { + if (!_session) { return; } - const Locations::LocationList& l (session->locations()->list()); + const Locations::LocationList& l (_session->locations()->list()); Locations::LocationList ordered; ordered = l; @@ -1227,9 +1229,9 @@ Editor::goto_nth_marker (int n) 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 ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) { if (n == 0) { - session->request_locate ((*i)->start(), session->transport_rolling()); + _session->request_locate ((*i)->start(), _session->transport_rolling()); break; } --n;