X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=950208b19e6bb31d40daaa5965268e16e7199874;hb=dc65bd801c7a2e5a7b96900b21ad125169367652;hp=1b03576ace9bdde0fc8ad0716c9790414fa583a0;hpb=db8b575c30845bafc34b87bacd52129c95d1c478;p=ardour.git diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 1b03576ace..950208b19e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -114,6 +114,8 @@ #include "editor_regions.h" #include "editor_locations.h" #include "editor_snapshots.h" +#include "editor_summary.h" +#include "region_layering_order_editor.h" #include "i18n.h" @@ -145,10 +147,20 @@ static const gchar *_snap_type_strings[] = { N_("Seconds"), N_("Minutes"), N_("Beats/32"), + N_("Beats/28"), + N_("Beats/24"), + N_("Beats/20"), 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"), @@ -191,6 +203,7 @@ static const gchar *_rb_opt_strings[] = { N_("Unpitched percussion with stable notes"), N_("Crisp monophonic instrumental"), N_("Unpitched solo percussion"), + N_("Resample without preserving pitch"), 0 }; #endif @@ -200,9 +213,15 @@ static const gchar *_rb_opt_strings[] = { Gdk::Cursor* Editor::cross_hair_cursor = 0; Gdk::Cursor* Editor::selector_cursor = 0; Gdk::Cursor* Editor::trimmer_cursor = 0; +Gdk::Cursor* Editor::left_side_trim_cursor = 0; +Gdk::Cursor* Editor::right_side_trim_cursor = 0; +Gdk::Cursor* Editor::fade_in_cursor = 0; +Gdk::Cursor* Editor::fade_out_cursor = 0; Gdk::Cursor* Editor::grabber_cursor = 0; +Gdk::Cursor* Editor::grabber_note_cursor = 0; Gdk::Cursor* Editor::grabber_edit_point_cursor = 0; -Gdk::Cursor* Editor::zoom_cursor = 0; +Gdk::Cursor* Editor::zoom_in_cursor = 0; +Gdk::Cursor* Editor::zoom_out_cursor = 0; Gdk::Cursor* Editor::time_fx_cursor = 0; Gdk::Cursor* Editor::fader_cursor = 0; Gdk::Cursor* Editor::speaker_cursor = 0; @@ -213,6 +232,7 @@ Gdk::Cursor* Editor::midi_erase_cursor = 0; Gdk::Cursor* Editor::wait_cursor = 0; Gdk::Cursor* Editor::timebar_cursor = 0; Gdk::Cursor* Editor::transparent_cursor = 0; +Gdk::Cursor* Editor::up_down_cursor = 0; void show_me_the_size (Requisition* r, const char* what) @@ -220,6 +240,27 @@ 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) @@ -241,7 +282,6 @@ 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 */ @@ -264,7 +304,9 @@ Editor::Editor () , meters_running(false) , _pending_locate_request (false) , _pending_initial_locate (false) + , _last_cut_copy_source_track (0) + , _region_selection_change_updates_region_list (true) { constructed = false; @@ -283,6 +325,7 @@ Editor::Editor () clicked_crossfadeview = 0; clicked_control_point = 0; last_update_frame = 0; + pre_press_cursor = 0; _drags = new DragManager (this); current_mixer_strip = 0; current_bbt_points = 0; @@ -294,6 +337,7 @@ Editor::Editor () edit_point_strings = I18N (_edit_point_strings); #ifdef USE_RUBBERBAND rb_opt_strings = I18N (_rb_opt_strings); + rb_current_opt = 4; #endif snap_threshold = 5.0; @@ -304,29 +348,27 @@ 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; 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; @@ -340,7 +382,6 @@ 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; @@ -348,11 +389,8 @@ Editor::Editor () _dragging_edit_point = false; select_new_marker = false; rhythm_ferret = 0; + layering_order_editor = 0; _bundle_manager = 0; - for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { - _global_port_matrix[*i] = 0; - } - allow_vertical_scroll = false; no_save_visual = false; resize_idle_id = -1; @@ -372,6 +410,8 @@ Editor::Editor () frames_per_unit = 2048; /* too early to use reset_zoom () */ + _scroll_callbacks = 0; + zoom_focus = ZoomFocusLeft; set_zoom_focus (ZoomFocusLeft); zoom_range_clock.ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed)); @@ -449,7 +489,6 @@ Editor::Editor () selection->MarkersChanged.connect (sigc::mem_fun(*this, &Editor::marker_selection_changed)); edit_controls_vbox.set_spacing (0); - horizontal_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &Editor::scroll_canvas_horizontally), false); 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)); @@ -502,7 +541,6 @@ Editor::Editor () edit_packer.set_border_width (0); edit_packer.set_name ("EditorWindow"); - edit_packer.attach (zoom_vbox, 0, 1, 0, 2, SHRINK, FILL, 0, 0); /* labels for the rulers */ edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0); /* labels for the marker "tracks" */ @@ -528,7 +566,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"))); @@ -548,27 +586,32 @@ Editor::Editor () the_notebook.show_all (); post_maximal_editor_width = 0; - post_maximal_pane_position = 0; + post_maximal_horizontal_pane_position = 0; + post_maximal_editor_height = 0; + post_maximal_vertical_pane_position = 0; - VPaned *editor_summary_pane = manage(new VPaned()); - editor_summary_pane->pack1(edit_packer); + editor_summary_pane.pack1(edit_packer); 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)); + summary_arrows_left_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press))); + summary_arrows_left_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release)); 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)); + summary_arrows_left_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press))); + summary_arrows_left_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release)); 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)); + summary_arrows_right_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press))); + summary_arrows_right_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release)); 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)); + summary_arrows_right_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press))); + summary_arrows_right_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release)); 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); @@ -582,13 +625,20 @@ Editor::Editor () _summary_hbox.pack_start (*summary_frame, true, true); _summary_hbox.pack_start (*summary_arrows_right, false, false); - editor_summary_pane->pack2 (_summary_hbox); + editor_summary_pane.pack2 (_summary_hbox); - edit_pane.pack1 (*editor_summary_pane, true, true); + edit_pane.pack1 (editor_summary_pane, true, true); edit_pane.pack2 (the_notebook, false, true); - edit_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Editor::pane_allocation_handler), static_cast (&edit_pane))); + editor_summary_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::pane_allocation_handler), static_cast (&editor_summary_pane))); + /* XXX: editor_summary_pane might need similar special OS X treatment to the 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); @@ -621,13 +671,10 @@ Editor::Editor () set_mouse_mode (MouseObject, true); set_edit_point_preference (EditAtMouse, true); - XMLNode* node = ARDOUR_UI::instance()->editor_settings(); - set_state (*node, Stateful::loading_state_version); - _playlist_selector = new PlaylistSelector(); _playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast (_playlist_selector))); - RegionView::RegionViewGoingAway.connect (*this, ui_bind (&Editor::catch_vanishing_regionview, this, _1), gui_context()); + RegionView::RegionViewGoingAway.connect (*this, invalidator (*this), ui_bind (&Editor::catch_vanishing_regionview, this, _1), gui_context()); /* nudge stuff */ @@ -664,7 +711,7 @@ Editor::Editor () WindowTitle title(Glib::get_application_name()); title += _("Editor"); set_title (title.get_string()); - set_wmclass (X_("ardour_editor"), "Ardour"); + set_wmclass (X_("ardour_editor"), PROGRAM_NAME); add (vpacker); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); @@ -674,24 +721,28 @@ Editor::Editor () /* allow external control surfaces/protocols to do various things */ - ControlProtocol::ZoomToSession.connect (*this, boost::bind (&Editor::temporal_zoom_session, this), gui_context()); - ControlProtocol::ZoomIn.connect (*this, boost::bind (&Editor::temporal_zoom_step, this, false), gui_context()); - ControlProtocol::ZoomOut.connect (*this, boost::bind (&Editor::temporal_zoom_step, this, true), gui_context()); - ControlProtocol::ScrollTimeline.connect (*this, ui_bind (&Editor::control_scroll, this, _1), gui_context()); - BasicUI::AccessAction.connect (*this, ui_bind (&Editor::access_action, this, _1, _2), gui_context()); + 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 (*this, ui_bind (&Editor::parameter_changed, this, _1), gui_context()); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Editor::parameter_changed, this, _1), gui_context()); - TimeAxisView::CatchDeletion.connect (*this, ui_bind (&Editor::timeaxisview_deleted, this, _1), gui_context()); + TimeAxisView::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Editor::timeaxisview_deleted, this, _1), gui_context()); - _last_normalization_value = 0; + _ignore_region_action = false; + _last_region_menu_was_main = false; + _popup_region_menu_item = 0; constructed = true; instant_save (); + + setup_fade_images (); } Editor::~Editor() @@ -707,7 +758,7 @@ Editor::~Editor() image_socket_listener = 0 ; } #endif - + delete _routes; delete _route_groups; delete track_canvas; @@ -739,6 +790,10 @@ Editor::catch_vanishing_regionview (RegionView *rv) if (entered_regionview == rv) { set_entered_regionview (0); } + + if (!_all_region_actions_sensitized) { + sensitize_all_region_actions (true); + } } void @@ -753,7 +808,14 @@ Editor::set_entered_regionview (RegionView* rv) } if ((entered_regionview = rv) != 0) { - entered_regionview->entered (); + entered_regionview->entered (internal_editing ()); + } + + if (!_all_region_actions_sensitized && _last_region_menu_was_main) { + /* This RegionView entry might have changed what region actions + are allowed, so sensitize them all in case a key is pressed. + */ + sensitize_all_region_actions (true); } } @@ -793,8 +855,6 @@ Editor::show_window () tv = (static_cast(*i)); tv->reset_height (); } - - reset_zoom (frames_per_unit); } present (); @@ -825,10 +885,10 @@ Editor::zoom_adjustment_changed () if (fpu < 1.0) { fpu = 1.0; - zoom_range_clock.set ((nframes64_t) floor (fpu * _canvas_width)); + zoom_range_clock.set ((framepos_t) floor (fpu * _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)); + zoom_range_clock.set ((framepos_t) floor (fpu * _canvas_width)); } temporal_zoom (fpu); @@ -848,7 +908,7 @@ Editor::control_scroll (float fraction) /* _control_scroll_target is an optional - it acts like a pointer to an nframes64_t, with + it acts like a pointer to an framepos_t, with a operator conversion to boolean to check that it has a value could possibly use playhead_cursor->current_frame to store the @@ -861,12 +921,12 @@ Editor::control_scroll (float fraction) _dragging_playhead = true; } - if ((fraction < 0.0f) && (*_control_scroll_target < (nframes64_t) fabs(step))) { + if ((fraction < 0.0f) && (*_control_scroll_target < (framepos_t) fabs(step))) { *_control_scroll_target = 0; - } else if ((fraction > 0.0f) && (max_frames - *_control_scroll_target < step)) { - *_control_scroll_target = max_frames - (current_page_frames()*2); // allow room for slop in where the PH is on the screen + } else if ((fraction > 0.0f) && (max_framepos - *_control_scroll_target < step)) { + *_control_scroll_target = max_framepos - (current_page_frames()*2); // allow room for slop in where the PH is on the screen } else { - *_control_scroll_target += (nframes64_t) floor (step); + *_control_scroll_target += (framepos_t) floor (step); } /* move visuals, we'll catch up with it later */ @@ -897,7 +957,7 @@ Editor::control_scroll (float fraction) } bool -Editor::deferred_control_scroll (nframes64_t /*target*/) +Editor::deferred_control_scroll (framepos_t /*target*/) { _session->request_locate (*_control_scroll_target, _session->transport_rolling()); // reset for next stream @@ -931,20 +991,23 @@ Editor::on_realize () } void -Editor::map_position_change (nframes64_t frame) +Editor::map_position_change (framepos_t frame) { ENSURE_GUI_THREAD (*this, &Editor::map_position_change, frame) - if (_session == 0 || !_follow_playhead) { + if (_session == 0) { return; } - center_screen (frame); + if (_follow_playhead) { + center_screen (frame); + } + playhead_cursor->set_position (frame); } void -Editor::center_screen (nframes64_t frame) +Editor::center_screen (framepos_t frame) { double page = _canvas_width * frames_per_unit; @@ -957,12 +1020,12 @@ Editor::center_screen (nframes64_t frame) } void -Editor::center_screen_internal (nframes64_t frame, float page) +Editor::center_screen_internal (framepos_t frame, float page) { page /= 2; if (frame > page) { - frame -= (nframes64_t) page; + frame -= (framepos_t) page; } else { frame = 0; } @@ -970,24 +1033,6 @@ Editor::center_screen_internal (nframes64_t frame, float page) reset_x_origin (frame); } -void -Editor::handle_new_duration () -{ - if (!_session) { - return; - } - - ENSURE_GUI_THREAD (*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 () @@ -1049,9 +1094,6 @@ Editor::set_session (Session *t) 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(); set_state (*node, Stateful::loading_state_version); @@ -1067,22 +1109,21 @@ Editor::set_session (Session *t) but use Gtkmm2ext::UI::instance()->call_slot(); */ - _session->TransportStateChange.connect (_session_connections, boost::bind (&Editor::map_transport_state, this), gui_context()); - _session->PositionChanged.connect (_session_connections, ui_bind (&Editor::map_position_change, this, _1), gui_context()); - _session->RouteAdded.connect (_session_connections, ui_bind (&Editor::handle_new_route, this, _1), gui_context()); - _session->DurationChanged.connect (_session_connections, boost::bind (&Editor::handle_new_duration, this), gui_context()); - _session->DirtyChanged.connect (_session_connections, boost::bind (&Editor::update_title, this), gui_context()); - _session->TimecodeOffsetChanged.connect (_session_connections, boost::bind (&Editor::update_just_timecode, this), gui_context()); - _session->tempo_map().PropertyChanged.connect (_session_connections, ui_bind (&Editor::tempo_map_changed, this, _1), gui_context()); - _session->Located.connect (_session_connections, boost::bind (&Editor::located, this), gui_context()); - _session->config.ParameterChanged.connect (_session_connections, ui_bind (&Editor::parameter_changed, this, _1), gui_context()); - _session->StateSaved.connect (_session_connections, ui_bind (&Editor::session_state_saved, this, _1), gui_context()); - _session->locations()->added.connect (_session_connections, ui_bind (&Editor::add_new_location, this, _1), gui_context()); - _session->locations()->removed.connect (_session_connections, ui_bind (&Editor::location_gone, this, _1), gui_context()); - _session->locations()->changed.connect (_session_connections, boost::bind (&Editor::refresh_location_display, this), gui_context()); - _session->locations()->StateChanged.connect (_session_connections, ui_bind (&Editor::refresh_location_display_s, this, _1), gui_context()); - _session->locations()->end_location()->changed.connect (_session_connections, ui_bind (&Editor::end_location_changed, this, _1), gui_context()); - _session->history().Changed.connect (_session_connections, boost::bind (&Editor::history_changed, this), gui_context()); + _session->StepEditStatusChange.connect (_session_connections, invalidator (*this), ui_bind(&Editor::step_edit_status_change, this, _1), gui_context()); + _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()); if (Profile->get_sae()) { BBT_Time bbt; @@ -1101,7 +1142,7 @@ Editor::set_session (Session *t) 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 (*_session, 0, _session->current_end_frame(), _("Loop"),(Location::Flags) (Location::IsAutoLoop | Location::IsHidden)); if (loc->start() == loc->end()) { loc->set_end (loc->start() + 1); } @@ -1114,7 +1155,7 @@ Editor::set_session (Session *t) 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 (*_session, 0, _session->current_end_frame(), _("Punch"), (Location::Flags) (Location::IsAutoPunch | Location::IsHidden)); if (loc->start() == loc->end()) { loc->set_end (loc->start() + 1); } @@ -1130,7 +1171,6 @@ Editor::set_session (Session *t) _session->config.map_parameters (pc); refresh_location_display (); - handle_new_duration (); restore_ruler_visibility (); //tempo_map_changed (PropertyChange (0)); @@ -1159,24 +1199,43 @@ Editor::set_session (Session *t) /* register for undo history */ _session->register_with_memento_command_factory(_id, this); + ActionManager::ui_manager->signal_pre_activate().connect (sigc::mem_fun (*this, &Editor::action_pre_activated)); + start_updating_meters (); } +void +Editor::action_pre_activated (Glib::RefPtr const & a) +{ + if (a->get_name() == "RegionMenu") { + /* When the main menu's region menu is opened, we setup the actions so that they look right + in the menu. I can't find a way of getting a signal when this menu is subsequently closed, + so we resensitize all region actions when the entered regionview or the region selection + changes. HOWEVER we can't always resensitize on entered_regionview change because that + happens after the region context menu is opened. So we set a flag here, too. + + What a carry on :( + */ + sensitize_the_right_region_actions (); + _last_region_menu_was_main = true; + } +} + void Editor::build_cursors () { using namespace Gdk; - Gdk::Color mbg ("#000000" ); /* Black */ - Gdk::Color mfg ("#0000ff" ); /* Blue. */ - { - RefPtr source, mask; - source = Bitmap::create (mag_bits, mag_width, mag_height); - mask = Bitmap::create (magmask_bits, mag_width, mag_height); - zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot); + Glib::RefPtr zoom_in_cursor_pixbuf (::get_icon ("zoom_in_cursor")); + zoom_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), zoom_in_cursor_pixbuf, 5, 5); } + { + Glib::RefPtr zoom_out_cursor_pixbuf (::get_icon ("zoom_out_cursor")); + zoom_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), zoom_out_cursor_pixbuf, 5, 5); + } + Gdk::Color fbg ("#ffffff" ); Gdk::Color ffg ("#000000" ); @@ -1211,8 +1270,15 @@ Editor::build_cursors () transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0); } + { + Glib::RefPtr grabber_pixbuf (::get_icon ("grabber")); + grabber_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_pixbuf, 5, 0); + } - grabber_cursor = new Gdk::Cursor (HAND2); + { + Glib::RefPtr grabber_note_pixbuf (::get_icon ("grabber_note")); + grabber_note_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_note_pixbuf, 5, 10); + } { Glib::RefPtr grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point")); @@ -1221,6 +1287,27 @@ Editor::build_cursors () cross_hair_cursor = new Gdk::Cursor (CROSSHAIR); trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW); + + { + Glib::RefPtr apixbuf (::get_icon ("trim_left_cursor")); + left_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 5, 11); + } + + { + Glib::RefPtr apixbuf (::get_icon ("trim_right_cursor")); + right_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 23, 11); + } + + { + Glib::RefPtr apixbuf (::get_icon ("fade_in_cursor")); + fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 40); + } + + { + Glib::RefPtr apixbuf (::get_icon ("fade_out_cursor")); + fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 27, 40); + } + selector_cursor = new Gdk::Cursor (XTERM); time_fx_cursor = new Gdk::Cursor (SIZING); wait_cursor = new Gdk::Cursor (WATCH); @@ -1229,6 +1316,7 @@ Editor::build_cursors () midi_select_cursor = new Gdk::Cursor (CENTER_PTR); midi_resize_cursor = new Gdk::Cursor (SIZING); midi_erase_cursor = new Gdk::Cursor (DRAPED_BOX); + up_down_cursor = new Gdk::Cursor (Gdk::SB_V_DOUBLE_ARROW); } /** Pop up a context menu for when the user clicks on a fade in or fade out */ @@ -1259,14 +1347,57 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i items.push_back (SeparatorElem()); if (Profile->get_sae()) { - 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 (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLinear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeFast))); + } else { - 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))); + + items.push_back ( + ImageMenuElem ( + _("Linear"), + *_fade_in_images[FadeLinear], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLinear) + ) + ); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Slowest"), + *_fade_in_images[FadeFast], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeFast) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Slow"), + *_fade_in_images[FadeLogB], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLogB) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Fast"), + *_fade_in_images[FadeLogA], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeLogA) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Fastest"), + *_fade_in_images[FadeSlow], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_shape), FadeSlow) + )); + + dynamic_cast(&items.back())->set_always_show_image (); } break; @@ -1282,14 +1413,55 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i items.push_back (SeparatorElem()); if (Profile->get_sae()) { - 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 (_("Linear"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLinear))); + items.push_back (MenuElem (_("Slowest"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeSlow))); } else { - 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))); + + items.push_back ( + ImageMenuElem ( + _("Linear"), + *_fade_out_images[FadeLinear], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLinear) + ) + ); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Slowest"), + *_fade_out_images[FadeFast], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeSlow) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Slow"), + *_fade_out_images[FadeLogB], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLogA) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Fast"), + *_fade_out_images[FadeLogA], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeLogB) + )); + + dynamic_cast(&items.back())->set_always_show_image (); + + items.push_back ( + ImageMenuElem ( + _("Fastest"), + *_fade_out_images[FadeSlow], + sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_shape), FadeFast) + )); + + dynamic_cast(&items.back())->set_always_show_image (); } break; @@ -1305,16 +1477,18 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i } void -Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes64_t frame) +Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, framepos_t frame) { using namespace Menu_Helpers; - Menu* (Editor::*build_menu_function)(nframes64_t); + Menu* (Editor::*build_menu_function)(framepos_t); Menu *menu; switch (item_type) { case RegionItem: case RegionViewName: case RegionViewNameHighlight: + case LeftFrameHandle: + case RightFrameHandle: if (with_selection) { build_menu_function = &Editor::build_track_selection_context_menu; } else { @@ -1335,7 +1509,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; @@ -1356,6 +1530,8 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, case RegionItem: case RegionViewName: case RegionViewNameHighlight: + case LeftFrameHandle: + case RightFrameHandle: if (!with_selection) { if (region_edit_menu_split_item) { if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) { @@ -1364,16 +1540,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; @@ -1420,11 +1593,18 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, clicked_routeview->build_underlay_menu(menu); } + /* When the region menu is opened, we setup the actions so that they look right + in the menu. + */ + sensitize_the_right_region_actions (); + _last_region_menu_was_main = false; + + menu->signal_hide().connect (sigc::bind (sigc::mem_fun (*this, &Editor::sensitize_all_region_actions), true)); menu->popup (button, time); } Menu* -Editor::build_track_context_menu (nframes64_t) +Editor::build_track_context_menu (framepos_t) { using namespace Menu_Helpers; @@ -1436,7 +1616,7 @@ Editor::build_track_context_menu (nframes64_t) } Menu* -Editor::build_track_bus_context_menu (nframes64_t) +Editor::build_track_bus_context_menu (framepos_t) { using namespace Menu_Helpers; @@ -1448,34 +1628,31 @@ Editor::build_track_bus_context_menu (nframes64_t) } Menu* -Editor::build_track_region_context_menu (nframes64_t frame) +Editor::build_track_region_context_menu (framepos_t frame) { using namespace Menu_Helpers; MenuList& edit_items = track_region_context_menu.items(); edit_items.clear(); + /* we've just cleared the track region context menu, so the menu that these + two items were on will have disappeared; stop them dangling. + */ + region_edit_menu_split_item = 0; + region_edit_menu_split_multichannel_item = 0; + 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 (selection->regions.size() > 1) { - // there's already a multiple selection: just add a - // single region context menu that will act on all - // selected regions - 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) { - add_region_context_items (rtv->view(), (*i), edit_items); - } - } - - delete regions; + /* Don't offer a region submenu if we are in internal edit mode, as we don't select regions in this + mode and so offering region context is somewhat confusing. + */ + if ((tr = rtv->track()) && ((pl = tr->playlist())) && !internal_editing()) { + framepos_t framepos = (framepos_t) floor ((double)frame * tr->speed()); + uint32_t regions_at = pl->count_regions_at (framepos); + add_region_context_items (edit_items, regions_at > 1); } } @@ -1485,7 +1662,7 @@ Editor::build_track_region_context_menu (nframes64_t frame) } Menu* -Editor::build_track_crossfade_context_menu (nframes64_t frame) +Editor::build_track_crossfade_context_menu (framepos_t frame) { using namespace Menu_Helpers; MenuList& edit_items = track_crossfade_context_menu.items(); @@ -1494,13 +1671,12 @@ 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; apl->crossfades_at (frame, xfades); @@ -1511,18 +1687,9 @@ Editor::build_track_crossfade_context_menu (nframes64_t frame) add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many); } - if (selection->regions.size() > 1) { - // there's already a multiple selection: just add a - // single region context menu that will act on all - // selected regions - 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) { - add_region_context_items (atv->audio_view(), (*i), edit_items); - } - } - delete regions; + framepos_t framepos = (framepos_t) floor ((double)frame * tr->speed()); + uint32_t regions_at = pl->count_regions_at (framepos); + add_region_context_items (edit_items, regions_at > 1); } } @@ -1532,7 +1699,7 @@ Editor::build_track_crossfade_context_menu (nframes64_t frame) } void -Editor::analyze_region_selection() +Editor::analyze_region_selection () { if (analysis_window == 0) { analysis_window = new AnalysisWindow(); @@ -1568,7 +1735,7 @@ Editor::analyze_range_selection() } Menu* -Editor::build_track_selection_context_menu (nframes64_t) +Editor::build_track_selection_context_menu (framepos_t) { using namespace Menu_Helpers; MenuList& edit_items = track_selection_context_menu.items(); @@ -1600,7 +1767,7 @@ Editor::add_crossfade_context_items (AudioStreamView* /*view*/, boost::shared_pt } 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)))); + items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr (xfade)))); if (xfade->can_follow_overlap()) { @@ -1642,218 +1809,10 @@ Editor::xfade_edit_right_region () } void -Editor::add_region_context_items (StreamView* sv, boost::shared_ptr region, Menu_Helpers::MenuList& edit_items) +Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, bool multiple_regions_at_position) { using namespace Menu_Helpers; - Gtk::MenuItem* foo_item; - Menu *region_menu = manage (new Menu); - MenuList& items = region_menu->items(); - region_menu->set_name ("ArdourContextMenu"); - - boost::shared_ptr ar; - boost::shared_ptr mr; - - if (region) { - ar = boost::dynamic_pointer_cast (region); - mr = boost::dynamic_pointer_cast (region); - - /* when this particular menu pops up, make the relevant region - become selected. - */ - - region_menu->signal_map_event().connect ( - sigc::bind (sigc::mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr(region))); - - items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::rename_region))); - if (mr && internal_editing()) { - items.push_back (MenuElem (_("List editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor))); - } else { - items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region))); - } - } - - 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"), 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"), sigc::mem_fun(*this, &Editor::remove_region_sync))); - items.push_back (SeparatorElem()); - - 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"), sigc::mem_fun(*this, &Editor::analyze_region_selection))); - } - - items.push_back (SeparatorElem()); - - sigc::connection fooc; - boost::shared_ptr region_to_check; - - if (region) { - region_to_check = region; - } else { - region_to_check = selection->regions.front()->region(); - } - - items.push_back (CheckMenuElem (_("Lock"))); - CheckMenuItem* region_lock_item = static_cast(&items.back()); - if (region_to_check->locked()) { - region_lock_item->set_active(); - } - region_lock_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_region_lock)); - - items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); - CheckMenuItem* bbt_glue_item = static_cast(&items.back()); - - switch (region_to_check->positional_lock_style()) { - case Region::MusicTime: - bbt_glue_item->set_active (true); - break; - default: - bbt_glue_item->set_active (false); - break; - } - - bbt_glue_item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime)); - - items.push_back (CheckMenuElem (_("Mute"))); - CheckMenuItem* region_mute_item = static_cast(&items.back()); - 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); - } - - if (!Profile->get_sae()) { - items.push_back (CheckMenuElem (_("Opaque"))); - CheckMenuItem* region_opaque_item = static_cast(&items.back()); - 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(); - fooc.block (false); - } - } - - items.push_back (CheckMenuElem (_("Original Position"), sigc::mem_fun(*this, &Editor::naturalize))); - if (region_to_check->at_natural_position()) { - items.back().set_sensitive (false); - } - - items.push_back (SeparatorElem()); - - if (ar) { - - RegionView* rv = sv->find_view (ar); - AudioRegionView* arv = dynamic_cast(rv); - - if (!Profile->get_sae()) { - 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 (sigc::mem_fun(*this, &Editor::toggle_gain_envelope_visibility)); - if (arv->envelope_visible()) { - fooc.block (true); - region_envelope_visible_item->set_active (true); - fooc.block (false); - } - - items.push_back (CheckMenuElem (_("Envelope Active"))); - CheckMenuItem* region_envelope_active_item = static_cast (&items.back()); - fooc = region_envelope_active_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_gain_envelope_active)); - - if (ar->envelope_active()) { - fooc.block (true); - region_envelope_active_item->set_active (true); - fooc.block (false); - } - - items.push_back (SeparatorElem()); - } - - items.push_back (MenuElem (_("Normalize"), sigc::mem_fun(*this, &Editor::normalize_region))); - if (ar->scale_amplitude() != 1) { - items.push_back (MenuElem (_("Reset Gain"), sigc::mem_fun(*this, &Editor::reset_region_scale_amplitude))); - } - - } else if (mr) { - items.push_back (MenuElem (_("Quantize"), sigc::mem_fun(*this, &Editor::quantize_region))); - items.push_back (SeparatorElem()); - } - - 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"), 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"), sigc::mem_fun (*this, &Editor::set_selection_from_region))); - items.push_back (SeparatorElem()); - - /* Nudge region */ - - Menu *nudge_menu = manage (new Menu()); - MenuList& nudge_items = nudge_menu->items(); - nudge_menu->set_name ("ArdourContextMenu"); - - 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()); - - Menu *trim_menu = manage (new Menu); - MenuList& trim_items = trim_menu->items(); - trim_menu->set_name ("ArdourContextMenu"); - - 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"), 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"), 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"), (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"), (sigc::mem_fun(*this, &Editor::split_multichannel_region)))); - region_edit_menu_split_multichannel_item = &items.back(); - - 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"), 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. */ @@ -1862,15 +1821,28 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr regi meaning for menu titles. */ + RegionSelection rs = get_regions_from_selection_and_entered (); + string::size_type pos = 0; - string menu_item_name = (region) ? region->name() : _("Selected Regions"); + string menu_item_name = (rs.size() == 1) ? rs.front()->region()->name() : _("Selected Regions"); while ((pos = menu_item_name.find ("_", pos)) != string::npos) { menu_item_name.replace (pos, 1, "__"); pos += 2; } - edit_items.push_back (MenuElem (menu_item_name, *region_menu)); + if (_popup_region_menu_item == 0) { + _popup_region_menu_item = new MenuItem (menu_item_name); + _popup_region_menu_item->set_submenu (*dynamic_cast (ActionManager::get_widget (X_("/PopupRegionMenu")))); + _popup_region_menu_item->show (); + } else { + _popup_region_menu_item->set_label (menu_item_name); + } + + edit_items.push_back (*_popup_region_menu_item); + if (multiple_regions_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) { + edit_items.push_back (action_menu_item ("choose-top-region")); + } edit_items.push_back (SeparatorElem()); } @@ -1895,7 +1867,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) } edit_items.push_back (SeparatorElem()); - 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-place"), 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()); @@ -1918,7 +1890,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) 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_range))); + edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_selection))); } @@ -1937,7 +1909,7 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) 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"), sigc::mem_fun(*this, &Editor::loop_selected_region))); + play_items.push_back (MenuElem (_("Loop Region"), sigc::bind (sigc::mem_fun (*this, &Editor::set_loop_from_region), true))); edit_items.push_back (MenuElem (_("Play"), *play_menu)); @@ -1977,8 +1949,8 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) 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))); + cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions), ARDOUR::SyncPoint))); + cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::SyncPoint))); edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu)); @@ -2092,11 +2064,21 @@ 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 SnapToBeatDiv20: + 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; @@ -2111,7 +2093,9 @@ Editor::set_snap_to (SnapType st) default: /* relax */ break; - } + } + + SnapChanged (); /* EMIT SIGNAL */ } void @@ -2163,7 +2147,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) Glib::RefPtr::cast_dynamic(act)->set_active (true); } - nframes64_t foo; + framepos_t foo; bool in_track_canvas; if (!mouse_frame (foo, in_track_canvas)) { @@ -2243,7 +2227,8 @@ Editor::set_state (const XMLNode& node, int /*version*/) move (x, y); if (_session && (prop = node.property ("playhead"))) { - nframes64_t pos = atol (prop->value().c_str()); + framepos_t pos; + sscanf (prop->value().c_str(), "%" PRIi64, &pos); playhead_cursor->set_position (pos); } else { playhead_cursor->set_position (0); @@ -2259,6 +2244,8 @@ Editor::set_state (const XMLNode& node, int /*version*/) if ((prop = node.property ("zoom"))) { reset_zoom (PBD::atof (prop->value())); + } else { + reset_zoom (frames_per_unit); } if ((prop = node.property ("snap-to"))) { @@ -2277,7 +2264,7 @@ Editor::set_state (const XMLNode& node, int /*version*/) } if ((prop = node.property ("left-frame")) != 0){ - nframes64_t pos; + framepos_t pos; if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) { reset_x_origin (pos); } @@ -2305,21 +2292,9 @@ Editor::set_state (const XMLNode& node, int /*version*/) set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true); } - 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 ("show-measures"))) { bool yn = string_is_affirmative (prop->value()); - _show_measures = !yn; + _show_measures = yn; RefPtr act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility")); if (act) { RefPtr tact = RefPtr::cast_dynamic(act); @@ -2341,6 +2316,18 @@ 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"))) { RegionListSortType st; _regions->reset_sort_type ((RegionListSortType) string_2_enum (prop->value(), st), true); @@ -2383,6 +2370,15 @@ Editor::set_state (const XMLNode& node, int /*version*/) } } + if ((prop = node.property (X_("editor-list-page")))) { + the_notebook.set_current_page (atoi (prop->value ())); + } + + XMLNodeList children = node.children (); + for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { + selection->set_state (**i, Stateful::current_state_version); + _regions->set_state (**i); + } return 0; } @@ -2419,7 +2415,9 @@ Editor::get_state () snprintf(buf, sizeof(buf), "%d", yoff); geometry->add_property("y-off", string(buf)); snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&edit_pane)->gobj())); - geometry->add_property("edit_pane_pos", string(buf)); + geometry->add_property("edit-horizontal-pane-pos", string(buf)); + snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&editor_summary_pane)->gobj())); + geometry->add_property("edit-vertical-pane-pos", string(buf)); node->add_child_nocopy (*geometry); } @@ -2444,9 +2442,9 @@ Editor::get_state () 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", enum_2_string (_regions->sort_type ())); node->add_property ("mouse-mode", enum2str(mouse_mode)); @@ -2465,6 +2463,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); + + node->add_child_nocopy (selection->get_state ()); + node->add_child_nocopy (_regions->get_state ()); + return *node; } @@ -2495,7 +2499,7 @@ Editor::trackview_by_y_position (double y) * @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) +Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, int32_t direction, bool for_mark) { if (!_session || !event) { return; @@ -2513,7 +2517,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) +Editor::snap_to (framepos_t& start, int32_t direction, bool for_mark) { if (!_session || _snap_mode == SnapOff) { return; @@ -2523,17 +2527,17 @@ 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*/) +Editor::timecode_snap_to_internal (framepos_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 framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->frames_per_timecode_frame()); + framepos_t one_timecode_minute = (framepos_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()); + start = (framepos_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 = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); } break; @@ -2545,9 +2549,9 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool / 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; + start = (framepos_t) ceil ((double) start / one_timecode_second) * one_timecode_second; } else { - start = (nframes64_t) floor ((double) start / one_timecode_second) * one_timecode_second; + start = (framepos_t) floor ((double) start / one_timecode_second) * one_timecode_second; } if (_session->timecode_offset_negative()) @@ -2566,9 +2570,9 @@ Editor::timecode_snap_to_internal (nframes64_t& start, int32_t direction, bool / 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; + start = (framepos_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute; } else { - start = (nframes64_t) floor ((double) start / one_timecode_minute) * one_timecode_minute; + start = (framepos_t) floor ((double) start / one_timecode_minute) * one_timecode_minute; } if (_session->timecode_offset_negative()) { @@ -2584,13 +2588,13 @@ 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) +Editor::snap_to_internal (framepos_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; - nframes64_t presnap = start; - nframes64_t before; - nframes64_t after; + const framepos_t one_second = _session->frame_rate(); + const framepos_t one_minute = _session->frame_rate() * 60; + framepos_t presnap = start; + framepos_t before; + framepos_t after; switch (_snap_type) { case SnapToTimecodeFrame: @@ -2600,25 +2604,25 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) case SnapToCDFrame: if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) { - start = (nframes64_t) ceil ((double) start / (one_second / 75)) * (one_second / 75); + start = (framepos_t) ceil ((double) start / (one_second / 75)) * (one_second / 75); } else { - start = (nframes64_t) floor ((double) start / (one_second / 75)) * (one_second / 75); + start = (framepos_t) floor ((double) start / (one_second / 75)) * (one_second / 75); } break; case SnapToSeconds: if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) { - start = (nframes64_t) ceil ((double) start / one_second) * one_second; + start = (framepos_t) ceil ((double) start / one_second) * one_second; } else { - start = (nframes64_t) floor ((double) start / one_second) * one_second; + start = (framepos_t) floor ((double) start / one_second) * one_second; } break; case SnapToMinutes: if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) { - start = (nframes64_t) ceil ((double) start / one_minute) * one_minute; + start = (framepos_t) ceil ((double) start / one_minute) * one_minute; } else { - start = (nframes64_t) floor ((double) start / one_minute) * one_minute; + start = (framepos_t) floor ((double) start / one_minute) * one_minute; } break; @@ -2630,25 +2634,51 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) start = _session->tempo_map().round_to_beat (start, direction); break; - case SnapToAThirtysecondBeat: + case SnapToBeatDiv32: start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction); break; - - case SnapToASixteenthBeat: + case SnapToBeatDiv28: + start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction); + break; + case SnapToBeatDiv24: + start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction); + break; + case SnapToBeatDiv20: + start = _session->tempo_map().round_to_beat_subdivision (start, 20, direction); + break; + case SnapToBeatDiv16: start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction); break; - - case SnapToAEighthBeat: + 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 SnapToAQuarterBeat: + 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 SnapToAThirdBeat: + 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: if (for_mark) { @@ -2657,11 +2687,11 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) _session->locations()->marks_either_side (start, before, after); - if (before == max_frames) { + if (before == max_framepos) { start = after; - } else if (after == max_frames) { + } else if (after == max_framepos) { start = before; - } else if (before != max_frames && after != max_frames) { + } else if (before != max_framepos && after != max_framepos) { /* have before and after */ if ((start - before) < (after - start)) { start = before; @@ -2678,8 +2708,8 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) case SnapToRegionBoundary: if (!region_boundary_cache.empty()) { - vector::iterator prev = region_boundary_cache.end (); - vector::iterator next = region_boundary_cache.end (); + vector::iterator prev = region_boundary_cache.end (); + vector::iterator next = region_boundary_cache.end (); if (direction > 0) { next = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start); @@ -2692,8 +2722,8 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) prev--; } - nframes64_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev; - nframes64_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next; + framepos_t const p = (prev == region_boundary_cache.end()) ? region_boundary_cache.front () : *prev; + framepos_t const n = (next == region_boundary_cache.end()) ? region_boundary_cache.back () : *next; if (start > (p + n) / 2) { start = n; @@ -2785,22 +2815,22 @@ Editor::setup_toolbar () 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 (sigc::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 (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_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); @@ -2830,8 +2860,8 @@ Editor::setup_toolbar () /* Zoom */ - zoom_box.set_spacing (1); - zoom_box.set_border_width (0); + _zoom_box.set_spacing (1); + _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_MENU)))); @@ -2849,10 +2879,12 @@ Editor::setup_toolbar () set_popdown_strings (zoom_focus_selector, zoom_focus_strings, true); 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); - zoom_box.pack_start (zoom_out_full_button, false, false); + _zoom_box.pack_start (zoom_out_button, false, false); + _zoom_box.pack_start (zoom_in_button, false, false); + _zoom_box.pack_start (zoom_out_full_button, false, false); + _zoom_box.pack_start (zoom_focus_selector); + /* Track zoom buttons */ tav_expand_button.set_name ("TrackHeightButton"); tav_expand_button.set_size_request(-1,20); @@ -2864,18 +2896,20 @@ Editor::setup_toolbar () tav_shrink_button.add (*(manage (new Image (::get_icon("tav_shrink"))))); 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); - - track_zoom_box.pack_start (tav_shrink_button, false, false); - track_zoom_box.pack_start (tav_expand_button, false, false); - - HBox* zbc = manage (new HBox); - zbc->pack_start (zoom_focus_selector, PACK_SHRINK); - zoom_vbox.pack_start (*zbc, PACK_SHRINK); - zoom_vbox.pack_start (zoom_box, PACK_SHRINK); - zoom_vbox.pack_start (track_zoom_box, PACK_SHRINK); - + _zoom_box.pack_start (tav_shrink_button); + _zoom_box.pack_start (tav_expand_button); + + _zoom_tearoff = manage (new TearOff (_zoom_box)); + + _zoom_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_zoom_tearoff->tearoff_window())); + _zoom_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_zoom_tearoff->tearoff_window(), 0)); + _zoom_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &_zoom_tearoff->tearoff_window())); + _zoom_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &_zoom_tearoff->tearoff_window(), 0)); + snap_box.set_spacing (1); snap_box.set_border_width (2); @@ -2914,28 +2948,29 @@ 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 (sigc::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 (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)); + _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 (*_zoom_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); @@ -2955,14 +2990,13 @@ void Editor::setup_tooltips () { ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects")); - ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges")); - ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation")); + ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Region Gain")); 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_timefx_button, _("Stretch/Shrink Regions and MIDI Notes")); 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 (*_group_tabs, _("Groups: click to (de)activate\nContext-click for other 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")); @@ -2976,6 +3010,7 @@ Editor::setup_tooltips () 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")); + ARDOUR_UI::instance()->set_tip (edit_mode_selector, _("Edit Mode")); } void @@ -3010,7 +3045,7 @@ Editor::setup_midi_toolbar () int Editor::convert_drop_to_paths ( - vector& paths, + vector& paths, const RefPtr& /*context*/, gint /*x*/, gint /*y*/, @@ -3021,8 +3056,8 @@ Editor::convert_drop_to_paths ( if (_session == 0) { return -1; } - - vector uris = data.get_uris(); + + vector uris = data.get_uris(); if (uris.empty()) { @@ -3040,7 +3075,7 @@ Editor::convert_drop_to_paths ( THERE MAY BE NO NULL TERMINATING CHAR!!! */ - ustring txt = data.get_text(); + string txt = data.get_text(); const char* p; const char* q; @@ -3068,7 +3103,7 @@ Editor::convert_drop_to_paths ( if (q > p) { - uris.push_back (ustring (p, q - p + 1)); + uris.push_back (string (p, q - p + 1)); } } } @@ -3084,18 +3119,18 @@ Editor::convert_drop_to_paths ( } } - for (vector::iterator i = uris.begin(); i != uris.end(); ++i) { + for (vector::iterator i = uris.begin(); i != uris.end(); ++i) { if ((*i).substr (0,7) == "file://") { - ustring p = *i; + string p = *i; PBD::url_decode (p); // scan forward past three slashes - ustring::size_type slashcnt = 0; - ustring::size_type n = 0; - ustring::iterator x = p.begin(); + string::size_type slashcnt = 0; + string::size_type n = 0; + string::iterator x = p.begin(); while (slashcnt < 3 && x != p.end()) { if ((*x) == '/') { @@ -3130,7 +3165,7 @@ 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; } @@ -3224,20 +3259,16 @@ Editor::duplicate_dialog (bool with_dialog) } } - RegionSelection rs; - get_regions_for_action (rs); - - if (mouse_mode != MouseRange) { + RegionSelection rs = get_regions_from_selection_and_entered (); - if (rs.empty()) { - return; - } + if (mouse_mode != MouseRange && rs.empty()) { + return; } 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; @@ -3322,7 +3353,7 @@ Editor::clamp_verbose_cursor_y (double y) } void -Editor::show_verbose_canvas_cursor_with (const string & txt) +Editor::show_verbose_canvas_cursor_with (const string & txt, int32_t xoffset, int32_t yoffset) { verbose_canvas_cursor->property_text() = txt.c_str(); @@ -3332,6 +3363,9 @@ Editor::show_verbose_canvas_cursor_with (const string & txt) track_canvas->get_pointer (x, y); track_canvas->window_to_world (x, y, wx, wy); + wx += xoffset; + wy += yoffset; + /* 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); @@ -3383,22 +3417,7 @@ Editor::cycle_edit_mode () void Editor::edit_mode_selection_done () { - if (_session == 0) { - return; - } - - string choice = edit_mode_selector.get_active_text(); - EditMode mode = Slide; - - if (choice == _("Splice Edit")) { - mode = Splice; - } else if (choice == _("Slide Edit")) { - mode = Slide; - } else if (choice == _("Lock Edit")) { - mode = Lock; - } - - Config->set_edit_mode (mode); + Config->set_edit_mode (string_to_edit_mode (edit_mode_selector.get_active_text ())); } void @@ -3407,16 +3426,36 @@ 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/20")) { + snaptype = SnapToBeatDiv20; + } 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")) { @@ -3597,7 +3636,14 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) char buf[32]; XMLNode* node = ARDOUR_UI::instance()->editor_settings(); int width, height; - static int32_t done; + + enum Pane { + Horizontal = 0x1, + Vertical = 0x2 + }; + + static Pane done; + XMLNode* geometry; width = default_width; @@ -3605,15 +3651,11 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) if ((geometry = find_named_node (*node, "geometry")) != 0) { - if ((prop = geometry->property ("x_size")) == 0) { - prop = geometry->property ("x-size"); - } + prop = geometry->property ("x-size"); if (prop) { width = atoi (prop->value()); } - if ((prop = geometry->property ("y_size")) == 0) { - prop = geometry->property ("y-size"); - } + prop = geometry->property ("y-size"); if (prop) { height = atoi (prop->value()); } @@ -3621,11 +3663,11 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) if (which == static_cast (&edit_pane)) { - if (done) { + if (done & Horizontal) { return; } - if (!geometry || (prop = geometry->property ("edit-pane-pos")) == 0) { + if (!geometry || (prop = geometry->property ("edit-horizontal-pane-pos")) == 0) { /* initial allocation is 90% to canvas, 10% to notebook */ pos = (int) floor (alloc.get_width() * 0.90f); snprintf (buf, sizeof(buf), "%d", pos); @@ -3633,20 +3675,40 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) pos = atoi (prop->value()); } - if ((done = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) { + if (GTK_WIDGET(edit_pane.gobj())->allocation.width > pos) { edit_pane.set_position (pos); - pre_maximal_pane_position = pos; + pre_maximal_horizontal_pane_position = pos; + } + + done = (Pane) (done | Horizontal); + + } else if (which == static_cast (&editor_summary_pane)) { + + if (done & Vertical) { + return; + } + + if (!geometry || (prop = geometry->property ("edit-vertical-pane-pos")) == 0) { + /* initial allocation is 90% to canvas, 10% to summary */ + pos = (int) floor (alloc.get_height() * 0.90f); + snprintf (buf, sizeof(buf), "%d", pos); + } else { + pos = atoi (prop->value()); } + + if (GTK_WIDGET(editor_summary_pane.gobj())->allocation.height > pos) { + editor_summary_pane.set_position (pos); + pre_maximal_vertical_pane_position = pos; + } + + done = (Pane) (done | Vertical); } } 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); } } @@ -3654,7 +3716,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); } @@ -3697,6 +3758,29 @@ Editor::set_follow_playhead (bool yn) } } +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) { @@ -3749,7 +3833,7 @@ Editor::playlist_selector () const } Evoral::MusicalTime -Editor::get_grid_type_as_beats (bool& success, nframes64_t position) +Editor::get_grid_type_as_beats (bool& success, framepos_t position) { success = true; @@ -3758,25 +3842,51 @@ 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 SnapToBeatDiv20: + return 1.0/20.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) { @@ -3802,10 +3912,10 @@ Editor::get_grid_type_as_beats (bool& success, nframes64_t position) return 0.0; } -nframes64_t -Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next) +framecnt_t +Editor::get_nudge_distance (framepos_t pos, framecnt_t& next) { - nframes64_t ret; + framecnt_t ret; ret = nudge_clock.current_duration (pos); next = ret + 1; /* XXXX fix me */ @@ -3813,19 +3923,10 @@ Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next) return ret; } -void -Editor::end_location_changed (Location* location) -{ - ENSURE_GUI_THREAD (*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."), @@ -3859,7 +3960,7 @@ Editor::playlist_deletion_dialog (boost::shared_ptr pl) } bool -Editor::audio_region_selection_covers (nframes64_t where) +Editor::audio_region_selection_covers (framepos_t where) { for (RegionSelection::iterator a = selection->regions.begin(); a != selection->regions.end(); ++a) { if ((*a)->region()->covers (where)) { @@ -3934,10 +4035,8 @@ Editor::control_layout_scroll (GdkEventScroll* ev) } void -Editor::session_state_saved (string snap_name) +Editor::session_state_saved (string) { - ENSURE_GUI_THREAD (*this, &Editor::session_state_saved, snap_name); - update_title (); _snapshots->redisplay (); } @@ -3945,42 +4044,69 @@ Editor::session_state_saved (string snap_name) 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); + _zoom_tearoff->set_visible (false); - pre_maximal_pane_position = edit_pane.get_position(); - pre_maximal_editor_width = this->get_width(); + pre_maximal_horizontal_pane_position = edit_pane.get_position (); + pre_maximal_vertical_pane_position = editor_summary_pane.get_position (); + pre_maximal_editor_width = this->get_width (); + pre_maximal_editor_height = this->get_height (); - if(post_maximal_pane_position == 0) { - post_maximal_pane_position = edit_pane.get_width(); + if (post_maximal_horizontal_pane_position == 0) { + post_maximal_horizontal_pane_position = edit_pane.get_width(); } - fullscreen(); + if (post_maximal_vertical_pane_position == 0) { + post_maximal_vertical_pane_position = editor_summary_pane.get_height(); + } + + fullscreen (); - if(post_maximal_editor_width) { - edit_pane.set_position (post_maximal_pane_position - + if (post_maximal_editor_width) { + edit_pane.set_position (post_maximal_horizontal_pane_position - abs(post_maximal_editor_width - pre_maximal_editor_width)); } else { - edit_pane.set_position (post_maximal_pane_position); + edit_pane.set_position (post_maximal_horizontal_pane_position); + } + + if (post_maximal_editor_height) { + editor_summary_pane.set_position (post_maximal_vertical_pane_position - + abs(post_maximal_editor_height - pre_maximal_editor_height)); + } else { + editor_summary_pane.set_position (post_maximal_vertical_pane_position); + } + + if (Config->get_keep_tearoffs()) { + _mouse_mode_tearoff->set_visible (true); + _tools_tearoff->set_visible (true); + _zoom_tearoff->set_visible (true); } } void Editor::restore_editing_space () { - // user changed width of pane during fullscreen + // user changed width/height of panes during fullscreen - if(post_maximal_pane_position != edit_pane.get_position()) { - post_maximal_pane_position = edit_pane.get_position(); + if (post_maximal_horizontal_pane_position != edit_pane.get_position()) { + post_maximal_horizontal_pane_position = edit_pane.get_position(); } + if (post_maximal_vertical_pane_position != editor_summary_pane.get_position()) { + post_maximal_vertical_pane_position = editor_summary_pane.get_position(); + } + unfullscreen(); - mouse_mode_tearoff->set_visible (true); - tools_tearoff->set_visible (true); + _mouse_mode_tearoff->set_visible (true); + _tools_tearoff->set_visible (true); + _zoom_tearoff->set_visible (true); post_maximal_editor_width = this->get_width(); + post_maximal_editor_height = this->get_height(); - edit_pane.set_position (pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width)); + edit_pane.set_position (pre_maximal_horizontal_pane_position + abs(this->get_width() - pre_maximal_editor_width)); + editor_summary_pane.set_position (pre_maximal_vertical_pane_position + abs(this->get_height() - pre_maximal_editor_height)); } /** @@ -4065,7 +4191,7 @@ Editor::on_key_release_event (GdkEventKey* ev) * @param frame New x origin. */ void -Editor::reset_x_origin (nframes64_t frame) +Editor::reset_x_origin (framepos_t frame) { queue_visual_change (frame); } @@ -4083,9 +4209,8 @@ Editor::reset_zoom (double fpu) } void -Editor::reposition_and_zoom (nframes64_t frame, double fpu) +Editor::reposition_and_zoom (framepos_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); @@ -4119,10 +4244,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 @@ -4132,10 +4258,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 @@ -4200,7 +4327,7 @@ Editor::set_frames_per_unit (double fpu) of frames into an 800 pixel wide space. */ - if (max_frames / fpu < 800.0) { + if (max_framepos / fpu < 800.0) { return; } @@ -4214,11 +4341,9 @@ 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); + framepos_t frames = (framepos_t) floor (frames_per_unit * _canvas_width); if (frames_per_unit != zoom_range_clock.current_duration()) { zoom_range_clock.set (frames); @@ -4230,15 +4355,8 @@ Editor::post_zoom () } } - leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - ZoomChanged (); /* EMIT_SIGNAL */ - 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) { @@ -4252,20 +4370,10 @@ Editor::post_zoom () } void -Editor::queue_visual_change (nframes64_t where) +Editor::queue_visual_change (framepos_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 (_session && (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 (); } @@ -4307,7 +4415,19 @@ Editor::idle_visual_changer () VisualChange::Type p = pending_visual_change.pending; pending_visual_change.pending = (VisualChange::Type) 0; - double last_time_origin = horizontal_adjustment.get_value(); + double const last_time_origin = horizontal_position (); + + if (p & VisualChange::TimeOrigin) { + /* This is a bit of a hack, but set_frames_per_unit + below will (if called) end up with the + CrossfadeViews looking at Editor::leftmost_frame, + and if we're changing origin and zoom in the same + operation it will be the wrong value unless we + update it here. + */ + + leftmost_frame = pending_visual_change.time_origin; + } if (p & VisualChange::ZoomLevel) { set_frames_per_unit (pending_visual_change.frames_per_unit); @@ -4318,13 +4438,13 @@ 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); } - if (last_time_origin == horizontal_adjustment.get_value()) { + if (last_time_origin == horizontal_position ()) { /* changed signal not emitted */ update_fixed_rulers (); redisplay_tempo (true); @@ -4332,7 +4452,6 @@ Editor::idle_visual_changer () _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 */ } @@ -4355,11 +4474,11 @@ Editor::sort_track_selection (TrackViewList* sel) } } -nframes64_t +framepos_t Editor::get_preferred_edit_position (bool ignore_playhead) { bool ignored; - nframes64_t where = 0; + framepos_t where = 0; EditPoint ep = _edit_point; if (entered_marker) { @@ -4404,7 +4523,7 @@ Editor::get_preferred_edit_position (bool ignore_playhead) } void -Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd) +Editor::set_loop_range (framepos_t start, framepos_t end, string cmd) { if (!_session) return; @@ -4413,7 +4532,7 @@ Editor::set_loop_range (nframes64_t start, nframes64_t end, string cmd) Location* tll; if ((tll = transport_loop_location()) == 0) { - Location* loc = new Location (start, end, _("Loop"), Location::IsAutoLoop); + Location* loc = new Location (*_session, start, end, _("Loop"), Location::IsAutoLoop); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (loc, true); _session->set_auto_loop_location (loc); @@ -4431,7 +4550,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) +Editor::set_punch_range (framepos_t start, framepos_t end, string cmd) { if (!_session) return; @@ -4440,7 +4559,7 @@ Editor::set_punch_range (nframes64_t start, nframes64_t end, string cmd) Location* tpl; if ((tpl = transport_punch_location()) == 0) { - Location* loc = new Location (start, end, _("Loop"), Location::IsAutoPunch); + Location* loc = new Location (*_session, start, end, _("Loop"), Location::IsAutoPunch); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (loc, true); _session->set_auto_loop_location (loc); @@ -4464,7 +4583,7 @@ 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 TrackViewList& ts) const +Editor::get_regions_at (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const { const TrackViewList* tracks; @@ -4477,13 +4596,13 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewL 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())); + (framepos_t) floor ( (double)where * tr->speed())); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { RegionView* rv = rtv->view()->find_view (*i); @@ -4499,7 +4618,7 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackViewL } void -Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackViewList& ts) const +Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackViewList& ts) const { const TrackViewList* tracks; @@ -4512,13 +4631,13 @@ Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackVi 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); + (framepos_t) floor ( (double)where * tr->speed()), max_framepos); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { @@ -4535,47 +4654,74 @@ Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackVi } } -/** Find all regions which are either: - * - selected or - * - the entered_regionview (if allow_entered == true) or - * - under the preferred edit position AND on a selected track, or on a track - * which is in the same active edit-enable route group as a selected region (if allow_edit_position == true) +/** Get regions using the following conditions: + * 1. If the edit point is `mouse': + * if the mouse is over a selected region, or no region, return all selected regions. + * if the mouse is over an unselected region, return just that region. + * 2. For all other edit points: + * return the selected regions AND those that are both under the edit position + * AND on a selected track, or on a track which is in the same active edit-enabled route group + * as a selected region. + * + * The rationale here is that the mouse edit point is special in that its position describes + * both a time and a track; the other edit modes only describe a time. + * * @param rs Returned region list. - * @param allow_entered true to include the entered_regionview in the list. */ -void -Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered, bool allow_edit_position) -{ - /* Start with selected regions */ - rs = selection->regions; - /* Add the entered_regionview, if requested */ - if (allow_entered && entered_regionview) { - rs.add (entered_regionview); +RegionSelection +Editor::get_regions_from_selection_and_edit_point () +{ + if (_edit_point == EditAtMouse) { + if (entered_regionview == 0 || selection->regions.contains (entered_regionview)) { + return selection->regions; + } else { + RegionSelection rs; + rs.add (entered_regionview); + return rs; + } } - if (allow_edit_position) { + /* We're using the edit point, but its not EditAtMouse */ - TrackViewList tracks = selection->tracks; + /* Start with selected regions */ + RegionSelection rs = selection->regions; - /* 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) { + TrackViewList tracks = selection->tracks; - 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())); - } - + /* 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->is_active() && g->is_edit()) { + tracks.add (axis_views_from_routes (g->route_list())); } + + } + + if (!tracks.empty()) { + /* now find regions that are at the edit position on those tracks */ + framepos_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); - } + return rs; +} + + +RegionSelection +Editor::get_regions_from_selection_and_entered () +{ + RegionSelection rs = selection->regions; + + if (rs.empty() && entered_regionview) { + rs.add (entered_regionview); } + + return rs; } void @@ -4590,14 +4736,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); } @@ -4623,16 +4769,6 @@ Editor::show_rhythm_ferret () rhythm_ferret->present (); } -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]->show (); -} - void Editor::first_idle () { @@ -4640,7 +4776,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); @@ -4660,8 +4796,8 @@ Editor::first_idle () _have_idled = true; } -static gboolean -_idle_resizer (gpointer arg) +gboolean +Editor::_idle_resize (gpointer arg) { return ((Editor*)arg)->idle_resize (); } @@ -4670,7 +4806,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; } @@ -4695,8 +4831,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; } } @@ -4716,6 +4852,7 @@ Editor::idle_resize () } } + _pending_resize_amount = 0; flush_canvas (); _group_tabs->set_dirty (); resize_idle_id = -1; @@ -4743,12 +4880,6 @@ Editor::region_view_added (RegionView *) _summary->set_dirty (); } -void -Editor::streamview_height_changed () -{ - _summary->set_dirty (); -} - TimeAxisView* Editor::axis_view_from_route (boost::shared_ptr r) const { @@ -4792,7 +4923,7 @@ 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; } @@ -4812,7 +4943,6 @@ Editor::handle_new_route (RouteList& routes) rtv->effective_gain_display (); 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); @@ -4835,14 +4965,22 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) } ENSURE_GUI_THREAD (*this, &Editor::timeaxisview_deleted, tv); - + RouteTimeAxisView* rtav = dynamic_cast (tv); + _routes->route_removed (tv); if (tv == entered_track) { entered_track = 0; } - + + TimeAxisView::Children c = tv->get_child_list (); + for (TimeAxisView::Children::const_iterator i = c.begin(); i != c.end(); ++i) { + if (entered_track == i->get()) { + entered_track = 0; + } + } + /* remove it from the list of track views */ TrackViewList::iterator i; @@ -4854,7 +4992,6 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) /* update whatever the current mixer strip is displaying, if revelant */ boost::shared_ptr route; - RouteTimeAxisView* rtav = dynamic_cast (tv); if (rtav) { route = rtav->route (); @@ -4886,16 +5023,16 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) } 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 @@ -4917,12 +5054,13 @@ Editor::foreach_time_axis_view (sigc::slot theslot) } } +/** Find a RouteTimeAxisView by the ID of its route */ RouteTimeAxisView* -Editor::get_route_view_by_id (PBD::ID& id) +Editor::get_route_view_by_route_id (PBD::ID& id) const { RouteTimeAxisView* v; - for(TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { if((v = dynamic_cast(*i)) != 0) { if(v->route()->id() == id) { return v; @@ -4969,9 +5107,9 @@ 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 @@ -4986,6 +5124,22 @@ Editor::hide_region_from_region_list () _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::step_edit_status_change (bool yn) +{ + if (yn) { + start_step_editing (); + } else { + stop_step_editing (); + } +} + void Editor::start_step_editing () { @@ -5011,28 +5165,70 @@ Editor::check_step_edit () return true; // do it again, till we stop } -void -Editor::horizontal_scroll_left () +bool +Editor::horizontal_scroll_left_press () { + ++_scroll_callbacks; + + if (_scroll_connection.connected() && _scroll_callbacks < 5) { + /* delay the first auto-repeat */ + return true; + } + double x = leftmost_position() - current_page_frames() / 5; if (x < 0) { x = 0; } reset_x_origin (x); + + /* do hacky auto-repeat */ + if (!_scroll_connection.connected ()) { + _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press), 100); + _scroll_callbacks = 0; + } + + return true; } void -Editor::horizontal_scroll_right () +Editor::horizontal_scroll_left_release () { + _scroll_connection.disconnect (); +} + +bool +Editor::horizontal_scroll_right_press () +{ + ++_scroll_callbacks; + + if (_scroll_connection.connected() && _scroll_callbacks < 5) { + /* delay the first auto-repeat */ + return true; + } + reset_x_origin (leftmost_position() + current_page_frames() / 5); + + /* do hacky auto-repeat */ + if (!_scroll_connection.connected ()) { + _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press), 100); + _scroll_callbacks = 0; + } + + return true; +} + +void +Editor::horizontal_scroll_right_release () +{ + _scroll_connection.disconnect (); } /** 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; + framepos_t const frame = playhead_cursor->current_frame; if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) { @@ -5048,7 +5244,7 @@ Editor::reset_x_origin_to_follow_playhead () if (frame < leftmost_frame) { /* moving left */ - nframes64_t l = 0; + framepos_t l = 0; if (_session->transport_rolling()) { /* rolling; end up with the playhead at the right of the page */ l = frame - current_page_frames (); @@ -5102,13 +5298,14 @@ Editor::super_rapid_screen_update () /* PLAYHEAD AND VIEWPORT */ - nframes64_t const frame = _session->audible_frame(); + framepos_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. */ @@ -5121,33 +5318,33 @@ Editor::super_rapid_screen_update () playhead_cursor->set_position (frame); } -#undef CONTINUOUS_SCROLL -#ifndef CONTINUOUS_SCROLL + if (!_stationary_playhead) { - if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0) { - reset_x_origin_to_follow_playhead (); - } + if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0) { + reset_x_origin_to_follow_playhead (); + } -#else // CONTINUOUS_SCROLL - - /* don't do continuous scroll till the new position is in the rightmost quarter of the - editor canvas - */ - - 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; - horizontal_adjustment.set_value (current); - -#endif // CONTINUOUS_SCROLL + } 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 + } } } @@ -5235,3 +5432,67 @@ Editor::show_editor_list (bool yn) the_notebook.hide(); } } + +void +Editor::change_region_layering_order () +{ + framepos_t const position = get_preferred_edit_position (); + + if (!clicked_routeview) { + if (layering_order_editor) { + layering_order_editor->hide (); + } + return; + } + + boost::shared_ptr track = boost::dynamic_pointer_cast (clicked_routeview->route()); + + if (!track) { + return; + } + + boost::shared_ptr pl = track->playlist(); + + if (!pl) { + return; + } + + if (layering_order_editor == 0) { + layering_order_editor = new RegionLayeringOrderEditor(*this); + } + + layering_order_editor->set_context (clicked_routeview->name(), _session, pl, position); + layering_order_editor->maybe_present (); +} + +void +Editor::update_region_layering_order_editor () +{ + if (layering_order_editor && layering_order_editor->is_visible ()) { + change_region_layering_order (); + } +} + +void +Editor::setup_fade_images () +{ + _fade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-in-linear"))); + _fade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-in-short-cut"))); + _fade_in_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-in-slow-cut"))); + _fade_in_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-in-fast-cut"))); + _fade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-in-long-cut"))); + + _fade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("crossfade-out-linear"))); + _fade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("crossfade-out-short-cut"))); + _fade_out_images[FadeLogB] = new Gtk::Image (get_icon_path (X_("crossfade-out-slow-cut"))); + _fade_out_images[FadeLogA] = new Gtk::Image (get_icon_path (X_("crossfade-out-fast-cut"))); + _fade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("crossfade-out-long-cut"))); +} + + +/** @return Gtk::manage()d menu item for a given action from `editor_actions' */ +Gtk::MenuItem& +Editor::action_menu_item (std::string const & name) +{ + return *manage (editor_actions->get_action(name)->create_menu_item ()); +}