X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=62edad9991165d038ea656418e608ba7406fd64e;hb=265e26c2db45314ebaaa4801a9cc0101697fbe8f;hp=3bc2980e153ea58e1183021b5bb5d6310601ca31;hpb=ff9ddf510065305e13d169d35f9b4e6b88ce76d7;p=ardour.git diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 3bc2980e15..62edad9991 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -28,6 +28,13 @@ #include #include +#include "ardour_ui.h" +/* + * ardour_ui.h include was moved to the top of the list + * due to a conflicting definition of 'Style' between + * Apple's MacTypes.h and BarController. + */ + #include #include @@ -65,10 +72,11 @@ #include "ardour/session_state_utils.h" #include "ardour/tempo.h" #include "ardour/utils.h" +#include "ardour/session_playlists.h" +#include "ardour/audioengine.h" #include "control_protocol/control_protocol.h" -#include "ardour_ui.h" #include "editor.h" #include "keyboard.h" #include "marker.h" @@ -81,6 +89,7 @@ #include "audio_time_axis.h" #include "utils.h" #include "crossfade_view.h" +#include "canvas-noevent-text.h" #include "editing.h" #include "public_editor.h" #include "crossfade_edit.h" @@ -113,7 +122,6 @@ #endif using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -123,6 +131,7 @@ using namespace Editing; using PBD::internationalize; using PBD::atoi; +using Gtkmm2ext::Keyboard; const double Editor::timebar_height = 15.0; @@ -136,10 +145,19 @@ static const gchar *_snap_type_strings[] = { N_("Seconds"), N_("Minutes"), N_("Beats/32"), + N_("Beats/28"), + N_("Beats/24"), N_("Beats/16"), + N_("Beats/14"), + N_("Beats/12"), + N_("Beats/10"), N_("Beats/8"), + N_("Beats/7"), + N_("Beats/6"), + N_("Beats/5"), N_("Beats/4"), N_("Beats/3"), + N_("Beats/2"), N_("Beats"), N_("Bars"), N_("Marks"), @@ -170,7 +188,7 @@ static const gchar *_zoom_focus_strings[] = { N_("Center"), N_("Playhead"), N_("Mouse"), - N_("Active Mark"), + N_("Edit point"), 0 }; @@ -211,9 +229,32 @@ show_me_the_size (Requisition* r, const char* what) cerr << "size of " << what << " = " << r->width << " x " << r->height << endl; } +#ifdef GTKOSX +static void +pane_size_watcher (Paned* pane) +{ + /* if the handle of a pane vanishes into (at least) the tabs of a notebook, + it is no longer accessible. so stop that. this doesn't happen on X11, + just the quartz backend. + + ugh. + */ + + int max_width_of_lhs = GTK_WIDGET(pane->gobj())->allocation.width - 25; + + gint pos = pane->get_position (); + + if (pos > max_width_of_lhs) { + pane->set_position (max_width_of_lhs); + } +} +#endif + Editor::Editor () + : _join_object_range_state (JOIN_OBJECT_RANGE_NONE) + /* time display buttons */ - : minsec_label (_("Mins:Secs")) + , minsec_label (_("Mins:Secs")) , bbt_label (_("Bars:Beats")) , timecode_label (_("Timecode")) , frame_label (_("Samples")) @@ -230,11 +271,10 @@ Editor::Editor () */ , vertical_adjustment (0.0, 0.0, 10.0, 400.0) - , horizontal_adjustment (0.0, 0.0, 20.0, 1200.0) /* tool bar related */ - , zoom_range_clock (X_("zoomrange"), false, X_("ZoomRangeClock"), true, true) + , zoom_range_clock (X_("zoomrange"), false, X_("ZoomRangeClock"), true, false, true) , toolbar_selection_clock_table (2,3) @@ -249,9 +289,10 @@ Editor::Editor () /* nudge */ - , nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true) + , nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, false, true) , meters_running(false) , _pending_locate_request (false) + , _pending_initial_locate (false) { constructed = false; @@ -260,7 +301,6 @@ Editor::Editor () PublicEditor::_instance = this; - session = 0; _have_idled = false; selection = new Selection (this); @@ -272,7 +312,7 @@ Editor::Editor () clicked_crossfadeview = 0; clicked_control_point = 0; last_update_frame = 0; - _drag = 0; + _drags = new DragManager (this); current_mixer_strip = 0; current_bbt_points = 0; tempo_lines = 0; @@ -293,30 +333,28 @@ Editor::Editor () last_autoscroll_y = 0; autoscroll_active = false; autoscroll_timeout_tag = -1; - interthread_progress_window = 0; logo_item = 0; analysis_window = 0; current_interthread_info = 0; _show_measures = true; - _show_waveforms_recording = true; show_gain_after_trim = false; verbose_cursor_on = true; - route_removal = false; last_item_entered = 0; last_item_entered_n = 0; have_pending_keyboard_selection = false; _follow_playhead = true; + _stationary_playhead = false; _xfade_visibility = true; editor_ruler_menu = 0; no_ruler_shown_update = false; marker_menu = 0; - start_end_marker_menu = 0; + session_range_marker_menu = 0; range_marker_menu = 0; marker_menu_item = 0; - tm_marker_menu = 0; + tempo_or_meter_marker_menu = 0; transport_marker_menu = 0; new_transport_marker_menu = 0; editor_mixer_strip_width = Wide; @@ -330,13 +368,11 @@ Editor::Editor () entered_regionview = 0; entered_marker = 0; clear_entered_track = false; - _new_regionviews_show_envelope = false; current_timefx = 0; playhead_cursor = 0; button_release_can_deselect = true; _dragging_playhead = false; _dragging_edit_point = false; - _dragging_hscrollbar = false; select_new_marker = false; rhythm_ferret = 0; _bundle_manager = 0; @@ -362,11 +398,10 @@ Editor::Editor () current_canvas_cursor = 0; frames_per_unit = 2048; /* too early to use reset_zoom () */ - reset_hscrollbar_stepping (); zoom_focus = ZoomFocusLeft; set_zoom_focus (ZoomFocusLeft); - zoom_range_clock.ValueChanged.connect (mem_fun(*this, &Editor::zoom_adjustment_changed)); + zoom_range_clock.ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed)); bbt_label.set_name ("EditorTimeButton"); bbt_label.set_size_request (-1, (int)timebar_height); @@ -431,19 +466,18 @@ Editor::Editor () transport_mark_label.set_no_show_all(); initialize_rulers (); - _summary = new EditorSummary (this); initialize_canvas (); + _summary = new EditorSummary (this); - selection->TimeChanged.connect (mem_fun(*this, &Editor::time_selection_changed)); - selection->TracksChanged.connect (mem_fun(*this, &Editor::track_selection_changed)); - editor_regions_selection_changed_connection = selection->RegionsChanged.connect (mem_fun(*this, &Editor::region_selection_changed)); - selection->PointsChanged.connect (mem_fun(*this, &Editor::point_selection_changed)); - selection->MarkersChanged.connect (mem_fun(*this, &Editor::marker_selection_changed)); + selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed)); + selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed)); + editor_regions_selection_changed_connection = selection->RegionsChanged.connect (sigc::mem_fun(*this, &Editor::region_selection_changed)); + selection->PointsChanged.connect (sigc::mem_fun(*this, &Editor::point_selection_changed)); + selection->MarkersChanged.connect (sigc::mem_fun(*this, &Editor::marker_selection_changed)); edit_controls_vbox.set_spacing (0); - horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::scroll_canvas_horizontally), false); - vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling), true); - track_canvas->signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler)); + vertical_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &Editor::tie_vertical_scrolling), true); + track_canvas->signal_map_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_map_handler)); HBox* h = manage (new HBox); _group_tabs = new EditorGroupTabs (this); @@ -453,20 +487,11 @@ Editor::Editor () controls_layout.set_name ("EditControlsBase"); controls_layout.add_events (Gdk::SCROLL_MASK); - controls_layout.signal_scroll_event().connect (mem_fun(*this, &Editor::control_layout_scroll), false); + controls_layout.signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false); controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); - controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release)); - controls_layout_size_request_connection = controls_layout.signal_size_request().connect (mem_fun (*this, &Editor::controls_layout_size_request)); - - edit_vscrollbar.set_adjustment (vertical_adjustment); - edit_hscrollbar.set_adjustment (horizontal_adjustment); - - edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscrollbar_button_press), false); - edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release), false); - edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate)); - - edit_hscrollbar.set_name ("EditorHScrollbar"); + controls_layout.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_release)); + controls_layout_size_request_connection = controls_layout.signal_size_request().connect (sigc::mem_fun (*this, &Editor::controls_layout_size_request)); build_cursors (); @@ -482,11 +507,11 @@ Editor::Editor () ruler_label_event_box.add (ruler_label_vbox); ruler_label_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - ruler_label_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release)); + ruler_label_event_box.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_label_button_release)); time_button_event_box.add (time_button_vbox); time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release)); + time_button_event_box.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_label_button_release)); /* these enable us to have a dedicated window (for cursor setting, etc.) for the canvas areas. @@ -529,7 +554,7 @@ Editor::Editor () nlabel = manage (new Label (_("Regions"))); nlabel->set_angle (-90); the_notebook.append_page (_regions->widget (), *nlabel); - nlabel = manage (new Label (_("Tracks/Busses"))); + nlabel = manage (new Label (_("Tracks & Busses"))); nlabel->set_angle (-90); the_notebook.append_page (_routes->widget (), *nlabel); nlabel = manage (new Label (_("Snapshots"))); @@ -553,13 +578,46 @@ Editor::Editor () VPaned *editor_summary_pane = manage(new VPaned()); editor_summary_pane->pack1(edit_packer); - editor_summary_pane->pack2(*_summary); + + Button* summary_arrows_left_left = manage (new Button); + summary_arrows_left_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE))); + summary_arrows_left_left->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left)); + Button* summary_arrows_left_right = manage (new Button); + summary_arrows_left_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE))); + summary_arrows_left_right->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right)); + VBox* summary_arrows_left = manage (new VBox); + summary_arrows_left->pack_start (*summary_arrows_left_left); + summary_arrows_left->pack_start (*summary_arrows_left_right); + + Button* summary_arrows_right_left = manage (new Button); + summary_arrows_right_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE))); + summary_arrows_right_left->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left)); + Button* summary_arrows_right_right = manage (new Button); + summary_arrows_right_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE))); + summary_arrows_right_right->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right)); + VBox* summary_arrows_right = manage (new VBox); + summary_arrows_right->pack_start (*summary_arrows_right_left); + summary_arrows_right->pack_start (*summary_arrows_right_right); + + Frame* summary_frame = manage (new Frame); + summary_frame->set_shadow_type (Gtk::SHADOW_ETCHED_IN); + summary_frame->add (*_summary); + summary_frame->show (); + + _summary_hbox.pack_start (*summary_arrows_left, false, false); + _summary_hbox.pack_start (*summary_frame, true, true); + _summary_hbox.pack_start (*summary_arrows_right, false, false); + + editor_summary_pane->pack2 (_summary_hbox); edit_pane.pack1 (*editor_summary_pane, true, true); edit_pane.pack2 (the_notebook, false, true); - edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast (&edit_pane))); - + edit_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Editor::pane_allocation_handler), static_cast (&edit_pane))); +#ifdef GTKOSX + Glib::PropertyProxy proxy = edit_pane.property_position(); + proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast (&edit_pane))); +#endif top_hbox.pack_start (toolbar_frame, false, true); HBox *hbox = manage (new HBox); @@ -596,18 +654,15 @@ Editor::Editor () set_state (*node, Stateful::loading_state_version); _playlist_selector = new PlaylistSelector(); - _playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast (_playlist_selector))); + _playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast (_playlist_selector))); - RegionView::RegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_regionview)); + RegionView::RegionViewGoingAway.connect (*this, invalidator (*this), ui_bind (&Editor::catch_vanishing_regionview, this, _1), gui_context()); /* nudge stuff */ nudge_forward_button.add (*(manage (new Image (::get_icon("nudge_right"))))); nudge_backward_button.add (*(manage (new Image (::get_icon("nudge_left"))))); - ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards")); - ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards")); - nudge_forward_button.set_name ("TransportButton"); nudge_backward_button.set_name ("TransportButton"); @@ -643,18 +698,24 @@ Editor::Editor () add (vpacker); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); - signal_delete_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close)); + signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); + signal_delete_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close)); /* allow external control surfaces/protocols to do various things */ - ControlProtocol::ZoomToSession.connect (mem_fun (*this, &Editor::temporal_zoom_session)); - ControlProtocol::ZoomIn.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), false)); - ControlProtocol::ZoomOut.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), true)); - ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll)); - BasicUI::AccessAction.connect (mem_fun (*this, &Editor::access_action)); + ControlProtocol::ZoomToSession.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_session, this), gui_context()); + ControlProtocol::ZoomIn.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, false), gui_context()); + ControlProtocol::ZoomOut.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, true), gui_context()); + ControlProtocol::ScrollTimeline.connect (*this, invalidator (*this), ui_bind (&Editor::control_scroll, this, _1), gui_context()); + BasicUI::AccessAction.connect (*this, invalidator (*this), ui_bind (&Editor::access_action, this, _1, _2), gui_context()); + + /* problematic: has to return a value and thus cannot be x-thread */ + + Session::AskAboutPlaylistDeletion.connect_same_thread (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1)); - Config->ParameterChanged.connect (mem_fun (*this, &Editor::parameter_changed)); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Editor::parameter_changed, this, _1), gui_context()); + + TimeAxisView::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Editor::timeaxisview_deleted, this, _1), gui_context()); _last_normalization_value = 0; @@ -679,7 +740,7 @@ Editor::~Editor() delete _routes; delete _route_groups; delete track_canvas; - delete _drag; + delete _drags; } void @@ -696,10 +757,8 @@ Editor::catch_vanishing_regionview (RegionView *rv) audioregionview by itself. */ - if (_drag && rv->get_canvas_group() == _drag->item() && !_drag->ending()) { - _drag->end_grab (0); - delete _drag; - _drag = 0; + if (_drags->active() && _drags->have_item (rv->get_canvas_group()) && !_drags->ending()) { + _drags->abort (); } if (clicked_regionview == rv) { @@ -763,6 +822,8 @@ Editor::show_window () tv = (static_cast(*i)); tv->reset_height (); } + + reset_zoom (frames_per_unit); } present (); @@ -775,8 +836,8 @@ Editor::instant_save () return; } - if (session) { - session->add_instant_xml(get_state()); + if (_session) { + _session->add_instant_xml(get_state()); } else { Config->add_instant_xml(get_state()); } @@ -785,7 +846,7 @@ Editor::instant_save () void Editor::zoom_adjustment_changed () { - if (session == 0) { + if (_session == 0) { return; } @@ -794,8 +855,8 @@ Editor::zoom_adjustment_changed () if (fpu < 1.0) { fpu = 1.0; zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width)); - } else if (fpu > session->current_end_frame() / _canvas_width) { - fpu = session->current_end_frame() / _canvas_width; + } else if (fpu > _session->current_end_frame() / _canvas_width) { + fpu = _session->current_end_frame() / _canvas_width; zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width)); } @@ -805,9 +866,9 @@ Editor::zoom_adjustment_changed () void Editor::control_scroll (float fraction) { - ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::control_scroll), fraction)); + ENSURE_GUI_THREAD (*this, &Editor::control_scroll, fraction) - if (!session) { + if (!_session) { return; } @@ -825,7 +886,7 @@ Editor::control_scroll (float fraction) */ if (!_control_scroll_target) { - _control_scroll_target = session->transport_frame(); + _control_scroll_target = _session->transport_frame(); _dragging_playhead = true; } @@ -861,13 +922,13 @@ Editor::control_scroll (float fraction) /* add the next timeout */ - control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250); + control_scroll_connection = Glib::signal_timeout().connect (sigc::bind (sigc::mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250); } bool Editor::deferred_control_scroll (nframes64_t /*target*/) { - session->request_locate (*_control_scroll_target, session->transport_rolling()); + _session->request_locate (*_control_scroll_target, _session->transport_rolling()); // reset for next stream _control_scroll_target = boost::none; _dragging_playhead = false; @@ -877,11 +938,11 @@ Editor::deferred_control_scroll (nframes64_t /*target*/) void Editor::access_action (std::string action_group, std::string action_item) { - if (!session) { + if (!_session) { return; } - ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::access_action), action_group, action_item)); + ENSURE_GUI_THREAD (*this, &Editor::access_action, action_group, action_item) RefPtr act; act = ActionManager::get_action( action_group.c_str(), action_item.c_str() ); @@ -889,8 +950,6 @@ Editor::access_action (std::string action_group, std::string action_item) if (act) { act->activate(); } - - } void @@ -900,26 +959,12 @@ Editor::on_realize () Realized (); } -void -Editor::start_scrolling () -{ - scroll_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect - (mem_fun(*this, &Editor::update_current_screen)); - -} - -void -Editor::stop_scrolling () -{ - scroll_connection.disconnect (); -} - void Editor::map_position_change (nframes64_t frame) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame)); + ENSURE_GUI_THREAD (*this, &Editor::map_position_change, frame) - if (session == 0 || !_follow_playhead) { + if (_session == 0 || !_follow_playhead) { return; } @@ -954,47 +999,21 @@ Editor::center_screen_internal (nframes64_t frame, float page) reset_x_origin (frame); } -void -Editor::handle_new_duration () -{ - if (!session) { - return; - } - - ENSURE_GUI_THREAD (mem_fun (*this, &Editor::handle_new_duration)); - nframes64_t new_end = session->current_end_frame() + (nframes64_t) floorf (current_page_frames() * 0.10f); - - horizontal_adjustment.set_upper (new_end / frames_per_unit); - horizontal_adjustment.set_page_size (current_page_frames()/frames_per_unit); - - if (horizontal_adjustment.get_value() + _canvas_width > horizontal_adjustment.get_upper()) { - horizontal_adjustment.set_value (horizontal_adjustment.get_upper() - _canvas_width); - } - //cerr << "Editor::handle_new_duration () called ha v:l:u:ps:lcf = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << endl;//DEBUG -} - -void -Editor::update_title_s (const string & snap_name) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name)); - - update_title (); -} void Editor::update_title () { - ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_title)); + ENSURE_GUI_THREAD (*this, &Editor::update_title) - if (session) { - bool dirty = session->dirty(); + if (_session) { + bool dirty = _session->dirty(); string session_name; - if (session->snap_name() != session->name()) { - session_name = session->snap_name(); + if (_session->snap_name() != _session->name()) { + session_name = _session->snap_name(); } else { - session_name = session->name(); + session_name = _session->name(); } if (dirty) { @@ -1008,14 +1027,40 @@ Editor::update_title () } void -Editor::connect_to_session (Session *t) +Editor::set_session (Session *t) { - session = t; + SessionHandlePtr::set_session (t); + + if (!_session) { + return; + } + + zoom_range_clock.set_session (_session); + _playlist_selector->set_session (_session); + nudge_clock.set_session (_session); + _summary->set_session (_session); + _group_tabs->set_session (_session); + _route_groups->set_session (_session); + _regions->set_session (_session); + _snapshots->set_session (_session); + _routes->set_session (_session); + _locations->set_session (_session); + + if (rhythm_ferret) { + rhythm_ferret->set_session (_session); + } + + if (analysis_window) { + analysis_window->set_session (_session); + } + + if (sfbrowser) { + sfbrowser->set_session (_session); + } compute_fixed_ruler_scale (); /* there are never any selected regions at startup */ - sensitize_the_right_region_actions (false); XMLNode* node = ARDOUR_UI::instance()->editor_settings(); @@ -1023,112 +1068,90 @@ Editor::connect_to_session (Session *t) /* catch up with the playhead */ - session->request_locate (playhead_cursor->current_frame); + _session->request_locate (playhead_cursor->current_frame); + _pending_initial_locate = true; update_title (); - session->GoingAway.connect (mem_fun(*this, &Editor::session_going_away)); - session->history().Changed.connect (mem_fun (*this, &Editor::history_changed)); - /* These signals can all be emitted by a non-GUI thread. Therefore the handlers for them must not attempt to directly interact with the GUI, but use Gtkmm2ext::UI::instance()->call_slot(); */ - session_connections.push_back (session->TransportStateChange.connect (mem_fun(*this, &Editor::map_transport_state))); - session_connections.push_back (session->PositionChanged.connect (mem_fun(*this, &Editor::map_position_change))); - session_connections.push_back (session->RouteAdded.connect (mem_fun(*this, &Editor::handle_new_route))); - session_connections.push_back (session->DurationChanged.connect (mem_fun(*this, &Editor::handle_new_duration))); - session_connections.push_back (session->DirtyChanged.connect (mem_fun(*this, &Editor::update_title))); - session_connections.push_back (session->StateSaved.connect (mem_fun(*this, &Editor::update_title_s))); - session_connections.push_back (session->AskAboutPlaylistDeletion.connect (mem_fun(*this, &Editor::playlist_deletion_dialog))); - - session_connections.push_back (session->TimecodeOffsetChanged.connect (mem_fun(*this, &Editor::update_just_timecode))); + _session->TransportStateChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::map_transport_state, this), gui_context()); + _session->PositionChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::map_position_change, this, _1), gui_context()); + _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&Editor::handle_new_route, this, _1), gui_context()); + _session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_title, this), gui_context()); + _session->TimecodeOffsetChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_just_timecode, this), gui_context()); + _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::tempo_map_changed, this, _1), gui_context()); + _session->Located.connect (_session_connections, invalidator (*this), boost::bind (&Editor::located, this), gui_context()); + _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::parameter_changed, this, _1), gui_context()); + _session->StateSaved.connect (_session_connections, invalidator (*this), ui_bind (&Editor::session_state_saved, this, _1), gui_context()); + _session->locations()->added.connect (_session_connections, invalidator (*this), ui_bind (&Editor::add_new_location, this, _1), gui_context()); + _session->locations()->removed.connect (_session_connections, invalidator (*this), ui_bind (&Editor::location_gone, this, _1), gui_context()); + _session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::refresh_location_display, this), gui_context()); + _session->locations()->StateChanged.connect (_session_connections, invalidator (*this), ui_bind (&Editor::refresh_location_display_s, this, _1), gui_context()); + _session->history().Changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::history_changed, this), gui_context()); - session_connections.push_back (session->tempo_map().StateChanged.connect (mem_fun(*this, &Editor::tempo_map_changed))); - - session_connections.push_back (session->Located.connect (mem_fun (*this, &Editor::located))); - session_connections.push_back (session->config.ParameterChanged.connect (mem_fun (*this, &Editor::parameter_changed))); - - zoom_range_clock.set_session (session); - _playlist_selector->set_session (session); - nudge_clock.set_session (session); if (Profile->get_sae()) { BBT_Time bbt; bbt.bars = 0; bbt.beats = 0; bbt.ticks = 120; - nframes_t pos = session->tempo_map().bbt_duration_at (0, bbt, 1); + nframes_t pos = _session->tempo_map().bbt_duration_at (0, bbt, 1); nudge_clock.set_mode(AudioClock::BBT); nudge_clock.set (pos, true, 0, AudioClock::BBT); } else { - nudge_clock.set (session->frame_rate() * 5, true, 0, AudioClock::Timecode); // default of 5 seconds + nudge_clock.set (_session->frame_rate() * 5, true, 0, AudioClock::Timecode); // default of 5 seconds } playhead_cursor->canvas_item.show (); - if (rhythm_ferret) { - rhythm_ferret->set_session (session); - } - - if (analysis_window != 0) - analysis_window->set_session (session); - - Location* loc = session->locations()->auto_loop_location(); + Location* loc = _session->locations()->auto_loop_location(); if (loc == 0) { - loc = new Location (0, session->current_end_frame(), _("Loop"),(Location::Flags) (Location::IsAutoLoop | Location::IsHidden)); + loc = new Location (0, _session->current_end_frame(), _("Loop"),(Location::Flags) (Location::IsAutoLoop | Location::IsHidden)); if (loc->start() == loc->end()) { loc->set_end (loc->start() + 1); } - session->locations()->add (loc, false); - session->set_auto_loop_location (loc); + _session->locations()->add (loc, false); + _session->set_auto_loop_location (loc); } else { // force name loc->set_name (_("Loop")); } - loc = session->locations()->auto_punch_location(); + loc = _session->locations()->auto_punch_location(); if (loc == 0) { - loc = new Location (0, session->current_end_frame(), _("Punch"), (Location::Flags) (Location::IsAutoPunch | Location::IsHidden)); + loc = new Location (0, _session->current_end_frame(), _("Punch"), (Location::Flags) (Location::IsAutoPunch | Location::IsHidden)); if (loc->start() == loc->end()) { loc->set_end (loc->start() + 1); } - session->locations()->add (loc, false); - session->set_auto_punch_location (loc); + _session->locations()->add (loc, false); + _session->set_auto_punch_location (loc); } else { // force name loc->set_name (_("Punch")); } - Config->map_parameters (mem_fun (*this, &Editor::parameter_changed)); - session->config.map_parameters (mem_fun (*this, &Editor::parameter_changed)); - - session->StateSaved.connect (mem_fun(*this, &Editor::session_state_saved)); + boost::function pc (boost::bind (&Editor::parameter_changed, this, _1)); + Config->map_parameters (pc); + _session->config.map_parameters (pc); refresh_location_display (); - session->locations()->added.connect (mem_fun(*this, &Editor::add_new_location)); - session->locations()->removed.connect (mem_fun(*this, &Editor::location_gone)); - session->locations()->changed.connect (mem_fun(*this, &Editor::refresh_location_display)); - session->locations()->StateChanged.connect (mem_fun(*this, &Editor::refresh_location_display_s)); - session->locations()->end_location()->changed.connect (mem_fun(*this, &Editor::end_location_changed)); - - if (sfbrowser) { - sfbrowser->set_session (session); - } - - handle_new_duration (); restore_ruler_visibility (); - //tempo_map_changed (Change (0)); - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + //tempo_map_changed (PropertyChange (0)); + _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (static_cast(*i))->set_samples_per_unit (frames_per_unit); } - start_scrolling (); - + super_rapid_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect ( + sigc::mem_fun (*this, &Editor::super_rapid_screen_update) + ); + switch (_snap_type) { case SnapToRegionStart: case SnapToRegionEnd: @@ -1142,17 +1165,9 @@ Editor::connect_to_session (Session *t) } /* register for undo history */ - session->register_with_memento_command_factory(_id, this); + _session->register_with_memento_command_factory(_id, this); - _summary->connect_to_session (session); - _group_tabs->connect_to_session (session); - _route_groups->connect_to_session (session); - _regions->connect_to_session (session); - _snapshots->connect_to_session (session); - _routes->connect_to_session (session); - _locations->connect_to_session (session); - - start_updating (); + start_updating_meters (); } void @@ -1244,22 +1259,22 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i case FadeInItem: case FadeInHandleItem: if (arv->audio_region()->fade_in_active()) { - items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_in_active), false))); + items.push_back (MenuElem (_("Deactivate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_active), false))); } else { - items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_in_active), true))); + items.push_back (MenuElem (_("Activate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_active), true))); } items.push_back (SeparatorElem()); if (Profile->get_sae()) { - items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast))); + items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast))); } else { - items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast))); - items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB))); - items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA))); - items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow))); + items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast))); + items.push_back (MenuElem (_("Slow"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB))); + items.push_back (MenuElem (_("Fast"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA))); + items.push_back (MenuElem (_("Fastest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow))); } break; @@ -1267,22 +1282,22 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i case FadeOutItem: case FadeOutHandleItem: if (arv->audio_region()->fade_out_active()) { - items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*this, &Editor::set_fade_out_active), false))); + items.push_back (MenuElem (_("Deactivate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_active), false))); } else { - items.push_back (MenuElem (_("Activate"), bind (mem_fun (*this, &Editor::set_fade_out_active), true))); + items.push_back (MenuElem (_("Activate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_active), true))); } items.push_back (SeparatorElem()); if (Profile->get_sae()) { - items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow))); + items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow))); } else { - items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow))); - items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA))); - items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB))); - items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast))); + items.push_back (MenuElem (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow))); + items.push_back (MenuElem (_("Slow"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA))); + items.push_back (MenuElem (_("Fast"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB))); + items.push_back (MenuElem (_("Fastest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast))); } break; @@ -1328,7 +1343,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, break; case StreamItem: - if (clicked_routeview->get_diskstream()) { + if (clicked_routeview->track()) { build_menu_function = &Editor::build_track_context_menu; } else { build_menu_function = &Editor::build_track_bus_context_menu; @@ -1357,16 +1372,13 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false); } } - /* if (region_edit_menu_split_multichannel_item) { - if (clicked_regionview && clicked_regionview->region().n_channels() > 1) { - // GTK2FIX find the action, change its sensitivity - // region_edit_menu_split_multichannel_item->set_sensitive (true); + if (clicked_regionview && clicked_regionview->region()->n_channels() > 1) { + region_edit_menu_split_multichannel_item->set_sensitive (true); } else { - // GTK2FIX see above - // region_edit_menu_split_multichannel_item->set_sensitive (false); + region_edit_menu_split_multichannel_item->set_sensitive (false); } - }*/ + } } break; @@ -1395,15 +1407,15 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, switch (clicked_routeview->audio_track()->freeze_state()) { case AudioTrack::NoFreeze: - edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route))); + edit_items.push_back (MenuElem (_("Freeze"), sigc::mem_fun(*this, &Editor::freeze_route))); break; case AudioTrack::Frozen: - edit_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_route))); + edit_items.push_back (MenuElem (_("Unfreeze"), sigc::mem_fun(*this, &Editor::unfreeze_route))); break; case AudioTrack::UnFrozen: - edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route))); + edit_items.push_back (MenuElem (_("Freeze"), sigc::mem_fun(*this, &Editor::freeze_route))); break; } @@ -1450,11 +1462,11 @@ Editor::build_track_region_context_menu (nframes64_t frame) RouteTimeAxisView* rtv = dynamic_cast (clicked_axisview); if (rtv) { - boost::shared_ptr ds; + boost::shared_ptr tr; boost::shared_ptr pl; - if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { - Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * ds->speed())); + if ((tr = rtv->track()) && ((pl = tr->playlist()))) { + Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * tr->speed())); if (selection->regions.size() > 1) { // there's already a multiple selection: just add a @@ -1463,7 +1475,7 @@ Editor::build_track_region_context_menu (nframes64_t frame) boost::shared_ptr dummy_region; // = NULL add_region_context_items (rtv->view(), dummy_region, edit_items); } else { - for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { + for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) { add_region_context_items (rtv->view(), (*i), edit_items); } } @@ -1487,11 +1499,11 @@ Editor::build_track_crossfade_context_menu (nframes64_t frame) AudioTimeAxisView* atv = dynamic_cast (clicked_axisview); if (atv) { - boost::shared_ptr ds; + boost::shared_ptr tr; boost::shared_ptr pl; boost::shared_ptr apl; - if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast (pl)) != 0)) { + if ((tr = atv->track()) && ((pl = tr->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast (pl)) != 0)) { Playlist::RegionList* regions = pl->regions_at (frame); AudioPlaylist::Crossfades xfades; @@ -1511,7 +1523,7 @@ Editor::build_track_crossfade_context_menu (nframes64_t frame) boost::shared_ptr dummy_region; // = NULL add_region_context_items (atv->audio_view(), dummy_region, edit_items); } else { - for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { + for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) { add_region_context_items (atv->audio_view(), (*i), edit_items); } } @@ -1530,8 +1542,8 @@ Editor::analyze_region_selection() if (analysis_window == 0) { analysis_window = new AnalysisWindow(); - if (session != 0) - analysis_window->set_session(session); + if (_session != 0) + analysis_window->set_session(_session); analysis_window->show_all(); } @@ -1548,8 +1560,8 @@ Editor::analyze_range_selection() if (analysis_window == 0) { analysis_window = new AnalysisWindow(); - if (session != 0) - analysis_window->set_session(session); + if (_session != 0) + analysis_window->set_session(_session); analysis_window->show_all(); } @@ -1592,18 +1604,18 @@ Editor::add_crossfade_context_items (AudioStreamView* /*view*/, boost::shared_pt str = _("Unmute"); } - items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr (xfade)))); - items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr (xfade)))); + items.push_back (MenuElem (str, sigc::bind (sigc::mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr (xfade)))); + items.push_back (MenuElem (_("Edit"), sigc::bind (sigc::mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr (xfade)))); if (xfade->can_follow_overlap()) { if (xfade->following_overlap()) { - str = _("Convert to short"); + str = _("Convert to Short"); } else { - str = _("Convert to full"); + str = _("Convert to Full"); } - items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade))); + items.push_back (MenuElem (str, sigc::bind (sigc::mem_fun(*this, &Editor::toggle_xfade_length), xfade))); } if (many) { @@ -1655,32 +1667,31 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi */ region_menu->signal_map_event().connect ( - bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr(region))); + sigc::bind (sigc::mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr(region))); - items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::rename_region))); - if (mr && internal_editing()) { - items.push_back (MenuElem (_("List editor..."), mem_fun(*this, &Editor::show_midi_list_editor))); - } else { - items.push_back (MenuElem (_("Region editor"), mem_fun(*this, &Editor::edit_region))); + items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::rename_region))); + if (mr) { + items.push_back (MenuElem (_("List Editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor))); } + items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region))); } - items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top))); - items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun (*this, &Editor::lower_region_to_bottom))); + items.push_back (MenuElem (_("Raise to Top Layer"), sigc::mem_fun(*this, &Editor::raise_region_to_top))); + items.push_back (MenuElem (_("Lower to Bottom Layer"), sigc::mem_fun (*this, &Editor::lower_region_to_bottom))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_point))); + items.push_back (MenuElem (_("Define Sync Point"), sigc::mem_fun(*this, &Editor::set_region_sync_from_edit_point))); if (_edit_point == EditAtMouse) { items.back ().set_sensitive (false); } - items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync))); + items.push_back (MenuElem (_("Remove Sync Point"), sigc::mem_fun(*this, &Editor::remove_region_sync))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::play_selected_region))); - items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_region))); - items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection))); + items.push_back (MenuElem (_("Audition"), sigc::mem_fun(*this, &Editor::play_selected_region))); + items.push_back (MenuElem (_("Export..."), sigc::mem_fun(*this, &Editor::export_region))); + items.push_back (MenuElem (_("Bounce"), sigc::mem_fun(*this, &Editor::bounce_region_selection))); if (ar) { - items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_region_selection))); + items.push_back (MenuElem (_("Spectral Analysis..."), sigc::mem_fun(*this, &Editor::analyze_region_selection))); } items.push_back (SeparatorElem()); @@ -1699,9 +1710,9 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi if (region_to_check->locked()) { region_lock_item->set_active(); } - region_lock_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_lock)); + region_lock_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_region_lock)); - items.push_back (CheckMenuElem (_("Glue to Bars&Beats"))); + items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); CheckMenuItem* bbt_glue_item = static_cast(&items.back()); switch (region_to_check->positional_lock_style()) { @@ -1713,21 +1724,23 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi break; } - bbt_glue_item->signal_activate().connect (bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime)); + bbt_glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_region_lock_style)); items.push_back (CheckMenuElem (_("Mute"))); CheckMenuItem* region_mute_item = static_cast(&items.back()); - fooc = region_mute_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_mute)); + fooc = region_mute_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_region_mute)); if (region_to_check->muted()) { fooc.block (true); region_mute_item->set_active(); fooc.block (false); } + + items.push_back (MenuElem (_("Transpose..."), mem_fun(*this, &Editor::pitch_shift_regions))); if (!Profile->get_sae()) { items.push_back (CheckMenuElem (_("Opaque"))); CheckMenuItem* region_opaque_item = static_cast(&items.back()); - fooc = region_opaque_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_opaque)); + fooc = region_opaque_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_region_opaque)); if (region_to_check->opaque()) { fooc.block (true); region_opaque_item->set_active(); @@ -1735,7 +1748,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi } } - items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize))); + items.push_back (CheckMenuElem (_("Original Position"), sigc::mem_fun(*this, &Editor::naturalize))); if (region_to_check->at_natural_position()) { items.back().set_sensitive (false); } @@ -1748,11 +1761,11 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi AudioRegionView* arv = dynamic_cast(rv); if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes))); + items.push_back (MenuElem (_("Reset Envelope"), sigc::mem_fun(*this, &Editor::reset_region_gain_envelopes))); items.push_back (CheckMenuElem (_("Envelope Visible"))); CheckMenuItem* region_envelope_visible_item = static_cast (&items.back()); - fooc = region_envelope_visible_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_visibility)); + fooc = region_envelope_visible_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_gain_envelope_visibility)); if (arv->envelope_visible()) { fooc.block (true); region_envelope_visible_item->set_active (true); @@ -1761,7 +1774,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi items.push_back (CheckMenuElem (_("Envelope Active"))); CheckMenuItem* region_envelope_active_item = static_cast (&items.back()); - fooc = region_envelope_active_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_active)); + fooc = region_envelope_active_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_gain_envelope_active)); if (ar->envelope_active()) { fooc.block (true); @@ -1772,29 +1785,30 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi items.push_back (SeparatorElem()); } - items.push_back (MenuElem (_("Normalize"), mem_fun(*this, &Editor::normalize_region))); + items.push_back (MenuElem (_("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region))); if (ar->scale_amplitude() != 1) { - items.push_back (MenuElem (_("Reset Gain"), mem_fun(*this, &Editor::reset_region_scale_amplitude))); + items.push_back (MenuElem (_("Reset Gain"), sigc::mem_fun(*this, &Editor::reset_region_scale_amplitude))); } } else if (mr) { - items.push_back (MenuElem (_("Quantize"), mem_fun(*this, &Editor::quantize_region))); + items.push_back (MenuElem (_("Quantize"), sigc::mem_fun(*this, &Editor::quantize_region))); + items.push_back (MenuElem (_("Fork"), sigc::mem_fun(*this, &Editor::fork_region))); items.push_back (SeparatorElem()); } - items.push_back (MenuElem (_("Strip Silence..."), mem_fun (*this, &Editor::strip_region_silence))); - items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region))); + items.push_back (MenuElem (_("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence))); + items.push_back (MenuElem (_("Reverse"), sigc::mem_fun(*this, &Editor::reverse_region))); items.push_back (SeparatorElem()); /* range related stuff */ - items.push_back (MenuElem (_("Add Single Range"), mem_fun (*this, &Editor::add_location_from_audio_region))); - items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_locations_from_audio_region))); + items.push_back (MenuElem (_("Add Single Range"), sigc::mem_fun (*this, &Editor::add_location_from_audio_region))); + items.push_back (MenuElem (_("Add Range Markers"), sigc::mem_fun (*this, &Editor::add_locations_from_audio_region))); if (selection->regions.size() < 2) { items.back().set_sensitive (false); } - items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_region))); + items.push_back (MenuElem (_("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region))); items.push_back (SeparatorElem()); /* Nudge region */ @@ -1803,10 +1817,10 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi MenuList& nudge_items = nudge_menu->items(); nudge_menu->set_name ("ArdourContextMenu"); - nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false, false)))); - nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false, false)))); - nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset)))); - nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset)))); + nudge_items.push_back (MenuElem (_("Nudge Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge Forward by Capture Offset"), (sigc::mem_fun(*this, &Editor::nudge_forward_capture_offset)))); + nudge_items.push_back (MenuElem (_("Nudge Backward by Capture Offset"), (sigc::mem_fun(*this, &Editor::nudge_backward_capture_offset)))); items.push_back (MenuElem (_("Nudge"), *nudge_menu)); items.push_back (SeparatorElem()); @@ -1815,37 +1829,37 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi MenuList& trim_items = trim_menu->items(); trim_menu->set_name ("ArdourContextMenu"); - trim_items.push_back (MenuElem (_("Start to edit point"), mem_fun(*this, &Editor::trim_region_from_edit_point))); + trim_items.push_back (MenuElem (_("Start to Edit Point"), sigc::mem_fun(*this, &Editor::trim_region_from_edit_point))); foo_item = &trim_items.back(); if (_edit_point == EditAtMouse) { foo_item->set_sensitive (false); } - trim_items.push_back (MenuElem (_("Edit point to end"), mem_fun(*this, &Editor::trim_region_to_edit_point))); + trim_items.push_back (MenuElem (_("Edit Point to End"), sigc::mem_fun(*this, &Editor::trim_region_to_edit_point))); foo_item = &trim_items.back(); if (_edit_point == EditAtMouse) { foo_item->set_sensitive (false); } - trim_items.push_back (MenuElem (_("Trim To Loop"), mem_fun(*this, &Editor::trim_region_to_loop))); - trim_items.push_back (MenuElem (_("Trim To Punch"), mem_fun(*this, &Editor::trim_region_to_punch))); + trim_items.push_back (MenuElem (_("Trim to Loop"), sigc::mem_fun(*this, &Editor::trim_region_to_loop))); + trim_items.push_back (MenuElem (_("Trim to Punch"), sigc::mem_fun(*this, &Editor::trim_region_to_punch))); items.push_back (MenuElem (_("Trim"), *trim_menu)); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split)))); + items.push_back (MenuElem (_("Split"), (sigc::mem_fun(*this, &Editor::split)))); region_edit_menu_split_item = &items.back(); if (_edit_point == EditAtMouse) { region_edit_menu_split_item->set_sensitive (false); } - items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region)))); + items.push_back (MenuElem (_("Make Mono Regions"), (sigc::mem_fun(*this, &Editor::split_multichannel_region)))); region_edit_menu_split_multichannel_item = &items.back(); - items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), false)))); - items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true)))); - items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track)))); + items.push_back (MenuElem (_("Duplicate"), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false)))); + items.push_back (MenuElem (_("Multi-Duplicate..."), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true)))); + items.push_back (MenuElem (_("Fill Track"), (sigc::mem_fun(*this, &Editor::region_fill_track)))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_selected_regions))); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::remove_selected_regions))); /* OK, stick the region submenu at the top of the list, and then add the standard items. @@ -1856,7 +1870,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi */ string::size_type pos = 0; - string menu_item_name = (region) ? region->name() : _("Selected regions"); + string menu_item_name = (region) ? region->name() : _("Selected Regions"); while ((pos = menu_item_name.find ("_", pos)) != string::npos) { menu_item_name.replace (pos, 1, "__"); @@ -1875,43 +1889,43 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) { using namespace Menu_Helpers; - edit_items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::play_selection))); - edit_items.push_back (MenuElem (_("Loop Range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true))); + edit_items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::play_selection))); + edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_range_selection))); + edit_items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::analyze_range_selection))); if (!selection->regions.empty()) { edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Extend Range to End of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false))); - edit_items.push_back (MenuElem (_("Extend Range to Start of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false))); + edit_items.push_back (MenuElem (_("Extend Range to End of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_end_of_region), false))); + edit_items.push_back (MenuElem (_("Extend Range to Start of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_start_of_region), false))); } edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Silence Range"), mem_fun(*this, &Editor::separate_region_from_selection))); - edit_items.push_back (MenuElem (_("Convert to Region in Region List"), mem_fun(*this, &Editor::new_region_from_selection))); + edit_items.push_back (MenuElem (_("Silence Range"), sigc::mem_fun(*this, &Editor::separate_region_from_selection))); + edit_items.push_back (MenuElem (_("Convert to Region in Region List"), sigc::mem_fun(*this, &Editor::new_region_from_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection))); + edit_items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_time_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Set Loop from Range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false))); - edit_items.push_back (MenuElem (_("Set Punch from Range"), mem_fun(*this, &Editor::set_punch_from_selection))); + edit_items.push_back (MenuElem (_("Set Loop from Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), false))); + edit_items.push_back (MenuElem (_("Set Punch from Range"), sigc::mem_fun(*this, &Editor::set_punch_from_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection))); + edit_items.push_back (MenuElem (_("Add Range Markers"), sigc::mem_fun (*this, &Editor::add_location_from_selection))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Crop Region to Range"), mem_fun(*this, &Editor::crop_region_to_selection))); - edit_items.push_back (MenuElem (_("Fill Range with Region"), mem_fun(*this, &Editor::region_fill_selection))); - edit_items.push_back (MenuElem (_("Duplicate Range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false))); + edit_items.push_back (MenuElem (_("Crop Region to Range"), sigc::mem_fun(*this, &Editor::crop_region_to_selection))); + edit_items.push_back (MenuElem (_("Fill Range with Region"), sigc::mem_fun(*this, &Editor::region_fill_selection))); + edit_items.push_back (MenuElem (_("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Consolidate Range"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, false))); - edit_items.push_back (MenuElem (_("Consolidate Range With Processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), true, true))); - edit_items.push_back (MenuElem (_("Bounce Range to Region List"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, false))); - edit_items.push_back (MenuElem (_("Bounce Range to Region List With Processing"), bind (mem_fun(*this, &Editor::bounce_range_selection), false, true))); - edit_items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::export_range))); + edit_items.push_back (MenuElem (_("Consolidate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, false))); + edit_items.push_back (MenuElem (_("Consolidate Range With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, true))); + edit_items.push_back (MenuElem (_("Bounce Range to Region List"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, false))); + edit_items.push_back (MenuElem (_("Bounce Range to Region List With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, true))); + edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_selection))); } @@ -1926,11 +1940,11 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) MenuList& play_items = play_menu->items(); play_menu->set_name ("ArdourContextMenu"); - play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point))); - play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start))); - play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region))); + play_items.push_back (MenuElem (_("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point))); + play_items.push_back (MenuElem (_("Play From Start"), sigc::mem_fun(*this, &Editor::play_from_start))); + play_items.push_back (MenuElem (_("Play Region"), sigc::mem_fun(*this, &Editor::play_selected_region))); play_items.push_back (SeparatorElem()); - play_items.push_back (MenuElem (_("Loop Region"), mem_fun(*this, &Editor::loop_selected_region))); + play_items.push_back (MenuElem (_("Loop Region"), sigc::mem_fun(*this, &Editor::loop_selected_region))); edit_items.push_back (MenuElem (_("Play"), *play_menu)); @@ -1940,21 +1954,21 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) MenuList& select_items = select_menu->items(); select_menu->set_name ("ArdourContextMenu"); - select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); - select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set))); - select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track))); - select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection))); + select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); + select_items.push_back (MenuElem (_("Select All"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all), Selection::Set))); + select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track))); + select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection))); select_items.push_back (SeparatorElem()); - select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop))); - select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch))); + select_items.push_back (MenuElem (_("Set Range to Loop Range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop))); + select_items.push_back (MenuElem (_("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch))); select_items.push_back (SeparatorElem()); - select_items.push_back (MenuElem (_("Select All After Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true))); - select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false))); - select_items.push_back (MenuElem (_("Select All After Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true))); - select_items.push_back (MenuElem (_("Select All Before Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false))); - select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), false))); - select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true))); - select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between))); + select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true))); + select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false))); + select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true))); + select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false))); + select_items.push_back (MenuElem (_("Select All Between Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false))); + select_items.push_back (MenuElem (_("Select All Within Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true))); + select_items.push_back (MenuElem (_("Select Range Between Playhead and Edit Point"), sigc::mem_fun(*this, &Editor::select_range_between))); edit_items.push_back (MenuElem (_("Select"), *select_menu)); @@ -1964,24 +1978,22 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) MenuList& cutnpaste_items = cutnpaste_menu->items(); cutnpaste_menu->set_name ("ArdourContextMenu"); - cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut))); - cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy))); - cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f))); + cutnpaste_items.push_back (MenuElem (_("Cut"), sigc::mem_fun(*this, &Editor::cut))); + cutnpaste_items.push_back (MenuElem (_("Copy"), sigc::mem_fun(*this, &Editor::copy))); + cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (sigc::mem_fun(*this, &Editor::paste), 1.0f))); cutnpaste_items.push_back (SeparatorElem()); - cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint))); - cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint))); - - cutnpaste_items.push_back (SeparatorElem()); + cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (sigc::mem_fun(*this, &Editor::align), ARDOUR::SyncPoint))); + cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind (sigc::mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint))); edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu)); /* Adding new material */ edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f))); - edit_items.push_back (MenuElem (_("Insert Existing Media"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack))); + edit_items.push_back (MenuElem (_("Insert Selected Region"), sigc::bind (sigc::mem_fun(*this, &Editor::insert_region_list_selection), 1.0f))); + edit_items.push_back (MenuElem (_("Insert Existing Media"), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack))); /* Nudge track */ @@ -1990,10 +2002,10 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) nudge_menu->set_name ("ArdourContextMenu"); edit_items.push_back (SeparatorElem()); - nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true)))); - nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true)))); - nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false)))); - nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false)))); + nudge_items.push_back (MenuElem (_("Nudge Entire Track Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true)))); + nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true)))); + nudge_items.push_back (MenuElem (_("Nudge Entire Track Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false)))); edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu)); } @@ -2009,8 +2021,8 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items) MenuList& play_items = play_menu->items(); play_menu->set_name ("ArdourContextMenu"); - play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point))); - play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start))); + play_items.push_back (MenuElem (_("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point))); + play_items.push_back (MenuElem (_("Play From Start"), sigc::mem_fun(*this, &Editor::play_from_start))); edit_items.push_back (MenuElem (_("Play"), *play_menu)); /* Selection */ @@ -2019,15 +2031,15 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items) MenuList& select_items = select_menu->items(); select_menu->set_name ("ArdourContextMenu"); - select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); - select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set))); - select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track))); - select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection))); + select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); + select_items.push_back (MenuElem (_("Select All"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all), Selection::Set))); + select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track))); + select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection))); select_items.push_back (SeparatorElem()); - select_items.push_back (MenuElem (_("Select all after edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true))); - select_items.push_back (MenuElem (_("Select all before edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false))); - select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true))); - select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false))); + select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true))); + select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false))); + select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true))); + select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false))); edit_items.push_back (MenuElem (_("Select"), *select_menu)); @@ -2037,19 +2049,19 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items) MenuList& cutnpaste_items = cutnpaste_menu->items(); cutnpaste_menu->set_name ("ArdourContextMenu"); - cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut))); - cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy))); - cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f))); + cutnpaste_items.push_back (MenuElem (_("Cut"), sigc::mem_fun(*this, &Editor::cut))); + cutnpaste_items.push_back (MenuElem (_("Copy"), sigc::mem_fun(*this, &Editor::copy))); + cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (sigc::mem_fun(*this, &Editor::paste), 1.0f))); Menu *nudge_menu = manage (new Menu()); MenuList& nudge_items = nudge_menu->items(); nudge_menu->set_name ("ArdourContextMenu"); edit_items.push_back (SeparatorElem()); - nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true)))); - nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true)))); - nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false)))); - nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false)))); + nudge_items.push_back (MenuElem (_("Nudge Entire Track Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true)))); + nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true)))); + nudge_items.push_back (MenuElem (_("Nudge Entire Track Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false)))); edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu)); } @@ -2087,11 +2099,20 @@ Editor::set_snap_to (SnapType st) instant_save (); switch (_snap_type) { - case SnapToAThirtysecondBeat: - case SnapToASixteenthBeat: - case SnapToAEighthBeat: - case SnapToAQuarterBeat: - case SnapToAThirdBeat: + case SnapToBeatDiv32: + case SnapToBeatDiv28: + case SnapToBeatDiv24: + case SnapToBeatDiv16: + case SnapToBeatDiv14: + case SnapToBeatDiv12: + case SnapToBeatDiv10: + case SnapToBeatDiv8: + case SnapToBeatDiv7: + case SnapToBeatDiv6: + case SnapToBeatDiv5: + case SnapToBeatDiv4: + case SnapToBeatDiv3: + case SnapToBeatDiv2: compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); update_tempo_based_rulers (); break; @@ -2106,7 +2127,9 @@ Editor::set_snap_to (SnapType st) default: /* relax */ break; - } + } + + SnapChanged (); /* EMIT SIGNAL */ } void @@ -2139,26 +2162,6 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) return; } - switch (zoom_focus) { - case ZoomFocusMouse: - case ZoomFocusPlayhead: - case ZoomFocusEdit: - switch (_edit_point) { - case EditAtMouse: - set_zoom_focus (ZoomFocusMouse); - break; - case EditAtPlayhead: - set_zoom_focus (ZoomFocusPlayhead); - break; - case EditAtSelectedMarker: - set_zoom_focus (ZoomFocusEdit); - break; - } - break; - default: - break; - } - const char* action=NULL; switch (_edit_point) { @@ -2257,21 +2260,14 @@ Editor::set_state (const XMLNode& node, int /*version*/) set_default_size (g.base_width, g.base_height); move (x, y); - if (session && (prop = node.property ("playhead"))) { - nframes64_t pos = atol (prop->value().c_str()); + if (_session && (prop = node.property ("playhead"))) { + nframes64_t pos; + sscanf (prop->value().c_str(), "%" PRIi64, &pos); playhead_cursor->set_position (pos); } else { playhead_cursor->set_position (0); - - /* reset_x_origin() doesn't work right here, since the old - position may be zero already, and it does nothing in such - circumstances. - */ - - leftmost_frame = 0; - horizontal_adjustment.set_value (0); } - + if ((prop = node.property ("mixer-width"))) { editor_mixer_strip_width = Width (string_2_enum (prop->value(), editor_mixer_strip_width)); } @@ -2294,13 +2290,22 @@ Editor::set_state (const XMLNode& node, int /*version*/) if ((prop = node.property ("mouse-mode"))) { MouseMode m = str2mousemode(prop->value()); - mouse_mode = MouseMode ((int) m + 1); /* lie, force mode switch */ set_mouse_mode (m, true); } else { - mouse_mode = MouseGain; /* lie, to force the mode switch */ set_mouse_mode (MouseObject, true); } + if ((prop = node.property ("left-frame")) != 0){ + nframes64_t pos; + if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) { + reset_x_origin (pos); + } + } + + if ((prop = node.property ("y-origin")) != 0) { + reset_y_origin (atof (prop->value ())); + } + if ((prop = node.property ("internal-edit"))) { bool yn = string_is_affirmative (prop->value()); RefPtr act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit")); @@ -2311,20 +2316,12 @@ Editor::set_state (const XMLNode& node, int /*version*/) } } - if ((prop = node.property ("edit-point"))) { - set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true); + if ((prop = node.property ("join-object-range"))) { + join_object_range_button.set_active (string_is_affirmative (prop->value ())); } - if ((prop = node.property ("show-waveforms-recording"))) { - bool yn = string_is_affirmative (prop->value()); - _show_waveforms_recording = !yn; - RefPtr act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformsWhileRecording")); - if (act) { - RefPtr tact = RefPtr::cast_dynamic(act); - /* do it twice to force the change */ - tact->set_active (!yn); - tact->set_active (yn); - } + if ((prop = node.property ("edit-point"))) { + set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true); } if ((prop = node.property ("show-measures"))) { @@ -2351,8 +2348,21 @@ Editor::set_state (const XMLNode& node, int /*version*/) } } + if ((prop = node.property ("stationary-playhead"))) { + bool yn = (prop->value() == "yes"); + set_stationary_playhead (yn); + RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-stationary-playhead")); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + if (tact->get_active() != yn) { + tact->set_active (yn); + } + } + } + if ((prop = node.property ("region-list-sort-type"))) { - _regions->reset_sort_type (str2regionlistsorttype(prop->value()), true); + RegionListSortType st; + _regions->reset_sort_type ((RegionListSortType) string_2_enum (prop->value(), st), true); } if ((prop = node.property ("xfades-visible"))) { @@ -2392,6 +2402,13 @@ Editor::set_state (const XMLNode& node, int /*version*/) } } + if ((prop = node.property (X_("editor-list-page")))) { + the_notebook.set_current_page (atoi (prop->value ())); + } + + if ((prop = node.property (X_("editor-pane-position")))) { + edit_pane.set_position (atoi (prop->value ())); + } return 0; } @@ -2448,14 +2465,19 @@ Editor::get_state () snprintf (buf, sizeof (buf), "%" PRIi64, playhead_cursor->current_frame); node->add_property ("playhead", buf); + snprintf (buf, sizeof (buf), "%" PRIi64, leftmost_frame); + node->add_property ("left-frame", buf); + snprintf (buf, sizeof (buf), "%f", vertical_adjustment.get_value ()); + node->add_property ("y-origin", buf); - node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no"); node->add_property ("show-measures", _show_measures ? "yes" : "no"); node->add_property ("follow-playhead", _follow_playhead ? "yes" : "no"); + node->add_property ("stationary-playhead", _stationary_playhead ? "yes" : "no"); node->add_property ("xfades-visible", _xfade_visibility ? "yes" : "no"); - node->add_property ("region-list-sort-type", enum2str (_regions->sort_type ())); + node->add_property ("region-list-sort-type", enum_2_string (_regions->sort_type ())); node->add_property ("mouse-mode", enum2str(mouse_mode)); node->add_property ("internal-edit", _internal_editing ? "yes" : "no"); + node->add_property ("join-object-range", join_object_range_button.get_active () ? "yes" : "no"); Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer")); if (act) { @@ -2469,6 +2491,12 @@ Editor::get_state () node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no"); } + snprintf (buf, sizeof (buf), "%d", the_notebook.get_current_page ()); + node->add_property (X_("editor-list-page"), buf); + + snprintf (buf, sizeof (buf), "%d", edit_pane.get_position ()); + node->add_property (X_("editor-pane-position"), buf); + return *node; } @@ -2496,12 +2524,12 @@ Editor::trackview_by_y_position (double y) /** Snap a position to the grid, if appropriate, taking into account current * grid settings and also the state of any snap modifier keys that may be pressed. * @param start Position to snap. - * @param event Event to get current key modifier information from. + * @param event Event to get current key modifier information from, or 0. */ void Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32_t direction, bool for_mark) { - if (!session) { + if (!_session || !event) { return; } @@ -2519,7 +2547,7 @@ Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32 void Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) { - if (!session || _snap_mode == SnapOff) { + if (!_session || _snap_mode == SnapOff) { return; } @@ -2529,24 +2557,24 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) void Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool /*for_mark*/) { - const nframes64_t one_timecode_second = (nframes64_t)(rint(session->timecode_frames_per_second()) * session->frames_per_timecode_frame()); - nframes64_t one_timecode_minute = (nframes64_t)(rint(session->timecode_frames_per_second()) * session->frames_per_timecode_frame() * 60); + const nframes64_t one_timecode_second = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame()); + nframes64_t one_timecode_minute = (nframes64_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame() * 60); switch (_snap_type) { case SnapToTimecodeFrame: - if (((direction == 0) && (fmod((double)start, (double)session->frames_per_timecode_frame()) > (session->frames_per_timecode_frame() / 2))) || (direction > 0)) { - start = (nframes64_t) (ceil ((double) start / session->frames_per_timecode_frame()) * session->frames_per_timecode_frame()); + if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) { + start = (nframes64_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); } else { - start = (nframes64_t) (floor ((double) start / session->frames_per_timecode_frame()) * session->frames_per_timecode_frame()); + start = (nframes64_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); } break; case SnapToTimecodeSeconds: - if (session->timecode_offset_negative()) + if (_session->timecode_offset_negative()) { - start += session->timecode_offset (); + start += _session->timecode_offset (); } else { - start -= session->timecode_offset (); + start -= _session->timecode_offset (); } if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) { start = (nframes64_t) ceil ((double) start / one_timecode_second) * one_timecode_second; @@ -2554,31 +2582,31 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool / start = (nframes64_t) floor ((double) start / one_timecode_second) * one_timecode_second; } - if (session->timecode_offset_negative()) + if (_session->timecode_offset_negative()) { - start -= session->timecode_offset (); + start -= _session->timecode_offset (); } else { - start += session->timecode_offset (); + start += _session->timecode_offset (); } break; case SnapToTimecodeMinutes: - if (session->timecode_offset_negative()) + if (_session->timecode_offset_negative()) { - start += session->timecode_offset (); + start += _session->timecode_offset (); } else { - start -= session->timecode_offset (); + start -= _session->timecode_offset (); } if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) { start = (nframes64_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute; } else { start = (nframes64_t) floor ((double) start / one_timecode_minute) * one_timecode_minute; } - if (session->timecode_offset_negative()) + if (_session->timecode_offset_negative()) { - start -= session->timecode_offset (); + start -= _session->timecode_offset (); } else { - start += session->timecode_offset (); + start += _session->timecode_offset (); } break; default: @@ -2590,8 +2618,8 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool / void Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) { - const nframes64_t one_second = session->frame_rate(); - const nframes64_t one_minute = session->frame_rate() * 60; + const nframes64_t one_second = _session->frame_rate(); + const nframes64_t one_minute = _session->frame_rate() * 60; nframes64_t presnap = start; nframes64_t before; nframes64_t after; @@ -2627,31 +2655,54 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) break; case SnapToBar: - start = session->tempo_map().round_to_bar (start, direction); + start = _session->tempo_map().round_to_bar (start, direction); break; case SnapToBeat: - start = session->tempo_map().round_to_beat (start, direction); + start = _session->tempo_map().round_to_beat (start, direction); break; - case SnapToAThirtysecondBeat: - start = session->tempo_map().round_to_beat_subdivision (start, 32, direction); + case SnapToBeatDiv32: + start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction); break; - - case SnapToASixteenthBeat: - start = session->tempo_map().round_to_beat_subdivision (start, 16, direction); + case SnapToBeatDiv28: + start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction); break; - - case SnapToAEighthBeat: - start = session->tempo_map().round_to_beat_subdivision (start, 8, direction); + case SnapToBeatDiv24: + start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction); break; - - case SnapToAQuarterBeat: - start = session->tempo_map().round_to_beat_subdivision (start, 4, direction); + case SnapToBeatDiv16: + start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction); break; - - case SnapToAThirdBeat: - start = session->tempo_map().round_to_beat_subdivision (start, 3, direction); + case SnapToBeatDiv14: + start = _session->tempo_map().round_to_beat_subdivision (start, 14, direction); + break; + case SnapToBeatDiv12: + start = _session->tempo_map().round_to_beat_subdivision (start, 12, direction); + break; + case SnapToBeatDiv10: + start = _session->tempo_map().round_to_beat_subdivision (start, 10, direction); + break; + case SnapToBeatDiv8: + start = _session->tempo_map().round_to_beat_subdivision (start, 8, direction); + break; + case SnapToBeatDiv7: + start = _session->tempo_map().round_to_beat_subdivision (start, 7, direction); + break; + case SnapToBeatDiv6: + start = _session->tempo_map().round_to_beat_subdivision (start, 6, direction); + break; + case SnapToBeatDiv5: + start = _session->tempo_map().round_to_beat_subdivision (start, 5, direction); + break; + case SnapToBeatDiv4: + start = _session->tempo_map().round_to_beat_subdivision (start, 4, direction); + break; + case SnapToBeatDiv3: + start = _session->tempo_map().round_to_beat_subdivision (start, 3, direction); + break; + case SnapToBeatDiv2: + start = _session->tempo_map().round_to_beat_subdivision (start, 2, direction); break; case SnapToMark: @@ -2659,7 +2710,7 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) return; } - session->locations()->marks_either_side (start, before, after); + _session->locations()->marks_either_side (start, before, after); if (before == max_frames) { start = after; @@ -2747,23 +2798,33 @@ Editor::setup_toolbar () mouse_timefx_button.set_relief(Gtk::RELIEF_NONE); mouse_audition_button.set_relief(Gtk::RELIEF_NONE); // internal_edit_button.set_relief(Gtk::RELIEF_NONE); + join_object_range_button.set_relief(Gtk::RELIEF_NONE); HBox* mode_box = manage(new HBox); mode_box->set_border_width (2); mode_box->set_spacing(4); - mouse_mode_button_box.set_spacing(1); - mouse_mode_button_box.pack_start(mouse_move_button, true, true); - if (!Profile->get_sae()) { - mouse_mode_button_box.pack_start(mouse_select_button, true, true); + + /* table containing mode buttons */ + + HBox* mouse_mode_button_box = manage (new HBox ()); + + if (Profile->get_sae()) { + mouse_mode_button_box->pack_start (mouse_move_button); + } else { + mouse_mode_button_box->pack_start (mouse_move_button); + mouse_mode_button_box->pack_start (join_object_range_button); + mouse_mode_button_box->pack_start (mouse_select_button); } - mouse_mode_button_box.pack_start(mouse_zoom_button, true, true); + + mouse_mode_button_box->pack_start (mouse_zoom_button); + if (!Profile->get_sae()) { - mouse_mode_button_box.pack_start(mouse_gain_button, true, true); + mouse_mode_button_box->pack_start (mouse_gain_button); } - mouse_mode_button_box.pack_start(mouse_timefx_button, true, true); - mouse_mode_button_box.pack_start(mouse_audition_button, true, true); - mouse_mode_button_box.pack_start(internal_edit_button, true, true); - mouse_mode_button_box.set_homogeneous(true); + + mouse_mode_button_box->pack_start (mouse_timefx_button); + mouse_mode_button_box->pack_start (mouse_audition_button); + mouse_mode_button_box->pack_start (internal_edit_button); vector edit_mode_strings; edit_mode_strings.push_back (edit_mode_to_string (Slide)); @@ -2774,27 +2835,27 @@ Editor::setup_toolbar () edit_mode_selector.set_name ("EditModeSelector"); set_popdown_strings (edit_mode_selector, edit_mode_strings, true); - edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done)); + edit_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_mode_selection_done)); - mode_box->pack_start(edit_mode_selector); - mode_box->pack_start(mouse_mode_button_box); + mode_box->pack_start (edit_mode_selector); + mode_box->pack_start (*mouse_mode_button_box); - mouse_mode_tearoff = manage (new TearOff (*mode_box)); - mouse_mode_tearoff->set_name ("MouseModeBase"); - mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &mouse_mode_tearoff->tearoff_window()), false); + _mouse_mode_tearoff = manage (new TearOff (*mode_box)); + _mouse_mode_tearoff->set_name ("MouseModeBase"); + _mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_mouse_mode_tearoff->tearoff_window()), false); if (Profile->get_sae()) { - mouse_mode_tearoff->set_can_be_torn_off (false); + _mouse_mode_tearoff->set_can_be_torn_off (false); } - mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &mouse_mode_tearoff->tearoff_window())); - mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &mouse_mode_tearoff->tearoff_window(), 1)); - mouse_mode_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &mouse_mode_tearoff->tearoff_window())); - mouse_mode_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &mouse_mode_tearoff->tearoff_window(), 1)); + _mouse_mode_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_mouse_mode_tearoff->tearoff_window())); + _mouse_mode_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_mouse_mode_tearoff->tearoff_window(), 1)); + _mouse_mode_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_mouse_mode_tearoff->tearoff_window())); + _mouse_mode_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_mouse_mode_tearoff->tearoff_window(), 1)); mouse_move_button.set_mode (false); mouse_select_button.set_mode (false); @@ -2802,6 +2863,7 @@ Editor::setup_toolbar () mouse_zoom_button.set_mode (false); mouse_timefx_button.set_mode (false); mouse_audition_button.set_mode (false); + join_object_range_button.set_mode (false); mouse_move_button.set_name ("MouseModeButton"); mouse_select_button.set_name ("MouseModeButton"); @@ -2809,8 +2871,8 @@ Editor::setup_toolbar () mouse_zoom_button.set_name ("MouseModeButton"); mouse_timefx_button.set_name ("MouseModeButton"); mouse_audition_button.set_name ("MouseModeButton"); - internal_edit_button.set_name ("MouseModeButton"); + join_object_range_button.set_name ("MouseModeButton"); mouse_move_button.unset_flags (CAN_FOCUS); mouse_select_button.unset_flags (CAN_FOCUS); @@ -2819,6 +2881,7 @@ Editor::setup_toolbar () mouse_timefx_button.unset_flags (CAN_FOCUS); mouse_audition_button.unset_flags (CAN_FOCUS); internal_edit_button.unset_flags (CAN_FOCUS); + join_object_range_button.unset_flags (CAN_FOCUS); /* Zoom */ @@ -2826,24 +2889,20 @@ Editor::setup_toolbar () zoom_box.set_border_width (0); zoom_in_button.set_name ("EditorTimeButton"); - zoom_in_button.set_image (*(manage (new Image (Stock::ZOOM_IN, Gtk::ICON_SIZE_BUTTON)))); - zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false)); - ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In")); + zoom_in_button.set_image (*(manage (new Image (Stock::ZOOM_IN, Gtk::ICON_SIZE_MENU)))); + zoom_in_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); zoom_out_button.set_name ("EditorTimeButton"); - zoom_out_button.set_image (*(manage (new Image (Stock::ZOOM_OUT, Gtk::ICON_SIZE_BUTTON)))); - zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true)); - ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom Out")); + zoom_out_button.set_image (*(manage (new Image (Stock::ZOOM_OUT, Gtk::ICON_SIZE_MENU)))); + zoom_out_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true)); zoom_out_full_button.set_name ("EditorTimeButton"); - zoom_out_full_button.set_image (*(manage (new Image (Stock::ZOOM_100, Gtk::ICON_SIZE_BUTTON)))); - zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session)); - ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session")); + zoom_out_full_button.set_image (*(manage (new Image (Stock::ZOOM_100, Gtk::ICON_SIZE_MENU)))); + zoom_out_full_button.signal_clicked().connect (sigc::mem_fun(*this, &Editor::temporal_zoom_session)); zoom_focus_selector.set_name ("ZoomFocusSelector"); set_popdown_strings (zoom_focus_selector, zoom_focus_strings, true); - zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done)); - ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus")); + zoom_focus_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done)); zoom_box.pack_start (zoom_out_button, false, false); zoom_box.pack_start (zoom_in_button, false, false); @@ -2853,14 +2912,12 @@ Editor::setup_toolbar () tav_expand_button.set_name ("TrackHeightButton"); tav_expand_button.set_size_request(-1,20); tav_expand_button.add (*(manage (new Image (::get_icon("tav_exp"))))); - tav_expand_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::tav_zoom_step), true)); - ARDOUR_UI::instance()->tooltips().set_tip (tav_expand_button, _("Expand Tracks")); + tav_expand_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), true)); tav_shrink_button.set_name ("TrackHeightButton"); tav_shrink_button.set_size_request(-1,20); tav_shrink_button.add (*(manage (new Image (::get_icon("tav_shrink"))))); - tav_shrink_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::tav_zoom_step), false)); - ARDOUR_UI::instance()->tooltips().set_tip (tav_shrink_button, _("Shrink Tracks")); + tav_shrink_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), false)); track_zoom_box.set_spacing (1); track_zoom_box.set_border_width (0); @@ -2879,18 +2936,15 @@ Editor::setup_toolbar () snap_type_selector.set_name ("SnapTypeSelector"); set_popdown_strings (snap_type_selector, snap_type_strings, true); - snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done)); - ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Snap/Grid Units")); + snap_type_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::snap_type_selection_done)); snap_mode_selector.set_name ("SnapModeSelector"); set_popdown_strings (snap_mode_selector, snap_mode_strings, true); - snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done)); - ARDOUR_UI::instance()->tooltips().set_tip (snap_mode_selector, _("Snap/Grid Mode")); + snap_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::snap_mode_selection_done)); edit_point_selector.set_name ("EditPointSelector"); set_popdown_strings (edit_point_selector, edit_point_strings, true); - edit_point_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_point_selection_done)); - ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point")); + edit_point_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_point_selection_done)); snap_box.pack_start (snap_mode_selector, false, false); snap_box.pack_start (snap_type_selector, false, false); @@ -2902,8 +2956,8 @@ Editor::setup_toolbar () nudge_box->set_spacing(1); nudge_box->set_border_width (2); - nudge_forward_button.signal_button_release_event().connect (mem_fun(*this, &Editor::nudge_forward_release), false); - nudge_backward_button.signal_button_release_event().connect (mem_fun(*this, &Editor::nudge_backward_release), false); + nudge_forward_button.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::nudge_forward_release), false); + nudge_backward_button.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::nudge_backward_release), false); nudge_box->pack_start (nudge_backward_button, false, false); nudge_box->pack_start (nudge_forward_button, false, false); @@ -2915,28 +2969,28 @@ Editor::setup_toolbar () HBox* hbox = manage (new HBox); hbox->set_spacing(10); - tools_tearoff = manage (new TearOff (*hbox)); - tools_tearoff->set_name ("MouseModeBase"); - tools_tearoff->tearoff_window().signal_key_press_event().connect (bind (sigc::ptr_fun (relay_key_press), &tools_tearoff->tearoff_window()), false); - + _tools_tearoff = manage (new TearOff (*hbox)); + _tools_tearoff->set_name ("MouseModeBase"); + _tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_tools_tearoff->tearoff_window()), false); + if (Profile->get_sae()) { - tools_tearoff->set_can_be_torn_off (false); + _tools_tearoff->set_can_be_torn_off (false); } - tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &tools_tearoff->tearoff_window())); - tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &tools_tearoff->tearoff_window(), 0)); - tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &tools_tearoff->tearoff_window())); - tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &tools_tearoff->tearoff_window(), 0)); + _tools_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_tools_tearoff->tearoff_window())); + _tools_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_tools_tearoff->tearoff_window(), 0)); + _tools_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_tools_tearoff->tearoff_window())); + _tools_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_tools_tearoff->tearoff_window(), 0)); toolbar_hbox.set_spacing (10); toolbar_hbox.set_border_width (1); - toolbar_hbox.pack_start (*mouse_mode_tearoff, false, false); - toolbar_hbox.pack_start (*tools_tearoff, false, false); + toolbar_hbox.pack_start (*_mouse_mode_tearoff, false, false); + toolbar_hbox.pack_start (*_tools_tearoff, false, false); hbox->pack_start (snap_box, false, false); hbox->pack_start (*nudge_box, false, false); @@ -2952,13 +3006,39 @@ Editor::setup_toolbar () toolbar_frame.add (toolbar_base); } +void +Editor::setup_tooltips () +{ + ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects")); + ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation")); + ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range")); + ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions")); + ARDOUR_UI::instance()->set_tip (mouse_audition_button, _("Listen to Specific Regions")); + ARDOUR_UI::instance()->set_tip (join_object_range_button, _("Select/Move Objects or Ranges")); + ARDOUR_UI::instance()->set_tip (internal_edit_button, _("Edit Region Contents (e.g. notes)")); + ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: context-click for possible operations")); + ARDOUR_UI::instance()->set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards")); + ARDOUR_UI::instance()->set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards")); + ARDOUR_UI::instance()->set_tip (zoom_in_button, _("Zoom In")); + ARDOUR_UI::instance()->set_tip (zoom_out_button, _("Zoom Out")); + ARDOUR_UI::instance()->set_tip (zoom_out_full_button, _("Zoom to Session")); + ARDOUR_UI::instance()->set_tip (zoom_focus_selector, _("Zoom focus")); + ARDOUR_UI::instance()->set_tip (tav_expand_button, _("Expand Tracks")); + ARDOUR_UI::instance()->set_tip (tav_shrink_button, _("Shrink Tracks")); + ARDOUR_UI::instance()->set_tip (snap_type_selector, _("Snap/Grid Units")); + ARDOUR_UI::instance()->set_tip (snap_mode_selector, _("Snap/Grid Mode")); + ARDOUR_UI::instance()->set_tip (edit_point_selector, _("Edit point")); + ARDOUR_UI::instance()->set_tip (midi_sound_notes, _("Sound Notes")); + ARDOUR_UI::instance()->set_tip (midi_panic_button, _("Send note off and reset controller messages on all MIDI channels")); +} + void Editor::midi_panic () { cerr << "MIDI panic\n"; - if (session) { - session->midi_panic(); + if (_session) { + _session->midi_panic(); } } @@ -2970,14 +3050,12 @@ Editor::setup_midi_toolbar () /* Midi sound notes */ midi_sound_notes.add (*(manage (new Image (::get_icon("midi_sound_notes"))))); midi_sound_notes.set_relief(Gtk::RELIEF_NONE); - ARDOUR_UI::instance()->tooltips().set_tip (midi_sound_notes, _("Sound Notes")); midi_sound_notes.unset_flags (CAN_FOCUS); /* Panic */ act = ActionManager::get_action (X_("MIDI"), X_("panic")); midi_panic_button.set_name("MidiPanicButton"); - ARDOUR_UI::instance()->tooltips().set_tip (midi_panic_button, _("Send note off and reset controller messages on all MIDI channels")); act->connect_proxy (midi_panic_button); panic_box.pack_start (midi_sound_notes , true, true); @@ -2994,7 +3072,7 @@ Editor::convert_drop_to_paths ( guint /*info*/, guint /*time*/) { - if (session == 0) { + if (_session == 0) { return -1; } @@ -3104,9 +3182,9 @@ Editor::new_tempo_section () void Editor::map_transport_state () { - ENSURE_GUI_THREAD (mem_fun(*this, &Editor::map_transport_state)); + ENSURE_GUI_THREAD (*this, &Editor::map_transport_state) - if (session->transport_stopped()) { + if (_session && _session->transport_stopped()) { have_pending_keyboard_selection = false; } @@ -3125,40 +3203,19 @@ Editor::State::~State () delete selection; } -void -Editor::store_state (State& state) const -{ - *state.selection = *selection; -} - -void -Editor::restore_state (State *state) -{ - if (*selection == *state->selection) { - return; - } - - *selection = *state->selection; - time_selection_changed (); - region_selection_changed (); - - /* XXX other selection change handlers? */ -} - void Editor::begin_reversible_command (string name) { - if (session) { - before = &get_state(); - session->begin_reversible_command (name); + if (_session) { + _session->begin_reversible_command (name); } } void Editor::commit_reversible_command () { - if (session) { - session->commit_reversible_command (new MementoCommand(*this, before, &get_state())); + if (_session) { + _session->commit_reversible_command (); } } @@ -3179,7 +3236,7 @@ Editor::set_route_group_mute (Route& route, bool yn) { RouteGroup *route_group = 0; - if ((route_group == route.route_group()) != 0) { + if ((route_group = route.route_group()) != 0) { route_group->apply (&Route::set_mute, yn, this); } else { route.set_mute (yn, this); @@ -3191,20 +3248,20 @@ Editor::history_changed () { string label; - if (undo_action && session) { - if (session->undo_depth() == 0) { + if (undo_action && _session) { + if (_session->undo_depth() == 0) { label = _("Undo"); } else { - label = string_compose(_("Undo (%1)"), session->next_undo()); + label = string_compose(_("Undo (%1)"), _session->next_undo()); } undo_action->property_label() = label; } - if (redo_action && session) { - if (session->redo_depth() == 0) { + if (redo_action && _session) { + if (_session->redo_depth() == 0) { label = _("Redo"); } else { - label = string_compose(_("Redo (%1)"), session->next_redo()); + label = string_compose(_("Redo (%1)"), _session->next_redo()); } redo_action->property_label() = label; } @@ -3233,8 +3290,8 @@ Editor::duplicate_dialog (bool with_dialog) if (with_dialog) { - ArdourDialog win ("Duplicate"); - Label label (_("Number of Duplications:")); + ArdourDialog win (_("Duplicate")); + Label label (_("Number of duplications:")); Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0); SpinButton spinner (adjustment, 0.0, 1); HBox hbox; @@ -3249,7 +3306,7 @@ Editor::duplicate_dialog (bool with_dialog) */ hbox.pack_start (spinner, PACK_EXPAND_PADDING, 12); - spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT)); + spinner.signal_activate().connect (sigc::bind (sigc::mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT)); spinner.grab_focus(); hbox.show (); @@ -3329,13 +3386,6 @@ Editor::show_verbose_canvas_cursor_with (const string & txt) track_canvas->get_pointer (x, y); track_canvas->window_to_world (x, y, wx, wy); - /* move it away from the mouse pointer to avoid an - infinite loop of enter/leave events. - */ - - wx += 20; - wy += 20; - /* don't get too close to the edge */ verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (wx); verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (wy); @@ -3387,7 +3437,7 @@ Editor::cycle_edit_mode () void Editor::edit_mode_selection_done () { - if (session == 0) { + if (_session == 0) { return; } @@ -3411,16 +3461,34 @@ Editor::snap_type_selection_done () string choice = snap_type_selector.get_active_text(); SnapType snaptype = SnapToBeat; - if (choice == _("Beats/3")) { - snaptype = SnapToAThirdBeat; + if (choice == _("Beats/2")) { + snaptype = SnapToBeatDiv2; + } else if (choice == _("Beats/3")) { + snaptype = SnapToBeatDiv3; } else if (choice == _("Beats/4")) { - snaptype = SnapToAQuarterBeat; + snaptype = SnapToBeatDiv4; + } else if (choice == _("Beats/5")) { + snaptype = SnapToBeatDiv5; + } else if (choice == _("Beats/6")) { + snaptype = SnapToBeatDiv6; + } else if (choice == _("Beats/7")) { + snaptype = SnapToBeatDiv7; } else if (choice == _("Beats/8")) { - snaptype = SnapToAEighthBeat; + snaptype = SnapToBeatDiv8; + } else if (choice == _("Beats/10")) { + snaptype = SnapToBeatDiv10; + } else if (choice == _("Beats/12")) { + snaptype = SnapToBeatDiv12; + } else if (choice == _("Beats/14")) { + snaptype = SnapToBeatDiv14; } else if (choice == _("Beats/16")) { - snaptype = SnapToASixteenthBeat; + snaptype = SnapToBeatDiv16; + } else if (choice == _("Beats/24")) { + snaptype = SnapToBeatDiv24; + } else if (choice == _("Beats/28")) { + snaptype = SnapToBeatDiv28; } else if (choice == _("Beats/32")) { - snaptype = SnapToAThirtysecondBeat; + snaptype = SnapToBeatDiv32; } else if (choice == _("Beats")) { snaptype = SnapToBeat; } else if (choice == _("Bars")) { @@ -3529,16 +3597,12 @@ Editor::zoom_focus_selection_done () focus_type = ZoomFocusRight; } else if (choice == _("Center")) { focus_type = ZoomFocusCenter; - } else if (choice == _("Play")) { + } else if (choice == _("Playhead")) { focus_type = ZoomFocusPlayhead; - } else if (choice == _("Edit")) { - focus_type = ZoomFocusEdit; - } else if (choice == _("Active Mark")) { - focus_type = ZoomFocusEdit; - } else if (choice == _("Active Mark")) { - focus_type = ZoomFocusEdit; - } else { + } else if (choice == _("Mouse")) { focus_type = ZoomFocusMouse; + } else if (choice == _("Edit point")) { + focus_type = ZoomFocusEdit; } RefPtr ract = zoom_focus_action (focus_type); @@ -3569,43 +3633,6 @@ Editor::mouse_select_button_release (GdkEventButton* ev) return true; } -Editor::TrackViewList * -Editor::get_valid_views (TimeAxisView* track, RouteGroup* group) -{ - TrackViewList::iterator i; - - TrackViewList* v = new TrackViewList; - - if (track == 0 && group == 0) { - - /* all views */ - - for (i = track_views.begin(); i != track_views.end (); ++i) { - v->push_back (*i); - } - - } else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->active_property (RouteGroup::Select))) { - - /* just the view for this track - */ - - v->push_back (track); - - } else { - - /* views for all tracks in the route group */ - - for (i = track_views.begin(); i != track_views.end (); ++i) { - - if (group == 0 || ((*i)->route_group() == group && group->active_property (RouteGroup::Select))) { - v->push_back (*i); - } - } - } - - return v; -} - void Editor::set_zoom_focus (ZoomFocus f) { @@ -3688,10 +3715,7 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) void Editor::detach_tearoff (Box* /*b*/, Window* /*w*/) { - cerr << "remove tearoff\n"; - - if (tools_tearoff->torn_off() && - mouse_mode_tearoff->torn_off()) { + if (_tools_tearoff->torn_off() && _mouse_mode_tearoff->torn_off()) { top_hbox.remove (toolbar_frame); } } @@ -3699,7 +3723,6 @@ Editor::detach_tearoff (Box* /*b*/, Window* /*w*/) void Editor::reattach_tearoff (Box* /*b*/, Window* /*w*/, int32_t /*n*/) { - cerr << "reattach tearoff\n"; if (toolbar_frame.get_parent() == 0) { top_hbox.pack_end (toolbar_frame); } @@ -3736,12 +3759,35 @@ Editor::set_follow_playhead (bool yn) if (_follow_playhead != yn) { if ((_follow_playhead = yn) == true) { /* catch up */ - update_current_screen (); + reset_x_origin_to_follow_playhead (); } instant_save (); } } +void +Editor::toggle_stationary_playhead () +{ + RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-stationary-playhead")); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + set_stationary_playhead (tact->get_active()); + } +} + +void +Editor::set_stationary_playhead (bool yn) +{ + if (_stationary_playhead != yn) { + if ((_stationary_playhead = yn) == true) { + /* catch up */ + // FIXME need a 3.0 equivalent of this 2.X call + // update_current_screen (); + } + instant_save (); + } +} + void Editor::toggle_xfade_active (boost::weak_ptr wxfade) { @@ -3769,7 +3815,7 @@ Editor::edit_xfade (boost::weak_ptr wxfade) return; } - CrossfadeEditor cew (*session, xfade, xfade->fade_in().get_min_y(), 1.0); + CrossfadeEditor cew (_session, xfade, xfade->fade_in().get_min_y(), 1.0); ensure_float (cew); @@ -3781,7 +3827,10 @@ Editor::edit_xfade (boost::weak_ptr wxfade) } cew.apply (); - xfade->StateChanged (Change (~0)); + PropertyChange all_crossfade_properties; + all_crossfade_properties.add (ARDOUR::Properties::active); + all_crossfade_properties.add (ARDOUR::Properties::follow_overlap); + xfade->PropertyChanged (all_crossfade_properties); } PlaylistSelector& @@ -3800,29 +3849,52 @@ Editor::get_grid_type_as_beats (bool& success, nframes64_t position) return 1.0; break; - case SnapToAThirtysecondBeat: + case SnapToBeatDiv32: return 1.0/32.0; break; - - case SnapToASixteenthBeat: + case SnapToBeatDiv28: + return 1.0/28.0; + break; + case SnapToBeatDiv24: + return 1.0/24.0; + break; + case SnapToBeatDiv16: return 1.0/16.0; break; - - case SnapToAEighthBeat: + case SnapToBeatDiv14: + return 1.0/14.0; + break; + case SnapToBeatDiv12: + return 1.0/12.0; + break; + case SnapToBeatDiv10: + return 1.0/10.0; + break; + case SnapToBeatDiv8: return 1.0/8.0; break; - - case SnapToAQuarterBeat: + case SnapToBeatDiv7: + return 1.0/7.0; + break; + case SnapToBeatDiv6: + return 1.0/6.0; + break; + case SnapToBeatDiv5: + return 1.0/5.0; + break; + case SnapToBeatDiv4: return 1.0/4.0; break; - - case SnapToAThirdBeat: + case SnapToBeatDiv3: return 1.0/3.0; break; + case SnapToBeatDiv2: + return 1.0/2.0; + break; case SnapToBar: - if (session) { - return session->tempo_map().meter_at (position).beats_per_bar(); + if (_session) { + return _session->tempo_map().meter_at (position).beats_per_bar(); } break; @@ -3855,19 +3927,10 @@ Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next) return ret; } -void -Editor::end_location_changed (Location* location) -{ - ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location)); - //reset_scrolling_region (); - nframes64_t session_span = location->start() + (nframes64_t) floorf (current_page_frames() * 0.10f); - horizontal_adjustment.set_upper (session_span / frames_per_unit); -} - int Editor::playlist_deletion_dialog (boost::shared_ptr pl) { - ArdourDialog dialog ("playlist deletion dialog"); + ArdourDialog dialog (_("Playlist Deletion")); Label label (string_compose (_("Playlist %1 is currently unused.\n" "If left alone, no audio files used by it will be cleaned.\n" "If deleted, audio files used by it alone by will cleaned."), @@ -3933,8 +3996,8 @@ Editor::finish_cleanup () Location* Editor::transport_loop_location() { - if (session) { - return session->locations()->auto_loop_location(); + if (_session) { + return _session->locations()->auto_loop_location(); } else { return 0; } @@ -3943,8 +4006,8 @@ Editor::transport_loop_location() Location* Editor::transport_punch_location() { - if (session) { - return session->locations()->auto_punch_location(); + if (_session) { + return _session->locations()->auto_punch_location(); } else { return 0; } @@ -3953,6 +4016,10 @@ Editor::transport_punch_location() bool Editor::control_layout_scroll (GdkEventScroll* ev) { + if (Keyboard::some_magic_widget_has_focus()) { + return false; + } + switch (ev->direction) { case GDK_SCROLL_UP: scroll_tracks_up_line (); @@ -3974,16 +4041,17 @@ Editor::control_layout_scroll (GdkEventScroll* ev) void Editor::session_state_saved (string snap_name) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved), snap_name)); - + ENSURE_GUI_THREAD (*this, &Editor::session_state_saved, snap_name); + + update_title (); _snapshots->redisplay (); } void Editor::maximise_editing_space () { - mouse_mode_tearoff->set_visible (false); - tools_tearoff->set_visible (false); + _mouse_mode_tearoff->set_visible (false); + _tools_tearoff->set_visible (false); pre_maximal_pane_position = edit_pane.get_position(); pre_maximal_editor_width = this->get_width(); @@ -4013,8 +4081,8 @@ Editor::restore_editing_space () unfullscreen(); - mouse_mode_tearoff->set_visible (true); - tools_tearoff->set_visible (true); + _mouse_mode_tearoff->set_visible (true); + _tools_tearoff->set_visible (true); post_maximal_editor_width = this->get_width(); edit_pane.set_position (pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width)); @@ -4031,8 +4099,8 @@ Editor::new_playlists (TimeAxisView* v) { begin_reversible_command (_("new playlists")); vector > playlists; - session->get_playlists(playlists); - mapover_tracks (bind (mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, RouteGroup::Edit); + _session->playlists->get (playlists); + mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::edit.property_id); commit_reversible_command (); } @@ -4047,8 +4115,8 @@ Editor::copy_playlists (TimeAxisView* v) { begin_reversible_command (_("copy playlists")); vector > playlists; - session->get_playlists(playlists); - mapover_tracks (bind (mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, RouteGroup::Edit); + _session->playlists->get (playlists); + mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::edit.property_id); commit_reversible_command (); } @@ -4062,8 +4130,8 @@ Editor::clear_playlists (TimeAxisView* v) { begin_reversible_command (_("clear playlists")); vector > playlists; - session->get_playlists(playlists); - mapover_tracks (mem_fun (*this, &Editor::mapped_clear_playlist), v, RouteGroup::Edit); + _session->playlists->get (playlists); + mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::edit.property_id); commit_reversible_command (); } @@ -4098,10 +4166,12 @@ Editor::on_key_release_event (GdkEventKey* ev) // return key_press_focus_accelerator_handler (*this, ev); } +/** Queue up a change to the viewport x origin. + * @param frame New x origin. + */ void Editor::reset_x_origin (nframes64_t frame) { - //cerr << "resetting x origin" << endl; queue_visual_change (frame); } @@ -4120,7 +4190,6 @@ Editor::reset_zoom (double fpu) void Editor::reposition_and_zoom (nframes64_t frame, double fpu) { - //cerr << "Editor::reposition_and_zoom () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG reset_x_origin (frame); reset_zoom (fpu); @@ -4154,10 +4223,11 @@ Editor::undo_visual_state () return; } + redo_visual_stack.push_back (current_visual_state()); + VisualState* vs = undo_visual_stack.back(); undo_visual_stack.pop_back(); use_visual_state (*vs); - redo_visual_stack.push_back (vs); } void @@ -4167,10 +4237,11 @@ Editor::redo_visual_state () return; } + undo_visual_stack.push_back (current_visual_state()); + VisualState* vs = redo_visual_stack.back(); redo_visual_stack.pop_back(); use_visual_state (*vs); - undo_visual_stack.push_back (vs); } void @@ -4249,8 +4320,6 @@ Editor::set_frames_per_unit (double fpu) void Editor::post_zoom () { - nframes64_t cef = 0; - // convert fpu to frame count nframes64_t frames = (nframes64_t) floor (frames_per_unit * _canvas_width); @@ -4260,28 +4329,13 @@ Editor::post_zoom () } if (mouse_mode == MouseRange && selection->time.start () != selection->time.end_frame ()) { - if (!selection->tracks.empty()) { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - (*i)->reshow_selection (selection->time); - } - } else { - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->reshow_selection (selection->time); - } + for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + (*i)->reshow_selection (selection->time); } } - leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - ZoomChanged (); /* EMIT_SIGNAL */ - reset_hscrollbar_stepping (); - - if (session) { - cef = session->current_end_frame() + (current_page_frames() / 10);// Add a little extra so we can see the end marker - } - horizontal_adjustment.set_upper (cef / frames_per_unit); - //reset_scrolling_region (); if (playhead_cursor) { @@ -4298,17 +4352,7 @@ void Editor::queue_visual_change (nframes64_t where) { pending_visual_change.add (VisualChange::TimeOrigin); - - /* if we're moving beyond the end, make sure the upper limit of the horizontal adjustment - can reach. - */ - - if (where > session->current_end_frame()) { - horizontal_adjustment.set_upper ((where + current_page_frames()) / frames_per_unit); - } - pending_visual_change.time_origin = where; - ensure_visual_change_idle_handler (); } @@ -4319,7 +4363,6 @@ Editor::queue_visual_change (double fpu) pending_visual_change.frames_per_unit = fpu; ensure_visual_change_idle_handler (); - } void @@ -4351,9 +4394,7 @@ Editor::idle_visual_changer () VisualChange::Type p = pending_visual_change.pending; pending_visual_change.pending = (VisualChange::Type) 0; -#ifdef FIX_THIS_FOR_V3 - double last_time_origin = horizontal_adjustment.get_value(); -#endif + double last_time_origin = horizontal_position (); if (p & VisualChange::ZoomLevel) { set_frames_per_unit (pending_visual_change.frames_per_unit); @@ -4364,42 +4405,20 @@ Editor::idle_visual_changer () update_tempo_based_rulers (); } if (p & VisualChange::TimeOrigin) { - horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit); + set_horizontal_position (pending_visual_change.time_origin / frames_per_unit); } if (p & VisualChange::YOrigin) { vertical_adjustment.set_value (pending_visual_change.y_origin); } - nframes64_t csf=0, cef=0; - nframes64_t current_time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - - if (session) { - csf = session->current_start_frame(); - cef = session->current_end_frame(); - } - - /* if we seek beyond the current end of the canvas, move the end */ - -#ifdef FIX_THIS_FOR_V3 - if (last_time_origin == horizontal_adjustment.get_value() ) { + if (last_time_origin == horizontal_position ()) { /* changed signal not emitted */ update_fixed_rulers (); redisplay_tempo (true); } -#endif - - if (current_time_origin != pending_visual_change.time_origin) { - cef += current_page_frames() / 10; // Add a little extra so we can see the end marker - horizontal_adjustment.set_upper (cef / frames_per_unit); - horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit); - } else { - update_fixed_rulers(); - redisplay_tempo (true); - } _summary->set_overlays_dirty (); - //cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG pending_visual_change.idle_handler_id = -1; return 0; /* this is always a one-shot call */ } @@ -4411,7 +4430,7 @@ struct EditorOrderTimeAxisSorter { }; void -Editor::sort_track_selection (TrackSelection* sel) +Editor::sort_track_selection (TrackViewList* sel) { EditorOrderTimeAxisSorter cmp; @@ -4439,7 +4458,7 @@ Editor::get_preferred_edit_position (bool ignore_playhead) switch (ep) { case EditAtPlayhead: - where = session->audible_frame(); + where = _session->audible_frame(); break; case EditAtSelectedMarker: @@ -4473,7 +4492,7 @@ Editor::get_preferred_edit_position (bool ignore_playhead) void Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd) { - if (!session) return; + if (!_session) return; begin_reversible_command (cmd); @@ -4481,17 +4500,17 @@ Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd) if ((tll = transport_loop_location()) == 0) { Location* loc = new Location (start, end, _("Loop"), Location::IsAutoLoop); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (loc, true); - session->set_auto_loop_location (loc); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (loc, true); + _session->set_auto_loop_location (loc); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); } else { XMLNode &before = tll->get_state(); tll->set_hidden (false, this); tll->set (start, end); XMLNode &after = tll->get_state(); - session->add_command (new MementoCommand(*tll, &before, &after)); + _session->add_command (new MementoCommand(*tll, &before, &after)); } commit_reversible_command (); @@ -4500,7 +4519,7 @@ Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd) void Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd) { - if (!session) return; + if (!_session) return; begin_reversible_command (cmd); @@ -4508,18 +4527,18 @@ Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd) if ((tpl = transport_punch_location()) == 0) { Location* loc = new Location (start, end, _("Loop"), Location::IsAutoPunch); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (loc, true); - session->set_auto_loop_location (loc); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (loc, true); + _session->set_auto_loop_location (loc); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); } else { XMLNode &before = tpl->get_state(); tpl->set_hidden (false, this); tpl->set (start, end); XMLNode &after = tpl->get_state(); - session->add_command (new MementoCommand(*tpl, &before, &after)); + _session->add_command (new MementoCommand(*tpl, &before, &after)); } commit_reversible_command (); @@ -4531,9 +4550,9 @@ Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd) * @param ts Tracks to look on; if this is empty, all tracks are examined. */ void -Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackSelection& ts) const +Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const { - const TrackSelection* tracks; + const TrackViewList* tracks; if (ts.empty()) { tracks = &track_views; @@ -4541,16 +4560,16 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackSelec tracks = &ts; } - for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { + for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { RouteTimeAxisView* rtv = dynamic_cast(*t); if (rtv) { - boost::shared_ptr ds; + boost::shared_ptr tr; boost::shared_ptr pl; - if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { + if ((tr = rtv->track()) && ((pl = tr->playlist()))) { Playlist::RegionList* regions = pl->regions_at ( - (nframes64_t) floor ( (double)where * ds->speed())); + (nframes64_t) floor ( (double)where * tr->speed())); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { RegionView* rv = rtv->view()->find_view (*i); @@ -4566,9 +4585,9 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackSelec } void -Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackSelection& ts) const +Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const { - const TrackSelection* tracks; + const TrackViewList* tracks; if (ts.empty()) { tracks = &track_views; @@ -4576,16 +4595,16 @@ Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackSe tracks = &ts; } - for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { + for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { RouteTimeAxisView* rtv = dynamic_cast(*t); if (rtv) { - boost::shared_ptr ds; + boost::shared_ptr tr; boost::shared_ptr pl; - if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { + if ((tr = rtv->track()) && ((pl = tr->playlist()))) { Playlist::RegionList* regions = pl->regions_touched ( - (nframes64_t) floor ( (double)where * ds->speed()), max_frames); + (nframes64_t) floor ( (double)where * tr->speed()), max_frames); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { @@ -4623,22 +4642,25 @@ Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered, bool al if (allow_edit_position) { - TrackSelection tracks = selection->tracks; + TrackViewList tracks = selection->tracks; /* tracks is currently the set of selected tracks; add any other tracks that * have regions that are in the same edit-activated route group as one of * our regions */ for (RegionSelection::iterator i = rs.begin (); i != rs.end(); ++i) { - RouteGroup* g = (*i)->get_time_axis_view().route_group (); - if (g && g->active_property (RouteGroup::Edit)) { - tracks.add (axis_views_from_routes (g->route_list())); - } + RouteGroup* g = (*i)->get_time_axis_view().route_group (); + if (g && g->is_active() && g->is_edit()) { + tracks.add (axis_views_from_routes (g->route_list())); + } + } - /* now find regions that are at the edit position on those tracks */ - nframes64_t const where = get_preferred_edit_position (); - get_regions_at (rs, where, tracks); + if (!tracks.empty()) { + /* now find regions that are at the edit position on those tracks */ + nframes64_t const where = get_preferred_edit_position (); + get_regions_at (rs, where, tracks); + } } } @@ -4654,14 +4676,14 @@ Editor::get_regions_corresponding_to (boost::shared_ptr region, vector pl; vector > results; RegionView* marv; - boost::shared_ptr ds; + boost::shared_ptr tr; - if ((ds = tatv->get_diskstream()) == 0) { + if ((tr = tatv->track()) == 0) { /* bus */ continue; } - if ((pl = (ds->playlist())) != 0) { + if ((pl = (tr->playlist())) != 0) { pl->get_region_list_equivalent_regions (region, results); } @@ -4682,26 +4704,16 @@ Editor::show_rhythm_ferret () rhythm_ferret = new RhythmFerret(*this); } - rhythm_ferret->set_session (session); + rhythm_ferret->set_session (_session); rhythm_ferret->show (); rhythm_ferret->present (); } -void -Editor::show_bundle_manager () -{ - if (_bundle_manager == 0) { - _bundle_manager = new BundleManager (*session); - } - - _bundle_manager->show (); -} - void Editor::show_global_port_matrix (ARDOUR::DataType t) { if (_global_port_matrix[t] == 0) { - _global_port_matrix[t] = new GlobalPortMatrixWindow (*session, t); + _global_port_matrix[t] = new GlobalPortMatrixWindow (_session, t); } _global_port_matrix[t]->show (); @@ -4714,7 +4726,7 @@ Editor::first_idle () if (track_views.size() > 1) { dialog = new MessageDialog (*this, - _("Please wait while Ardour loads visual data"), + string_compose (_("Please wait while %1 loads visual data"), PROGRAM_NAME), true, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE); @@ -4734,8 +4746,8 @@ Editor::first_idle () _have_idled = true; } -static gboolean -_idle_resizer (gpointer arg) +gboolean +Editor::_idle_resize (gpointer arg) { return ((Editor*)arg)->idle_resize (); } @@ -4744,7 +4756,7 @@ void Editor::add_to_idle_resize (TimeAxisView* view, int32_t h) { if (resize_idle_id < 0) { - resize_idle_id = g_idle_add (_idle_resizer, this); + resize_idle_id = g_idle_add (_idle_resize, this); _pending_resize_amount = 0; } @@ -4759,7 +4771,7 @@ Editor::add_to_idle_resize (TimeAxisView* view, int32_t h) min_resulting = min (min_resulting, int32_t (_pending_resize_view->current_height()) + _pending_resize_amount); if (selection->tracks.contains (_pending_resize_view)) { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { min_resulting = min (min_resulting, int32_t ((*i)->current_height()) + _pending_resize_amount); } } @@ -4769,8 +4781,8 @@ Editor::add_to_idle_resize (TimeAxisView* view, int32_t h) } /* clamp */ - if (uint32_t (min_resulting) < TimeAxisView::hSmall) { - _pending_resize_amount += TimeAxisView::hSmall - min_resulting; + if (uint32_t (min_resulting) < TimeAxisView::preset_height (HeightSmall)) { + _pending_resize_amount += TimeAxisView::preset_height (HeightSmall) - min_resulting; } } @@ -4783,13 +4795,14 @@ Editor::idle_resize () if (dynamic_cast (_pending_resize_view) == 0 && selection->tracks.contains (_pending_resize_view)) { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { if (*i != _pending_resize_view) { (*i)->idle_resize ((*i)->current_height() + _pending_resize_amount); } } } + _pending_resize_amount = 0; flush_canvas (); _group_tabs->set_dirty (); resize_idle_id = -1; @@ -4800,9 +4813,15 @@ Editor::idle_resize () void Editor::located () { - ENSURE_GUI_THREAD (mem_fun (*this, &Editor::located)); + ENSURE_GUI_THREAD (*this, &Editor::located); + + playhead_cursor->set_position (_session->audible_frame ()); + if (_follow_playhead && !_pending_initial_locate) { + reset_x_origin_to_follow_playhead (); + } _pending_locate_request = false; + _pending_initial_locate = false; } void @@ -4818,12 +4837,12 @@ Editor::streamview_height_changed () } TimeAxisView* -Editor::axis_view_from_route (Route* r) const +Editor::axis_view_from_route (boost::shared_ptr r) const { TrackViewList::const_iterator j = track_views.begin (); while (j != track_views.end()) { RouteTimeAxisView* rtv = dynamic_cast (*j); - if (rtv && rtv->route().get() == r) { + if (rtv && rtv->route() == r) { return rtv; } ++j; @@ -4833,12 +4852,12 @@ Editor::axis_view_from_route (Route* r) const } -TrackSelection -Editor::axis_views_from_routes (list r) const +TrackViewList +Editor::axis_views_from_routes (boost::shared_ptr r) const { - TrackSelection t; + TrackViewList t; - for (list::const_iterator i = r.begin(); i != r.end(); ++i) { + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { TimeAxisView* tv = axis_view_from_route (*i); if (tv) { t.push_back (tv); @@ -4852,7 +4871,7 @@ Editor::axis_views_from_routes (list r) const void Editor::handle_new_route (RouteList& routes) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_new_route), routes)); + ENSURE_GUI_THREAD (*this, &Editor::handle_new_route, routes) RouteTimeAxisView *rtv; list new_views; @@ -4860,16 +4879,16 @@ Editor::handle_new_route (RouteList& routes) for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr route = (*x); - if (route->is_hidden()) { + if (route->is_hidden() || route->is_monitor()) { continue; } DataType dt = route->input()->default_type(); if (dt == ARDOUR::DataType::AUDIO) { - rtv = new AudioTimeAxisView (*this, *session, route, *track_canvas); + rtv = new AudioTimeAxisView (*this, _session, route, *track_canvas); } else if (dt == ARDOUR::DataType::MIDI) { - rtv = new MidiTimeAxisView (*this, *session, route, *track_canvas); + rtv = new MidiTimeAxisView (*this, _session, route, *track_canvas); } else { throw unknown_type(); } @@ -4879,10 +4898,8 @@ Editor::handle_new_route (RouteList& routes) rtv->effective_gain_display (); - rtv->view()->RegionViewAdded.connect (mem_fun (*this, &Editor::region_view_added)); - rtv->view()->HeightChanged.connect (mem_fun (*this, &Editor::streamview_height_changed)); - - rtv->GoingAway.connect (bind (mem_fun(*this, &Editor::remove_route), rtv)); + rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added)); + rtv->view()->HeightChanged.connect (sigc::mem_fun (*this, &Editor::streamview_height_changed)); } _routes->routes_added (new_views); @@ -4897,68 +4914,81 @@ Editor::handle_new_route (RouteList& routes) } void -Editor::remove_route (TimeAxisView *tv) +Editor::timeaxisview_deleted (TimeAxisView *tv) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::remove_route), tv)); - - TrackViewList::iterator i; - - boost::shared_ptr route; - RouteTimeAxisView* rtav = dynamic_cast (tv); - if (rtav) { - route = rtav->route (); + if (_session && _session->deletion_in_progress()) { + /* the situation is under control */ + return; } + + ENSURE_GUI_THREAD (*this, &Editor::timeaxisview_deleted, tv); - TimeAxisView* next_tv = 0; + + _routes->route_removed (tv); if (tv == entered_track) { entered_track = 0; } + + /* remove it from the list of track views */ + + TrackViewList::iterator i; if ((i = find (track_views.begin(), track_views.end(), tv)) != track_views.end()) { + i = track_views.erase (i); + } - i = track_views.erase (i); + /* update whatever the current mixer strip is displaying, if revelant */ - if (track_views.empty()) { - next_tv = 0; - } else if (i == track_views.end()) { - next_tv = track_views.front(); - } else { - next_tv = (*i); - } - } + boost::shared_ptr route; + RouteTimeAxisView* rtav = dynamic_cast (tv); + + if (rtav) { + route = rtav->route (); + } if (current_mixer_strip && current_mixer_strip->route() == route) { - if (next_tv) { - set_selected_mixer_strip (*next_tv); - } else { - /* make the editor mixer strip go away setting the - * button to inactive (which also unticks the menu option) - */ + TimeAxisView* next_tv; - ActionManager::uncheck_toggleaction ("/Editor/show-editor-mixer"); - } - } + if (track_views.empty()) { + next_tv = 0; + } else if (i == track_views.end()) { + next_tv = track_views.front(); + } else { + next_tv = (*i); + } + + + if (next_tv) { + set_selected_mixer_strip (*next_tv); + } else { + /* make the editor mixer strip go away setting the + * button to inactive (which also unticks the menu option) + */ + + ActionManager::uncheck_toggleaction ("/Editor/show-editor-mixer"); + } + } } void -Editor::hide_track_in_display (TimeAxisView& tv, bool /*temponly*/) +Editor::hide_track_in_display (TimeAxisView* tv, bool /*temponly*/) { - RouteTimeAxisView* rtv = dynamic_cast (&tv); + RouteTimeAxisView* rtv = dynamic_cast (tv); if (rtv && current_mixer_strip && (rtv->route() == current_mixer_strip->route())) { // this will hide the mixer strip - set_selected_mixer_strip (tv); + set_selected_mixer_strip (*tv); } - _routes->hide_track_in_display (tv); + _routes->hide_track_in_display (*tv); } bool Editor::sync_track_view_list_and_routes () { - track_views = TrackSelection (_routes->views ()); + track_views = TrackViewList (_routes->views ()); _summary->set_dirty (); _group_tabs->set_dirty (); @@ -4993,7 +5023,7 @@ Editor::get_route_view_by_id (PBD::ID& id) void Editor::fit_route_group (RouteGroup *g) { - TrackSelection ts = axis_views_from_routes (g->route_list ()); + TrackViewList ts = axis_views_from_routes (g->route_list ()); fit_tracks (ts); } @@ -5003,18 +5033,18 @@ Editor::consider_auditioning (boost::shared_ptr region) boost::shared_ptr r = boost::dynamic_pointer_cast (region); if (r == 0) { - session->cancel_audition (); + _session->cancel_audition (); return; } - if (session->is_auditioning()) { - session->cancel_audition (); + if (_session->is_auditioning()) { + _session->cancel_audition (); if (r == last_audition_region) { return; } } - session->audition_region (r); + _session->audition_region (r); last_audition_region = r; } @@ -5026,27 +5056,33 @@ Editor::hide_a_region (boost::shared_ptr r) } void -Editor::remove_a_region (boost::shared_ptr r) +Editor::show_a_region (boost::shared_ptr r) { - session->remove_region_from_region_list (r); + r->set_hidden (false); } void Editor::audition_region_from_region_list () { - _regions->selection_mapover (mem_fun (*this, &Editor::consider_auditioning)); + _regions->selection_mapover (sigc::mem_fun (*this, &Editor::consider_auditioning)); } void Editor::hide_region_from_region_list () { - _regions->selection_mapover (mem_fun (*this, &Editor::hide_a_region)); + _regions->selection_mapover (sigc::mem_fun (*this, &Editor::hide_a_region)); +} + +void +Editor::show_region_in_region_list () +{ + _regions->selection_mapover (sigc::mem_fun (*this, &Editor::show_a_region)); } void Editor::start_step_editing () { - step_edit_connection = Glib::signal_timeout().connect (mem_fun (*this, &Editor::check_step_edit), 20); + step_edit_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::check_step_edit), 20); } void @@ -5067,3 +5103,229 @@ Editor::check_step_edit () return true; // do it again, till we stop } + +void +Editor::horizontal_scroll_left () +{ + double x = leftmost_position() - current_page_frames() / 5; + if (x < 0) { + x = 0; + } + + reset_x_origin (x); +} + +void +Editor::horizontal_scroll_right () +{ + reset_x_origin (leftmost_position() + current_page_frames() / 5); +} + +/** Queue a change for the Editor viewport x origin to follow the playhead */ +void +Editor::reset_x_origin_to_follow_playhead () +{ + nframes64_t const frame = playhead_cursor->current_frame; + + if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { + + if (_session->transport_speed() < 0) { + + if (frame > (current_page_frames() / 2)) { + center_screen (frame-(current_page_frames()/2)); + } else { + center_screen (current_page_frames()/2); + } + + } else { + + if (frame < leftmost_frame) { + /* moving left */ + nframes64_t l = 0; + if (_session->transport_rolling()) { + /* rolling; end up with the playhead at the right of the page */ + l = frame - current_page_frames (); + } else { + /* not rolling: end up with the playhead 3/4 of the way along the page */ + l = frame - (3 * current_page_frames() / 4); + } + + if (l < 0) { + l = 0; + } + + center_screen_internal (l + (current_page_frames() / 2), current_page_frames ()); + } else { + /* moving right */ + if (_session->transport_rolling()) { + /* rolling: end up with the playhead on the left of the page */ + center_screen_internal (frame + (current_page_frames() / 2), current_page_frames ()); + } else { + /* not rolling: end up with the playhead 1/4 of the way along the page */ + center_screen_internal (frame + (current_page_frames() / 4), current_page_frames ()); + } + } + } + } +} + +void +Editor::super_rapid_screen_update () +{ + if (!_session || !_session->engine().running()) { + return; + } + + /* METERING / MIXER STRIPS */ + + /* update track meters, if required */ + if (is_mapped() && meters_running) { + RouteTimeAxisView* rtv; + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + if ((rtv = dynamic_cast(*i)) != 0) { + rtv->fast_update (); + } + } + } + + /* and any current mixer strip */ + if (current_mixer_strip) { + current_mixer_strip->fast_update (); + } + + /* PLAYHEAD AND VIEWPORT */ + + nframes64_t const frame = _session->audible_frame(); + + /* There are a few reasons why we might not update the playhead / viewport stuff: + * + * 1. we don't update things when there's a pending locate request, otherwise + * when the editor requests a locate there is a chance that this method + * will move the playhead before the locate request is processed, causing + * a visual glitch. + * 2. if we're not rolling, there's nothing to do here (locates are handled elsewhere). + * 3. if we're still at the same frame that we were last time, there's nothing to do. + */ + + if (!_pending_locate_request && _session->transport_speed() != 0 && frame != last_update_frame) { + + last_update_frame = frame; + + if (!_dragging_playhead) { + playhead_cursor->set_position (frame); + } + + if (!_stationary_playhead) { + + if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0) { + reset_x_origin_to_follow_playhead (); + } + + } else { + + /* don't do continuous scroll till the new position is in the rightmost quarter of the + editor canvas + */ +#if 0 + // FIXME DO SOMETHING THAT WORKS HERE - this is 2.X code + double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit; + if (target <= 0.0) { + target = 0.0; + } + if (fabs(target - current) < current_page_frames() / frames_per_unit) { + target = (target * 0.15) + (current * 0.85); + } else { + /* relax */ + } + + current = target; + set_horizontal_position (current); +#endif + } + + } +} + + +void +Editor::session_going_away () +{ + _have_idled = false; + + _session_connections.drop_connections (); + + super_rapid_screen_update_connection.disconnect (); + + selection->clear (); + cut_buffer->clear (); + + clicked_regionview = 0; + clicked_axisview = 0; + clicked_routeview = 0; + clicked_crossfadeview = 0; + entered_regionview = 0; + entered_track = 0; + last_update_frame = 0; + _drags->abort (); + + playhead_cursor->canvas_item.hide (); + + /* rip everything out of the list displays */ + + _regions->clear (); + _routes->clear (); + _route_groups->clear (); + + /* do this first so that deleting a track doesn't reset cms to null + and thus cause a leak. + */ + + if (current_mixer_strip) { + if (current_mixer_strip->get_parent() != 0) { + global_hpacker.remove (*current_mixer_strip); + } + delete current_mixer_strip; + current_mixer_strip = 0; + } + + /* delete all trackviews */ + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + delete *i; + } + track_views.clear (); + + zoom_range_clock.set_session (0); + nudge_clock.set_session (0); + + editor_list_button.set_active(false); + editor_list_button.set_sensitive(false); + + /* clear tempo/meter rulers */ + remove_metric_marks (); + hide_measures (); + clear_marker_display (); + + delete current_bbt_points; + current_bbt_points = 0; + + /* get rid of any existing editor mixer strip */ + + WindowTitle title(Glib::get_application_name()); + title += _("Editor"); + + set_title (title.get_string()); + + SessionHandlePtr::session_going_away (); +} + + +void +Editor::show_editor_list (bool yn) +{ + if (yn) { + the_notebook.show(); + } else { + the_notebook.hide(); + } +}