X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=210f6350befe8e38c7ab4f938a0f15c9987b69e8;hb=631629b8e7d3ca826fc55901653c1c795a8a5083;hp=d31cb34db609152c5a7732992c76325aece35e28;hpb=2161c5d5070008bc0d42aa6022f357cb9e2d2296;p=ardour.git diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index d31cb34db6..210f6350be 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -57,12 +57,10 @@ #include #include "gtkmm2ext/bindings.h" -#include "gtkmm2ext/grouped_buttons.h" #include "gtkmm2ext/gtk_ui.h" -#include +#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" -#include "gtkmm2ext/choice.h" #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "ardour/analysis_graph.h" @@ -83,6 +81,10 @@ #include "canvas/debug.h" #include "canvas/text.h" +#include "widgets/ardour_spacer.h" +#include "widgets/eventboxext.h" +#include "widgets/tooltips.h" + #include "control_protocol/control_protocol.h" #include "actions.h" @@ -96,6 +98,7 @@ #include "crossfade_edit.h" #include "debug.h" #include "editing.h" +#include "editing_convert.h" #include "editor.h" #include "editor_cursors.h" #include "editor_drag.h" @@ -106,12 +109,12 @@ #include "editor_routes.h" #include "editor_snapshots.h" #include "editor_summary.h" +#include "enums_convert.h" #include "export_report.h" #include "global_port_matrix.h" #include "gui_object.h" #include "gui_thread.h" #include "keyboard.h" -#include "keyeditor.h" #include "luainstance.h" #include "marker.h" #include "midi_region_view.h" @@ -126,22 +129,24 @@ #include "region_layering_order_editor.h" #include "rgb_macros.h" #include "rhythm_ferret.h" +#include "route_sorter.h" #include "selection.h" #include "simple_progress_dialog.h" #include "sfdb_ui.h" #include "tempo_lines.h" #include "time_axis_view.h" +#include "time_info_box.h" #include "timers.h" -#include "tooltips.h" #include "ui_config.h" #include "utils.h" #include "vca_time_axis.h" #include "verbose_cursor.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ArdourWidgets; using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; @@ -241,6 +246,7 @@ Editor::Editor () , editor_mixer_strip_width (Wide) , constructed (false) , _playlist_selector (0) + , _time_info_box (0) , no_save_visual (false) , leftmost_frame (0) , samples_per_pixel (2048) @@ -296,9 +302,11 @@ Editor::Editor () , minsec_mark_interval (0) , minsec_mark_modulo (0) , minsec_nmarks (0) + , timecode_ruler_scale (timecode_show_many_hours) , timecode_mark_modulo (0) , timecode_nmarks (0) , _samples_ruler_interval (0) + , bbt_ruler_scale (bbt_show_many) , bbt_bars (0) , bbt_nmarks (0) , bbt_bar_helper_on (0) @@ -339,11 +347,13 @@ Editor::Editor () , _full_canvas_height (0) , edit_controls_left_menu (0) , edit_controls_right_menu (0) - , last_update_frame (0) + , visual_change_queued(false) + , _last_update_time (0) + , _err_screen_engine (0) , cut_buffer_start (0) , cut_buffer_length (0) , button_bindings (0) - , last_paste_pos (0) + , last_paste_pos (-1) , paste_count (0) , sfbrowser (0) , current_interthread_info (0) @@ -383,14 +393,13 @@ Editor::Editor () , _visible_track_count (-1) , toolbar_selection_clock_table (2,3) , automation_mode_button (_("mode")) - , _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10))) - , selection (new Selection (this)) - , cut_buffer (new Selection (this)) + , selection (new Selection (this, true)) + , cut_buffer (new Selection (this, false)) , _selection_memento (new SelectionMemento()) , _all_region_actions_sensitized (false) , _ignore_region_action (false) , _last_region_menu_was_main (false) - , _ignore_follow_edits (false) + , _track_selection_change_without_scroll (false) , cd_marker_bar_drag_rect (0) , range_bar_drag_rect (0) , transport_bar_drag_rect (0) @@ -485,7 +494,7 @@ Editor::Editor () location_loop_color = UIConfiguration::instance().color ("location loop"); location_punch_color = UIConfiguration::instance().color ("location punch"); - timebar_height = std::max(12., ceil (15. * ARDOUR_UI::ui_scale)); + timebar_height = std::max (12., ceil (15. * UIConfiguration::instance().get_ui_scale())); TimeAxisView::setup_sizes (); ArdourMarker::setup_sizes (timebar_height); @@ -571,12 +580,11 @@ Editor::Editor () initialize_canvas (); - CairoWidget::set_focus_handler (sigc::mem_fun (*this, &Editor::reset_focus)); + CairoWidget::set_focus_handler (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::reset_focus)); _summary = new EditorSummary (this); selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed)); - selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed)); editor_regions_selection_changed_connection = selection->RegionsChanged.connect (sigc::mem_fun(*this, &Editor::region_selection_changed)); @@ -637,11 +645,14 @@ Editor::Editor () bottom_hbox.set_border_width (2); bottom_hbox.set_spacing (3); + PresentationInfo::Change.connect (*this, MISSING_INVALIDATOR, boost::bind (&Editor::presentation_info_changed, this, _1), gui_context()); + _route_groups = new EditorRouteGroups (this); _routes = new EditorRoutes (this); _regions = new EditorRegions (this); _snapshots = new EditorSnapshots (this); _locations = new EditorLocations (this); + _time_info_box = new TimeInfoBox ("EditorTimeInfo", true); /* these are static location signals */ @@ -667,41 +678,29 @@ Editor::Editor () /* Pick up some settings we need to cache, early */ XMLNode* settings = ARDOUR_UI::instance()->editor_settings(); - XMLProperty* prop; - if (settings && (prop = settings->property ("notebook-shrunk"))) { - _notebook_shrunk = string_is_affirmative (prop->value ()); + if (settings) { + settings->get_property ("notebook-shrunk", _notebook_shrunk); } + editor_summary_pane.set_check_divider_position (true); editor_summary_pane.add (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_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), LEFT))); - summary_arrows_left_left->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release)); + Button* summary_arrow_left = manage (new Button); + summary_arrow_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE))); + summary_arrow_left->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), LEFT))); + summary_arrow_left->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_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_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), RIGHT))); - summary_arrows_left_right->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release)); + Button* summary_arrow_right = manage (new Button); + summary_arrow_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE))); + summary_arrow_right->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), RIGHT))); + summary_arrow_right->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_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_up = manage (new Button); - summary_arrows_right_up->add (*manage (new Arrow (ARROW_UP, SHADOW_NONE))); - summary_arrows_right_up->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), UP))); - summary_arrows_right_up->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release)); - - Button* summary_arrows_right_down = manage (new Button); - summary_arrows_right_down->add (*manage (new Arrow (ARROW_DOWN, SHADOW_NONE))); - summary_arrows_right_down->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), DOWN))); - summary_arrows_right_down->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release)); + summary_arrows_left->pack_start (*summary_arrow_left); VBox* summary_arrows_right = manage (new VBox); - summary_arrows_right->pack_start (*summary_arrows_right_up); - summary_arrows_right->pack_start (*summary_arrows_right_down); + summary_arrows_right->pack_start (*summary_arrow_right); Frame* summary_frame = manage (new Frame); summary_frame->set_shadow_type (Gtk::SHADOW_ETCHED_IN); @@ -717,44 +716,51 @@ Editor::Editor () editor_summary_pane.add (_summary_hbox); } + edit_pane.set_check_divider_position (true); edit_pane.add (editor_summary_pane); if (!ARDOUR::Profile->get_trx()) { - edit_pane.add (_the_notebook); + _editor_list_vbox.pack_start (*_time_info_box, false, false, 0); + _editor_list_vbox.pack_start (_the_notebook); + edit_pane.add (_editor_list_vbox); + edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */ } edit_pane.set_drag_cursor (*_cursors->expand_left_right); - edit_pane.set_child_minsize (_the_notebook, 30); /* rough guess at width of notebook tabs */ editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down); float fract; + if (!settings || !settings->get_property ("edit-horizontal-pane-pos", fract) || fract > 1.0) { + /* initial allocation is 90% to canvas, 10% to notebook */ + fract = 0.90; + } + edit_pane.set_divider (0, fract); - { - LocaleGuard lg; + if (!settings || !settings->get_property ("edit-vertical-pane-pos", fract) || fract > 1.0) { + /* initial allocation is 90% to canvas, 10% to summary */ + fract = 0.90; + } + editor_summary_pane.set_divider (0, fract); - if (!settings || ((prop = settings->property ("edit-horizontal-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { - /* initial allocation is 90% to canvas, 10% to notebook */ - edit_pane.set_divider (0, 0.90); - } else { - edit_pane.set_divider (0, fract); - } + global_vpacker.set_spacing (2); + global_vpacker.set_border_width (0); - if (!settings || ((prop = settings->property ("edit-vertical-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { - /* initial allocation is 90% to canvas, 10% to summary */ - editor_summary_pane.set_divider (0, 0.90); - } else { + //the next three EventBoxes provide the ability for their child widgets to have a background color. That is all. - editor_summary_pane.set_divider (0, fract); - } - } + Gtk::EventBox* ebox = manage (new Gtk::EventBox); //a themeable box + ebox->set_name("EditorWindow"); + ebox->add (toolbar_hbox); - top_hbox.pack_start (toolbar_frame); + Gtk::EventBox* epane_box = manage (new EventBoxExt); //a themeable box + epane_box->set_name("EditorWindow"); + epane_box->add (edit_pane); - HBox *hbox = manage (new HBox); - hbox->pack_start (edit_pane, true, true); + Gtk::EventBox* epane_box2 = manage (new EventBoxExt); //a themeable box + epane_box2->set_name("EditorWindow"); + epane_box2->add (global_vpacker); - global_vpacker.pack_start (top_hbox, false, false); - global_vpacker.pack_start (*hbox, true, true); - global_hpacker.pack_start (global_vpacker, true, true); + global_vpacker.pack_start (*ebox, false, false); + global_vpacker.pack_start (*epane_box, true, true); + global_hpacker.pack_start (*epane_box2, true, true); /* need to show the "contents" widget so that notebook will show if tab is switched to */ @@ -827,20 +833,18 @@ Editor::Editor () _last_region_menu_was_main = false; _popup_region_menu_item = 0; - _ignore_follow_edits = false; - _show_marker_lines = false; - /* Button bindings */ + /* Button bindings */ button_bindings = new Bindings ("editor-mouse"); XMLNode* node = button_settings(); - if (node) { - for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) { - button_bindings->load_operation (**i); - } - } + if (node) { + for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) { + button_bindings->load_operation (**i); + } + } constructed = true; @@ -850,20 +854,18 @@ Editor::Editor () setup_fade_images (); - LuaInstance::instance(); // instantiate - LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &Editor::set_script_action_name)); - instant_save (); } Editor::~Editor() { - delete button_bindings; + delete button_bindings; delete _routes; delete _route_groups; delete _track_canvas_viewport; delete _drags; delete nudge_clock; + delete _verbose_cursor; delete quantize_dialog; delete _summary; delete _group_tabs; @@ -871,10 +873,22 @@ Editor::~Editor() delete _snapshots; delete _locations; delete _playlist_selector; + delete _time_info_box; + delete selection; + delete cut_buffer; + delete _cursors; + + LuaInstance::destroy_instance (); for (list::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) { delete *i; } + for (std::map::const_iterator i = _xfade_in_images.begin(); i != _xfade_in_images.end (); ++i) { + delete i->second; + } + for (std::map::const_iterator i = _xfade_out_images.begin(); i != _xfade_out_images.end (); ++i) { + delete i->second; + } } XMLNode* @@ -1010,42 +1024,9 @@ Editor::control_unselect () } void -Editor::control_select (PresentationInfo::global_order_t global_order, Selection::Operation op) +Editor::control_select (boost::shared_ptr s, Selection::Operation op) { - /* handles the (static) signal from the ControlProtocol class that - * requests setting the selected track to a given RID - */ - - if (!_session) { - return; - } - - PresentationInfo::Flag select_flags; - - if (global_order & ~0xffffffff) { - /* some flags are set, so the PresentationInfo constructor - * will use them - */ - select_flags = PresentationInfo::Flag (0); - } else { - /* no type flags set in the global order ID, so assume caller - * wants to select a Route - */ - select_flags = PresentationInfo::Route; - } - - PresentationInfo pi (global_order, select_flags); - boost::shared_ptr s = _session->get_remote_nth_stripable (pi.order(), pi.flags()); - - /* selected object may not be a Route */ - - boost::shared_ptr r = boost::dynamic_pointer_cast (s); - - if (!r) { - return; - } - - TimeAxisView* tav = axis_view_from_route (r); + TimeAxisView* tav = time_axis_view_from_stripable (s); if (tav) { switch (op) { @@ -1151,7 +1132,7 @@ Editor::deferred_control_scroll (framepos_t /*target*/) } void -Editor::access_action (std::string action_group, std::string action_item) +Editor::access_action (const std::string& action_group, const std::string& action_item) { if (!_session) { return; @@ -1167,6 +1148,12 @@ Editor::access_action (std::string action_group, std::string action_item) } } +void +Editor::set_toggleaction (const std::string& action_group, const std::string& action_item, bool s) +{ + ActionManager::set_toggleaction_state (action_group.c_str(), action_item.c_str(), s); +} + void Editor::on_realize () { @@ -1211,7 +1198,7 @@ Editor::generic_event_handler (GdkEvent* ev) /* leaving window, so reset focus, thus ending any and all text entry operations. */ - reset_focus (&contents()); + ARDOUR_UI::instance()->reset_focus (&contents()); break; } break; @@ -1332,6 +1319,10 @@ Editor::set_session (Session *t) return; } + //initialize leftmost_frame to the extents of the session + //this prevents a bogus setting of leftmost = "0" if the summary view asks for the leftmost frame before the visible state has been loaded from instant.xml + leftmost_frame = session_gui_extents().first; + _playlist_selector->set_session (_session); nudge_clock->set_session (_session); _summary->set_session (_session); @@ -1341,6 +1332,7 @@ Editor::set_session (Session *t) _snapshots->set_session (_session); _routes->set_session (_session); _locations->set_session (_session); + _time_info_box->set_session (_session); if (rhythm_ferret) { rhythm_ferret->set_session (_session); @@ -1377,6 +1369,12 @@ Editor::set_session (Session *t) XMLNode* node = ARDOUR_UI::instance()->editor_settings(); set_state (*node, Stateful::loading_state_version); + /* catch up on selection state, etc. */ + + PropertyChange sc; + sc.add (Properties::selected); + presentation_info_changed (sc); + /* catch up with the playhead */ _session->request_locate (playhead_cursor->current_frame ()); @@ -1392,12 +1390,13 @@ Editor::set_session (Session *t) _session->StepEditStatusChange.connect (_session_connections, invalidator (*this), boost::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->TransportLooped.connect (_session_connections, invalidator (*this), boost::bind (&Editor::transport_looped, this), gui_context()); _session->PositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::map_position_change, this, _1), gui_context()); _session->vca_manager().VCAAdded.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_vcas, this, _1), gui_context()); _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_routes, this, _1), gui_context()); _session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_title, this), gui_context()); _session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempo_map_changed, this, _1), gui_context()); - _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::marker_position_changed, this), gui_context()); + _session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempometric_position_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), boost::bind (&Editor::parameter_changed, this, _1), gui_context()); _session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Editor::session_state_saved, this, _1), gui_context()); @@ -1440,30 +1439,11 @@ Editor::set_session (Session *t) _session->register_with_memento_command_factory(id(), this); _session->register_with_memento_command_factory(_selection_memento->id(), _selection_memento); - ActionManager::ui_manager->signal_pre_activate().connect (sigc::mem_fun (*this, &Editor::action_pre_activated)); - LuaInstance::instance()->set_session(_session); 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::fill_xfade_menu (Menu_Helpers::MenuList& items, bool start) { @@ -1691,7 +1671,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, /* When the region menu is opened, we setup the actions so that they look right in the menu. */ - sensitize_the_right_region_actions (); + sensitize_the_right_region_actions (false); _last_region_menu_was_main = false; menu->signal_hide().connect (sigc::bind (sigc::mem_fun (*this, &Editor::sensitize_all_region_actions), true)); @@ -1908,27 +1888,17 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::sha RegionSelection rs = get_regions_from_selection_and_entered (); - string::size_type pos = 0; string menu_item_name = (rs.size() == 1) ? rs.front()->region()->name() : _("Selected Regions"); - /* we have to hack up the region name because "_" has a special - meaning for menu titles. - */ - - while ((pos = menu_item_name.find ("_", pos)) != string::npos) { - menu_item_name.replace (pos, 1, "__"); - pos += 2; - } - if (_popup_region_menu_item == 0) { - _popup_region_menu_item = new MenuItem (menu_item_name); + _popup_region_menu_item = new MenuItem (menu_item_name, false); _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); } - /* No latering allowed in later is higher layering model */ + /* No layering allowed in later is higher layering model */ RefPtr act = ActionManager::get_action (X_("EditorMenu"), X_("RegionMenuLayering")); if (act && Config->get_layer_model() == LaterHigher) { act->set_sensitive (false); @@ -1957,7 +1927,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true))); edit_items.push_back (SeparatorElem()); - edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false))); + edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal))); edit_items.push_back (SeparatorElem()); edit_items.push_back (MenuElem (_("Loudness Analysis"), sigc::mem_fun(*this, &Editor::loudness_analyze_range_selection))); @@ -2249,10 +2219,8 @@ Editor::set_snap_to (SnapType st) case SnapToBeatDiv4: case SnapToBeatDiv3: case SnapToBeatDiv2: { - std::vector grid; - compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); - compute_bbt_ruler_scale (grid, leftmost_frame, leftmost_frame + current_page_samples()); - update_tempo_based_rulers (grid); + compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_samples()); + update_tempo_based_rulers (); break; } @@ -2341,6 +2309,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) } reset_canvas_action_sensitivity (in_track_canvas); + sensitize_the_right_region_actions (false); instant_save (); } @@ -2348,18 +2317,16 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) int Editor::set_state (const XMLNode& node, int version) { - XMLProperty const * prop; set_id (node); PBD::Unwinder nsi (no_save_instant, true); - LocaleGuard lg; + bool yn; Tabbable::set_state (node, version); - if (_session && (prop = node.property ("playhead"))) { - framepos_t pos; - sscanf (prop->value().c_str(), "%" PRIi64, &pos); - if (pos >= 0) { - playhead_cursor->set_position (pos); + framepos_t ph_pos; + if (_session && node.get_property ("playhead", ph_pos)) { + if (ph_pos >= 0) { + playhead_cursor->set_position (ph_pos); } else { warning << _("Playhead position stored with a negative value - ignored (use zero instead)") << endmsg; playhead_cursor->set_position (0); @@ -2368,80 +2335,70 @@ Editor::set_state (const XMLNode& node, int version) playhead_cursor->set_position (0); } - if ((prop = node.property ("mixer-width"))) { - editor_mixer_strip_width = Width (string_2_enum (prop->value(), editor_mixer_strip_width)); - } + node.get_property ("mixer-width", editor_mixer_strip_width); - if ((prop = node.property ("zoom-focus"))) { - zoom_focus_selection_done ((ZoomFocus) string_2_enum (prop->value(), zoom_focus)); - } + node.get_property ("zoom-focus", zoom_focus); + zoom_focus_selection_done (zoom_focus); - if ((prop = node.property ("zoom"))) { + double z; + if (node.get_property ("zoom", z)) { /* older versions of ardour used floating point samples_per_pixel */ - double f = PBD::atof (prop->value()); - reset_zoom (llrintf (f)); + reset_zoom (llrintf (z)); } else { reset_zoom (samples_per_pixel); } - if ((prop = node.property ("visible-track-count"))) { - set_visible_track_count (PBD::atoi (prop->value())); + int32_t cnt; + if (node.get_property ("visible-track-count", cnt)) { + set_visible_track_count (cnt); } - if ((prop = node.property ("snap-to"))) { - snap_type_selection_done ((SnapType) string_2_enum (prop->value(), _snap_type)); - set_snap_to ((SnapType) string_2_enum (prop->value(), _snap_type)); + SnapType snap_type; + if (!node.get_property ("snap-to", snap_type)) { + snap_type = _snap_type; } + set_snap_to (snap_type); - if ((prop = node.property ("snap-mode"))) { - snap_mode_selection_done((SnapMode) string_2_enum (prop->value(), _snap_mode)); + SnapMode sm; + if (node.get_property ("snap-mode", sm)) { + snap_mode_selection_done(sm); /* set text of Dropdown. in case _snap_mode == SnapOff (default) * snap_mode_selection_done() will only mark an already active item as active * which does not trigger set_text(). */ - set_snap_mode ((SnapMode) string_2_enum (prop->value(), _snap_mode)); - } - - if ((prop = node.property ("internal-snap-to"))) { - internal_snap_type = (SnapType) string_2_enum (prop->value(), internal_snap_type); - } - - if ((prop = node.property ("internal-snap-mode"))) { - internal_snap_mode = (SnapMode) string_2_enum (prop->value(), internal_snap_mode); - } - - if ((prop = node.property ("pre-internal-snap-to"))) { - pre_internal_snap_type = (SnapType) string_2_enum (prop->value(), pre_internal_snap_type); + set_snap_mode (sm); + } else { + set_snap_mode (_snap_mode); } - if ((prop = node.property ("pre-internal-snap-mode"))) { - pre_internal_snap_mode = (SnapMode) string_2_enum (prop->value(), pre_internal_snap_mode); - } + node.get_property ("internal-snap-to", internal_snap_type); + node.get_property ("internal-snap-mode", internal_snap_mode); + node.get_property ("pre-internal-snap-to", pre_internal_snap_type); + node.get_property ("pre-internal-snap-mode", pre_internal_snap_mode); - if ((prop = node.property ("mouse-mode"))) { - MouseMode m = str2mousemode(prop->value()); + std::string mm_str; + if (node.get_property ("mouse-mode", mm_str)) { + MouseMode m = str2mousemode(mm_str); set_mouse_mode (m, true); } else { set_mouse_mode (MouseObject, true); } - if ((prop = node.property ("left-frame")) != 0) { - framepos_t pos; - if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) { - if (pos < 0) { - pos = 0; - } - reset_x_origin (pos); + framepos_t lf_pos; + if (node.get_property ("left-frame", lf_pos)) { + if (lf_pos < 0) { + lf_pos = 0; } + reset_x_origin (lf_pos); } - if ((prop = node.property ("y-origin")) != 0) { - reset_y_origin (atof (prop->value ())); + double y_origin; + if (node.get_property ("y-origin", y_origin)) { + reset_y_origin (y_origin); } - if ((prop = node.property ("join-object-range"))) { + if (node.get_property ("join-object-range", yn)) { RefPtr act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object-range")); - bool yn = string_is_affirmative (prop->value()); if (act) { RefPtr tact = RefPtr::cast_dynamic(act); tact->set_active (!yn); @@ -2450,37 +2407,34 @@ Editor::set_state (const XMLNode& node, int version) set_mouse_mode(mouse_mode, true); } - if ((prop = node.property ("edit-point"))) { - set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true); + EditPoint ep; + if (node.get_property ("edit-point", ep)) { + set_edit_point_preference (ep, true); + } else { + set_edit_point_preference (_edit_point); } - if ((prop = node.property ("show-measures"))) { - bool yn = string_is_affirmative (prop->value()); - _show_measures = yn; - } + node.get_property ("show-measures", _show_measures); - if ((prop = node.property ("follow-playhead"))) { - bool yn = string_is_affirmative (prop->value()); + if (node.get_property ("follow-playhead", yn)) { set_follow_playhead (yn); } - if ((prop = node.property ("stationary-playhead"))) { - bool yn = string_is_affirmative (prop->value()); + if (node.get_property ("stationary-playhead", yn)) { set_stationary_playhead (yn); } - if ((prop = node.property ("region-list-sort-type"))) { - RegionListSortType st; - _regions->reset_sort_type ((RegionListSortType) string_2_enum (prop->value(), st), true); + RegionListSortType sort_type; + if (node.get_property ("region-list-sort-type", sort_type)) { + _regions->reset_sort_type (sort_type, true); } - if ((prop = node.property ("show-editor-mixer"))) { + if (node.get_property ("show-editor-mixer", yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - bool yn = string_is_affirmative (prop->value()); /* do it twice to force the change */ @@ -2488,13 +2442,12 @@ Editor::set_state (const XMLNode& node, int version) tact->set_active (yn); } - if ((prop = node.property ("show-editor-list"))) { + if (node.get_property ("show-editor-list", yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-list")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - bool yn = string_is_affirmative (prop->value()); /* do it twice to force the change */ @@ -2502,15 +2455,15 @@ Editor::set_state (const XMLNode& node, int version) tact->set_active (yn); } - if ((prop = node.property (X_("editor-list-page")))) { - _the_notebook.set_current_page (atoi (prop->value ())); + int32_t el_page; + if (node.get_property (X_("editor-list-page"), el_page)) { + _the_notebook.set_current_page (el_page); } - if ((prop = node.property (X_("show-marker-lines")))) { + if (node.get_property (X_("show-marker-lines"), yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-marker-lines")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - bool yn = string_is_affirmative (prop->value ()); tact->set_active (!yn); tact->set_active (yn); @@ -2520,10 +2473,10 @@ Editor::set_state (const XMLNode& node, int version) for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { selection->set_state (**i, Stateful::current_state_version); _regions->set_state (**i); + _locations->set_state (**i); } - if ((prop = node.property ("maximised"))) { - bool yn = string_is_affirmative (prop->value()); + if (node.get_property ("maximised", yn)) { Glib::RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalEditor")); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); @@ -2533,10 +2486,9 @@ Editor::set_state (const XMLNode& node, int version) } } - if ((prop = node.property ("nudge-clock-value"))) { - framepos_t f; - sscanf (prop->value().c_str(), "%" PRId64, &f); - nudge_clock->set (f); + framepos_t nudge_clock_value; + if (node.get_property ("nudge-clock-value", nudge_clock_value)) { + nudge_clock->set (nudge_clock_value); } else { nudge_clock->set_mode (AudioClock::Timecode); nudge_clock->set (_session->frame_rate() * 5, true); @@ -2548,7 +2500,6 @@ Editor::set_state (const XMLNode& node, int version) * those that are linked to a private variable may need changing */ RefPtr act; - bool yn; act = ActionManager::get_action (X_("Editor"), X_("ToggleMeasureVisibility")); if (act) { @@ -2585,82 +2536,71 @@ XMLNode& Editor::get_state () { XMLNode* node = new XMLNode (X_("Editor")); - char buf[32]; - LocaleGuard lg; - id().print (buf, sizeof (buf)); - node->add_property ("id", buf); + node->set_property ("id", id().to_s ()); node->add_child_nocopy (Tabbable::get_state()); - snprintf(buf,sizeof(buf), "%f", edit_pane.get_divider ()); - node->add_property("edit-horizontal-pane-pos", string(buf)); - node->add_property("notebook-shrunk", _notebook_shrunk ? "1" : "0"); - snprintf(buf,sizeof(buf), "%f", editor_summary_pane.get_divider()); - node->add_property("edit-vertical-pane-pos", string(buf)); + node->set_property("edit-horizontal-pane-pos", edit_pane.get_divider ()); + node->set_property("notebook-shrunk", _notebook_shrunk); + node->set_property("edit-vertical-pane-pos", editor_summary_pane.get_divider()); maybe_add_mixer_strip_width (*node); - node->add_property ("zoom-focus", enum_2_string (zoom_focus)); - - snprintf (buf, sizeof(buf), "%" PRId64, samples_per_pixel); - node->add_property ("zoom", buf); - node->add_property ("snap-to", enum_2_string (_snap_type)); - node->add_property ("snap-mode", enum_2_string (_snap_mode)); - node->add_property ("internal-snap-to", enum_2_string (internal_snap_type)); - node->add_property ("internal-snap-mode", enum_2_string (internal_snap_mode)); - node->add_property ("pre-internal-snap-to", enum_2_string (pre_internal_snap_type)); - node->add_property ("pre-internal-snap-mode", enum_2_string (pre_internal_snap_mode)); - node->add_property ("edit-point", enum_2_string (_edit_point)); - snprintf (buf, sizeof(buf), "%d", _visible_track_count); - node->add_property ("visible-track-count", buf); - - snprintf (buf, sizeof (buf), "%" PRIi64, playhead_cursor->current_frame ()); - node->add_property ("playhead", buf); - snprintf (buf, sizeof (buf), "%" PRIi64, leftmost_frame); - node->add_property ("left-frame", buf); - snprintf (buf, sizeof (buf), "%f", vertical_adjustment.get_value ()); - node->add_property ("y-origin", buf); - - node->add_property ("show-measures", _show_measures ? "yes" : "no"); - node->add_property ("maximised", _maximised ? "yes" : "no"); - node->add_property ("follow-playhead", _follow_playhead ? "yes" : "no"); - node->add_property ("stationary-playhead", _stationary_playhead ? "yes" : "no"); - node->add_property ("region-list-sort-type", enum_2_string (_regions->sort_type ())); - node->add_property ("mouse-mode", enum2str(mouse_mode)); - node->add_property ("join-object-range", smart_mode_action->get_active () ? "yes" : "no"); + node->set_property ("zoom-focus", zoom_focus); + + node->set_property ("zoom", samples_per_pixel); + node->set_property ("snap-to", _snap_type); + node->set_property ("snap-mode", _snap_mode); + node->set_property ("internal-snap-to", internal_snap_type); + node->set_property ("internal-snap-mode", internal_snap_mode); + node->set_property ("pre-internal-snap-to", pre_internal_snap_type); + node->set_property ("pre-internal-snap-mode", pre_internal_snap_mode); + node->set_property ("edit-point", _edit_point); + node->set_property ("visible-track-count", _visible_track_count); + + node->set_property ("playhead", playhead_cursor->current_frame ()); + node->set_property ("left-frame", leftmost_frame); + node->set_property ("y-origin", vertical_adjustment.get_value ()); + + node->set_property ("show-measures", _show_measures); + node->set_property ("maximised", _maximised); + node->set_property ("follow-playhead", _follow_playhead); + node->set_property ("stationary-playhead", _stationary_playhead); + node->set_property ("region-list-sort-type", _regions->sort_type ()); + node->set_property ("mouse-mode", mouse_mode); + node->set_property ("join-object-range", smart_mode_action->get_active ()); Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer")); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - node->add_property (X_("show-editor-mixer"), tact->get_active() ? "yes" : "no"); + node->set_property (X_("show-editor-mixer"), tact->get_active()); } act = ActionManager::get_action (X_("Editor"), X_("show-editor-list")); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no"); + node->set_property (X_("show-editor-list"), tact->get_active()); } - snprintf (buf, sizeof (buf), "%d", _the_notebook.get_current_page ()); - node->add_property (X_("editor-list-page"), buf); + node->set_property (X_("editor-list-page"), _the_notebook.get_current_page ()); - if (button_bindings) { - XMLNode* bb = new XMLNode (X_("Buttons")); - button_bindings->save (*bb); - node->add_child_nocopy (*bb); - } + if (button_bindings) { + XMLNode* bb = new XMLNode (X_("Buttons")); + button_bindings->save (*bb); + node->add_child_nocopy (*bb); + } - node->add_property (X_("show-marker-lines"), _show_marker_lines ? "yes" : "no"); + node->set_property (X_("show-marker-lines"), _show_marker_lines); node->add_child_nocopy (selection->get_state ()); node->add_child_nocopy (_regions->get_state ()); - snprintf (buf, sizeof (buf), "%" PRId64, nudge_clock->current_duration()); - node->add_property ("nudge-clock-value", buf); + node->set_property ("nudge-clock-value", nudge_clock->current_duration()); node->add_child_nocopy (LuaInstance::instance()->get_action_state()); node->add_child_nocopy (LuaInstance::instance()->get_hook_state()); + node->add_child_nocopy (_locations->get_state ()); return *node; } @@ -2702,7 +2642,7 @@ Editor::trackview_by_y_position (double y, bool trackview_relative_offset) const * @param event Event to get current key modifier information from, or 0. */ void -Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, RoundMode direction, bool for_mark) +Editor::snap_to_with_modifier (MusicFrame& start, GdkEvent const * event, RoundMode direction, bool for_mark) { if (!_session || !event) { return; @@ -2711,6 +2651,8 @@ Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, RoundM if (ArdourKeyboard::indicates_snap (event->button.state)) { if (_snap_mode == SnapOff) { snap_to_internal (start, direction, for_mark); + } else { + start.set (start.frame, 0); } } else { if (_snap_mode != SnapOff) { @@ -2718,14 +2660,17 @@ Editor::snap_to_with_modifier (framepos_t& start, GdkEvent const * event, RoundM } else if (ArdourKeyboard::indicates_snap_delta (event->button.state)) { /* SnapOff, but we pressed the snap_delta modifier */ snap_to_internal (start, direction, for_mark); + } else { + start.set (start.frame, 0); } } } void -Editor::snap_to (framepos_t& start, RoundMode direction, bool for_mark, bool ensure_snap) +Editor::snap_to (MusicFrame& start, RoundMode direction, bool for_mark, bool ensure_snap) { if (!_session || (_snap_mode == SnapOff && !ensure_snap)) { + start.set (start.frame, 0); return; } @@ -2733,20 +2678,21 @@ Editor::snap_to (framepos_t& start, RoundMode direction, bool for_mark, bool ens } void -Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool /*for_mark*/) +Editor::timecode_snap_to_internal (MusicFrame& pos, RoundMode direction, bool /*for_mark*/) { - 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); + framepos_t start = pos.frame; + const framepos_t one_timecode_second = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame()); + framepos_t one_timecode_minute = (framepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame() * 60); switch (_snap_type) { case SnapToTimecodeFrame: if ((direction == RoundUpMaybe || direction == RoundDownMaybe) && - fmod((double)start, (double)_session->frames_per_timecode_frame()) == 0) { + fmod((double)start, (double)_session->samples_per_timecode_frame()) == 0) { /* start is already on a whole timecode frame, do nothing */ - } else if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) { - start = (framepos_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); + } else if (((direction == 0) && (fmod((double)start, (double)_session->samples_per_timecode_frame()) > (_session->samples_per_timecode_frame() / 2))) || (direction > 0)) { + start = (framepos_t) (ceil ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame()); } else { - start = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame()); + start = (framepos_t) (floor ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame()); } break; @@ -2796,14 +2742,16 @@ Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool fatal << "Editor::smpte_snap_to_internal() called with non-timecode snap type!" << endmsg; abort(); /*NOTREACHED*/ } + + pos.set (start, 0); } void -Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, bool ensure_snap) +Editor::snap_to_internal (MusicFrame& start, RoundMode direction, bool for_mark, bool ensure_snap) { const framepos_t one_second = _session->frame_rate(); const framepos_t one_minute = _session->frame_rate() * 60; - framepos_t presnap = start; + framepos_t presnap = start.frame; framepos_t before; framepos_t after; @@ -2815,95 +2763,104 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, case SnapToCDFrame: if ((direction == RoundUpMaybe || direction == RoundDownMaybe) && - start % (one_second/75) == 0) { + start.frame % (one_second/75) == 0) { /* start is already on a whole CD frame, do nothing */ - } else if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) { - start = (framepos_t) ceil ((double) start / (one_second / 75)) * (one_second / 75); + } else if (((direction == 0) && (start.frame % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) { + start.frame = (framepos_t) ceil ((double) start.frame / (one_second / 75)) * (one_second / 75); } else { - start = (framepos_t) floor ((double) start / (one_second / 75)) * (one_second / 75); + start.frame = (framepos_t) floor ((double) start.frame / (one_second / 75)) * (one_second / 75); } + + start.set (start.frame, 0); + break; case SnapToSeconds: if ((direction == RoundUpMaybe || direction == RoundDownMaybe) && - start % one_second == 0) { + start.frame % one_second == 0) { /* start is already on a whole second, do nothing */ - } else if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) { - start = (framepos_t) ceil ((double) start / one_second) * one_second; + } else if (((direction == 0) && (start.frame % one_second > one_second / 2)) || (direction > 0)) { + start.frame = (framepos_t) ceil ((double) start.frame / one_second) * one_second; } else { - start = (framepos_t) floor ((double) start / one_second) * one_second; + start.frame = (framepos_t) floor ((double) start.frame / one_second) * one_second; } + + start.set (start.frame, 0); + break; case SnapToMinutes: if ((direction == RoundUpMaybe || direction == RoundDownMaybe) && - start % one_minute == 0) { + start.frame % one_minute == 0) { /* start is already on a whole minute, do nothing */ - } else if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) { - start = (framepos_t) ceil ((double) start / one_minute) * one_minute; + } else if (((direction == 0) && (start.frame % one_minute > one_minute / 2)) || (direction > 0)) { + start.frame = (framepos_t) ceil ((double) start.frame / one_minute) * one_minute; } else { - start = (framepos_t) floor ((double) start / one_minute) * one_minute; + start.frame = (framepos_t) floor ((double) start.frame / one_minute) * one_minute; } + + start.set (start.frame, 0); + break; case SnapToBar: - start = _session->tempo_map().round_to_bar (start, direction); + start = _session->tempo_map().round_to_bar (start.frame, direction); break; case SnapToBeat: - start = _session->tempo_map().round_to_beat (start, direction); + start = _session->tempo_map().round_to_beat (start.frame, direction); break; case SnapToBeatDiv128: - start = _session->tempo_map().round_to_beat_subdivision (start, 128, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 128, direction); break; case SnapToBeatDiv64: - start = _session->tempo_map().round_to_beat_subdivision (start, 64, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 64, direction); break; case SnapToBeatDiv32: - start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 32, direction); break; case SnapToBeatDiv28: - start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 28, direction); break; case SnapToBeatDiv24: - start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 24, direction); break; case SnapToBeatDiv20: - start = _session->tempo_map().round_to_beat_subdivision (start, 20, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 20, direction); break; case SnapToBeatDiv16: - start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 16, direction); break; case SnapToBeatDiv14: - start = _session->tempo_map().round_to_beat_subdivision (start, 14, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 14, direction); break; case SnapToBeatDiv12: - start = _session->tempo_map().round_to_beat_subdivision (start, 12, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 12, direction); break; case SnapToBeatDiv10: - start = _session->tempo_map().round_to_beat_subdivision (start, 10, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 10, direction); break; case SnapToBeatDiv8: - start = _session->tempo_map().round_to_beat_subdivision (start, 8, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 8, direction); break; case SnapToBeatDiv7: - start = _session->tempo_map().round_to_beat_subdivision (start, 7, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 7, direction); break; case SnapToBeatDiv6: - start = _session->tempo_map().round_to_beat_subdivision (start, 6, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 6, direction); break; case SnapToBeatDiv5: - start = _session->tempo_map().round_to_beat_subdivision (start, 5, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 5, direction); break; case SnapToBeatDiv4: - start = _session->tempo_map().round_to_beat_subdivision (start, 4, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 4, direction); break; case SnapToBeatDiv3: - start = _session->tempo_map().round_to_beat_subdivision (start, 3, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 3, direction); break; case SnapToBeatDiv2: - start = _session->tempo_map().round_to_beat_subdivision (start, 2, direction); + start = _session->tempo_map().round_to_quarter_note_subdivision (start.frame, 2, direction); break; case SnapToMark: @@ -2911,24 +2868,31 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, return; } - _session->locations()->marks_either_side (start, before, after); + _session->locations()->marks_either_side (start.frame, before, after); if (before == max_framepos && after == max_framepos) { /* No marks to snap to, so just don't snap */ return; } else if (before == max_framepos) { - start = after; + start.frame = after; } else if (after == max_framepos) { - start = before; + start.frame = before; } else if (before != max_framepos && after != max_framepos) { - /* have before and after */ - if ((start - before) < (after - start)) { - start = before; - } else { - start = after; + if ((direction == RoundUpMaybe || direction == RoundUpAlways)) + start.frame = after; + else if ((direction == RoundDownMaybe || direction == RoundDownAlways)) + start.frame = before; + else if (direction == 0 ) { + if ((start.frame - before) < (after - start.frame)) { + start.frame = before; + } else { + start.frame = after; + } } } + start.set (start.frame, 0); + break; case SnapToRegionStart: @@ -2941,9 +2905,9 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, vector::iterator next = region_boundary_cache.end (); if (direction > 0) { - next = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start); + next = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start.frame); } else { - next = std::lower_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start); + next = std::lower_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start.frame); } if (next != region_boundary_cache.begin ()) { @@ -2954,12 +2918,15 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, 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; + if (start.frame > (p + n) / 2) { + start.frame = n; } else { - start = p; + start.frame = p; } } + + start.set (start.frame, 0); + break; } @@ -2973,21 +2940,20 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark, return; } - if (presnap > start) { - if (presnap > (start + pixel_to_sample(snap_threshold))) { - start = presnap; + if (presnap > start.frame) { + if (presnap > (start.frame + pixel_to_sample(snap_threshold))) { + start.set (presnap, 0); } - } else if (presnap < start) { - if (presnap < (start - pixel_to_sample(snap_threshold))) { - start = presnap; + } else if (presnap < start.frame) { + if (presnap < (start.frame - pixel_to_sample(snap_threshold))) { + start.set (presnap, 0); } } default: /* handled at entry */ return; - } } @@ -3014,15 +2980,17 @@ Editor::setup_toolbar () mouse_mode_size_group->add_widget (mouse_draw_button); mouse_mode_size_group->add_widget (mouse_content_button); - mouse_mode_size_group->add_widget (zoom_in_button); - mouse_mode_size_group->add_widget (zoom_out_button); - mouse_mode_size_group->add_widget (zoom_preset_selector); - mouse_mode_size_group->add_widget (zoom_out_full_button); - mouse_mode_size_group->add_widget (zoom_focus_selector); - - mouse_mode_size_group->add_widget (tav_shrink_button); - mouse_mode_size_group->add_widget (tav_expand_button); - mouse_mode_size_group->add_widget (visible_tracks_selector); + if (!Profile->get_mixbus()) { + mouse_mode_size_group->add_widget (zoom_in_button); + mouse_mode_size_group->add_widget (zoom_out_button); + mouse_mode_size_group->add_widget (zoom_out_full_button); + mouse_mode_size_group->add_widget (zoom_focus_selector); + mouse_mode_size_group->add_widget (tav_shrink_button); + mouse_mode_size_group->add_widget (tav_expand_button); + } else { + mouse_mode_size_group->add_widget (zoom_preset_selector); + mouse_mode_size_group->add_widget (visible_tracks_selector); + } mouse_mode_size_group->add_widget (snap_type_selector); mouse_mode_size_group->add_widget (snap_mode_selector); @@ -3077,8 +3045,7 @@ Editor::setup_toolbar () RefPtr act; zoom_preset_selector.set_name ("zoom button"); - zoom_preset_selector.set_image(::get_icon ("time_exp")); - zoom_preset_selector.set_size_request (42, -1); + zoom_preset_selector.set_icon (ArdourIcon::ZoomExpand); zoom_in_button.set_name ("zoom button"); zoom_in_button.set_icon (ArdourIcon::ZoomIn); @@ -3110,10 +3077,12 @@ Editor::setup_toolbar () } /* Track zoom buttons */ + _track_box.set_spacing (2); + _track_box.set_border_width (2); + visible_tracks_selector.set_name ("zoom button"); if (Profile->get_mixbus()) { - visible_tracks_selector.set_image(::get_icon ("tav_exp")); - visible_tracks_selector.set_size_request (42, -1); + visible_tracks_selector.set_icon (ArdourIcon::TimeAxisExpand); } else { set_size_request_to_display_given_text (visible_tracks_selector, _("All"), 30, 2); } @@ -3129,14 +3098,14 @@ Editor::setup_toolbar () tav_shrink_button.set_related_action (act); if (ARDOUR::Profile->get_mixbus()) { - _zoom_box.pack_start (visible_tracks_selector); + _track_box.pack_start (visible_tracks_selector); } else if (ARDOUR::Profile->get_trx()) { - _zoom_box.pack_start (tav_shrink_button); - _zoom_box.pack_start (tav_expand_button); + _track_box.pack_start (tav_shrink_button); + _track_box.pack_start (tav_expand_button); } else { - _zoom_box.pack_start (visible_tracks_selector); - _zoom_box.pack_start (tav_shrink_button); - _zoom_box.pack_start (tav_expand_button); + _track_box.pack_start (visible_tracks_selector); + _track_box.pack_start (tav_shrink_button); + _track_box.pack_start (tav_expand_button); } snap_box.set_spacing (2); @@ -3150,7 +3119,13 @@ Editor::setup_toolbar () snap_box.pack_start (snap_mode_selector, false, false); snap_box.pack_start (snap_type_selector, false, false); - snap_box.pack_start (edit_point_selector, false, false); + + /* Edit Point*/ + HBox *ep_box = manage (new HBox); + ep_box->set_spacing (2); + ep_box->set_border_width (2); + + ep_box->pack_start (edit_point_selector, false, false); /* Nudge */ @@ -3168,35 +3143,35 @@ Editor::setup_toolbar () /* Pack everything in... */ - HBox* hbox = manage (new HBox); - hbox->set_spacing(2); - toolbar_hbox.set_spacing (2); - toolbar_hbox.set_border_width (1); + toolbar_hbox.set_border_width (2); toolbar_hbox.pack_start (*mode_box, false, false); + if (!ARDOUR::Profile->get_trx()) { + + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); + toolbar_hbox.pack_start (_zoom_box, false, false); - toolbar_hbox.pack_start (*hbox, false, false); - } - if (!ARDOUR::Profile->get_trx()) { - hbox->pack_start (snap_box, false, false); - hbox->pack_start (*nudge_box, false, false); - } + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); + + toolbar_hbox.pack_start (_track_box, false, false); - hbox->show_all (); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); - toolbar_base.set_name ("ToolBarBase"); - toolbar_base.add (toolbar_hbox); + toolbar_hbox.pack_start (snap_box, false, false); - _toolbar_viewport.add (toolbar_base); - /* stick to the required height but allow width to vary if there's not enough room */ - _toolbar_viewport.set_size_request (1, -1); + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); - toolbar_frame.set_shadow_type (SHADOW_OUT); - toolbar_frame.set_name ("BaseFrame"); - toolbar_frame.add (_toolbar_viewport); + toolbar_hbox.pack_start (*ep_box, false, false); + + toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); + + toolbar_hbox.pack_start (*nudge_box, false, false); + } + + toolbar_hbox.show_all (); } void @@ -3408,6 +3383,15 @@ Editor::map_transport_state () update_loop_range_view (); } +void +Editor::transport_looped () +{ + /* reset Playhead position interpolation. + * see Editor::super_rapid_screen_update + */ + _last_update_time = 0; +} + /* UNDO/REDO */ void @@ -3798,7 +3782,8 @@ Editor::build_track_count_menu () zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 8 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 8 * 60 * 60 * 1000))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 24 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 24 * 60 * 60 * 1000))); zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session))); - zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false))); + zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Extents"), sigc::mem_fun(*this, &Editor::temporal_zoom_extents))); + zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal))); } } @@ -3840,11 +3825,21 @@ Editor::set_visible_track_count (int32_t n) str = s.str(); } else if (_visible_track_count == 0) { uint32_t n = 0; - 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 ((*i)->marked_for_display()) { ++n; + TimeAxisView::Children cl ((*i)->get_child_list ()); + for (TimeAxisView::Children::const_iterator j = cl.begin(); j != cl.end(); ++j) { + if ((*j)->marked_for_display()) { + ++n; + } + } } } + if (n == 0) { + visible_tracks_selector.set_text (X_("*")); + return; + } h = trackviews_height() / n; str = _("All"); } else { @@ -4021,9 +4016,9 @@ Editor::get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t durat framecnt_t offset = paste_count * duration; /* snap offset so pos + offset is aligned to the grid */ - framepos_t offset_pos = pos + offset; + MusicFrame offset_pos (pos + offset, 0); snap_to(offset_pos, RoundUpMaybe); - offset = offset_pos - pos; + offset = offset_pos.frame - pos; return offset; } @@ -4054,6 +4049,47 @@ Editor::get_grid_beat_divisions(framepos_t position) return 0; } +/** returns the current musical grid divisiions using the supplied modifier mask from a GtkEvent. + if the grid is non-musical, returns 0. + if the grid is snapped to bars, returns -1. + @param event_state the current keyboard modifier mask. +*/ +int32_t +Editor::get_grid_music_divisions (uint32_t event_state) +{ + if (snap_mode() == Editing::SnapOff && !ArdourKeyboard::indicates_snap (event_state)) { + return 0; + } + + if (snap_mode() != Editing::SnapOff && ArdourKeyboard::indicates_snap (event_state)) { + return 0; + } + + switch (_snap_type) { + case SnapToBeatDiv128: return 128; + case SnapToBeatDiv64: return 64; + case SnapToBeatDiv32: return 32; + case SnapToBeatDiv28: return 28; + case SnapToBeatDiv24: return 24; + case SnapToBeatDiv20: return 20; + case SnapToBeatDiv16: return 16; + case SnapToBeatDiv14: return 14; + case SnapToBeatDiv12: return 12; + case SnapToBeatDiv10: return 10; + case SnapToBeatDiv8: return 8; + case SnapToBeatDiv7: return 7; + case SnapToBeatDiv6: return 6; + case SnapToBeatDiv5: return 5; + case SnapToBeatDiv4: return 4; + case SnapToBeatDiv3: return 3; + case SnapToBeatDiv2: return 2; + case SnapToBeat: return 1; + case SnapToBar : return -1; + default: return 0; + } + return 0; +} + Evoral::Beats Editor::get_grid_type_as_beats (bool& success, framepos_t position) { @@ -4066,10 +4102,11 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position) switch (_snap_type) { case SnapToBeat: - return Evoral::Beats(1.0); + return Evoral::Beats(4.0 / _session->tempo_map().meter_at_frame (position).note_divisor()); case SnapToBar: if (_session) { - return Evoral::Beats(_session->tempo_map().meter_at_frame (position).divisions_per_bar()); + const Meter& m = _session->tempo_map().meter_at_frame (position); + return Evoral::Beats((4.0 * m.divisions_per_bar()) / m.note_divisor()); } break; default: @@ -4292,13 +4329,13 @@ Editor::clear_playlists (TimeAxisView* v) void Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz, vector > const & playlists) { - atv.use_new_playlist (sz > 1 ? false : true, playlists); + atv.use_new_playlist (sz > 1 ? false : true, playlists, false); } void Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz, vector > const & playlists) { - atv.use_copy_playlist (sz > 1 ? false : true, playlists); + atv.use_new_playlist (sz > 1 ? false : true, playlists, true); } void @@ -4375,7 +4412,7 @@ Editor::current_visual_state (bool with_tracks) vs->zoom_focus = zoom_focus; if (with_tracks) { - *vs->gui_state = *ARDOUR_UI::instance()->gui_object_state; + vs->gui_state->set_state (ARDOUR_UI::instance()->gui_object_state->get_state()); } return vs; @@ -4440,7 +4477,7 @@ Editor::use_visual_state (VisualState& vs) reposition_and_zoom (vs.leftmost_frame, vs.samples_per_pixel); if (vs.gui_state) { - *ARDOUR_UI::instance()->gui_object_state = *vs.gui_state; + ARDOUR_UI::instance()->gui_object_state->set_state (vs.gui_state->get_state()); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (*i)->clear_property_cache(); @@ -4474,9 +4511,13 @@ Editor::set_samples_per_pixel (framecnt_t spp) } samples_per_pixel = spp; +} +void +Editor::on_samples_per_pixel_changed () +{ if (tempo_lines) { - tempo_lines->tempo_map_changed(); + tempo_lines->tempo_map_changed(_session->tempo_map().music_origin()); } bool const showing_time_selection = selection->time.length() > 0; @@ -4508,16 +4549,16 @@ Editor::set_samples_per_pixel (framecnt_t spp) instant_save (); } +framepos_t +Editor::playhead_cursor_sample () const +{ + return playhead_cursor->current_frame(); +} + void Editor::queue_visual_videotimeline_update () { - /* TODO: - * pending_visual_change.add (VisualChange::VideoTimeline); - * or maybe even more specific: which videotimeline-image - * currently it calls update_video_timeline() to update - * _all outdated_ images on the video-timeline. - * see 'exposeimg()' in video_image_frame.cc - */ + pending_visual_change.add (VisualChange::VideoTimeline); ensure_visual_change_idle_handler (); } @@ -4537,9 +4578,25 @@ Editor::_idle_visual_changer (void* arg) return static_cast(arg)->idle_visual_changer (); } +void +Editor::pre_render () +{ + visual_change_queued = false; + + if (pending_visual_change.pending != 0) { + ensure_visual_change_idle_handler(); + } +} + int Editor::idle_visual_changer () { + pending_visual_change.idle_handler_id = -1; + + if (pending_visual_change.pending == 0) { + return 0; + } + /* set_horizontal_position() below (and maybe other calls) call gtk_main_iteration(), so it's possible that a signal will be handled half-way through this method. If this signal wants an @@ -4550,7 +4607,10 @@ Editor::idle_visual_changer () the last one. */ - pending_visual_change.idle_handler_id = -1; + if (visual_change_queued) { + return 0; + } + pending_visual_change.being_handled = true; VisualChange vc = pending_visual_change; @@ -4561,42 +4621,63 @@ Editor::idle_visual_changer () pending_visual_change.being_handled = false; + visual_change_queued = true; + return 0; /* this is always a one-shot call */ } void Editor::visual_changer (const VisualChange& vc) { - double const last_time_origin = horizontal_position (); - + /** + * Changed first so the correct horizontal canvas position is calculated in + * Editor::set_horizontal_position + */ if (vc.pending & VisualChange::ZoomLevel) { set_samples_per_pixel (vc.samples_per_pixel); - - compute_fixed_ruler_scale (); - - std::vector grid; - compute_current_bbt_points (grid, vc.time_origin, pending_visual_change.time_origin + current_page_samples()); - compute_bbt_ruler_scale (grid, vc.time_origin, pending_visual_change.time_origin + current_page_samples()); - update_tempo_based_rulers (grid); - - update_video_timeline(); } if (vc.pending & VisualChange::TimeOrigin) { - set_horizontal_position (vc.time_origin / samples_per_pixel); + double new_time_origin = sample_to_pixel_unrounded (vc.time_origin); + set_horizontal_position (new_time_origin); } if (vc.pending & VisualChange::YOrigin) { vertical_adjustment.set_value (vc.y_origin); } - if (last_time_origin == horizontal_position ()) { - /* changed signal not emitted */ - update_fixed_rulers (); - redisplay_tempo (true); + /** + * Now the canvas is in the final state before render the canvas items that + * support the Item::prepare_for_render interface can calculate the correct + * item to visible canvas intersection. + */ + if (vc.pending & VisualChange::ZoomLevel) { + on_samples_per_pixel_changed (); + + compute_fixed_ruler_scale (); + + compute_bbt_ruler_scale (vc.time_origin, pending_visual_change.time_origin + current_page_samples()); + update_tempo_based_rulers (); } if (!(vc.pending & VisualChange::ZoomLevel)) { + /** + * If the canvas is not being zoomed then the canvas items will not change + * and cause Item::prepare_for_render to be called so do it here manually. + * + * Not ideal, but I can't think of a better solution atm. + */ + _track_canvas->prepare_for_render(); + } + + // If we are only scrolling vertically there is no need to update these + if (vc.pending != VisualChange::YOrigin) { + update_fixed_rulers (); + redisplay_tempo (true); + + /* video frames & position need to be updated for zoom, horiz-scroll + * and (explicitly) VisualChange::VideoTimeline. + */ update_video_timeline(); } @@ -4623,18 +4704,20 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_ framepos_t where = 0; EditPoint ep = _edit_point; - if (Profile->get_mixbus()) - if (ep == EditAtSelectedMarker) + if (Profile->get_mixbus()) { + if (ep == EditAtSelectedMarker) { ep = EditAtPlayhead; + } + } if (from_outside_canvas && (ep == EditAtMouse)) { ep = EditAtPlayhead; } else if (from_context_menu && (ep == EditAtMouse)) { - return canvas_event_sample (&context_click_event, 0, 0); + return canvas_event_sample (&context_click_event, 0, 0); } if (entered_marker) { - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use entered marker @ %1\n", entered_marker->position())); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use entered marker @ %1\n", entered_marker->position())); return entered_marker->position(); } @@ -4646,14 +4729,16 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_ ep = EditAtPlayhead; } + MusicFrame snap_mf (0, 0); + switch (ep) { case EditAtPlayhead: - if (_dragging_playhead) { + if (_dragging_playhead && _control_scroll_target) { where = *_control_scroll_target; } else { where = _session->audible_frame(); } - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where)); break; case EditAtSelectedMarker: @@ -4666,7 +4751,7 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_ } else { where = loc->end(); } - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use selected marker @ %1\n", where)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use selected marker @ %1\n", where)); break; } } @@ -4678,8 +4763,10 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_ /* XXX not right but what can we do ? */ return 0; } - snap_to (where); - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use mouse @ %1\n", where)); + snap_mf.frame = where; + snap_to (snap_mf); + where = snap_mf.frame; + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use mouse @ %1\n", where)); break; } @@ -4696,7 +4783,7 @@ Editor::set_loop_range (framepos_t start, framepos_t end, string cmd) Location* tll; if ((tll = transport_loop_location()) == 0) { - Location* loc = new Location (*_session, start, end, _("Loop"), Location::IsAutoLoop); + Location* loc = new Location (*_session, start, end, _("Loop"), Location::IsAutoLoop, get_grid_music_divisions(0)); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (loc, true); _session->set_auto_loop_location (loc); @@ -4723,7 +4810,7 @@ Editor::set_punch_range (framepos_t start, framepos_t end, string cmd) Location* tpl; if ((tpl = transport_punch_location()) == 0) { - Location* loc = new Location (*_session, start, end, _("Punch"), Location::IsAutoPunch); + Location* loc = new Location (*_session, start, end, _("Punch"), Location::IsAutoPunch, get_grid_music_divisions(0)); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (loc, true); _session->set_auto_punch_location (loc); @@ -4828,7 +4915,7 @@ Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackVie */ RegionSelection -Editor::get_regions_from_selection_and_edit_point () +Editor::get_regions_from_selection_and_edit_point (EditIgnoreOption ignore, bool from_context_menu, bool from_outside_canvas) { RegionSelection regions; @@ -4845,7 +4932,7 @@ Editor::get_regions_from_selection_and_edit_point () /* no region selected or entered, but some selected tracks: * act on all regions on the selected tracks at the edit point */ - framepos_t const where = get_preferred_edit_position (); + framepos_t const where = get_preferred_edit_position (ignore, from_context_menu, from_outside_canvas); get_regions_at(regions, where, tracks); } } @@ -4987,6 +5074,38 @@ Editor::get_regions_corresponding_to (boost::shared_ptr region, vector region) const +{ + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { + RouteTimeAxisView* tatv; + if ((tatv = dynamic_cast (*i)) != 0) { + if (!tatv->track()) { + continue; + } + RegionView* marv = tatv->view()->find_view (region); + if (marv) { + return marv; + } + } + } + return NULL; +} + +RouteTimeAxisView* +Editor::rtav_from_route (boost::shared_ptr route) const +{ + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { + RouteTimeAxisView* rtav; + if ((rtav = dynamic_cast (*i)) != 0) { + if (rtav->route() == route) { + return rtav; + } + } + } + return NULL; +} + void Editor::show_rhythm_ferret () { @@ -5011,13 +5130,24 @@ Editor::first_idle () true ); dialog->present (); - ARDOUR_UI::instance()->flush_pending (); + ARDOUR_UI::instance()->flush_pending (60); } for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { (*t)->first_idle(); } + /* now that all regionviews should exist, setup region selection */ + + RegionSelection rs; + + for (list::iterator pr = selection->regions.pending.begin (); pr != selection->regions.pending.end (); ++pr) { + /* this is cumulative: rs is NOT cleared each time */ + get_regionviews_by_id (*pr, rs); + } + + selection->set (rs); + // first idle adds route children (automation tracks), so we need to redisplay here _routes->redisplay (); @@ -5113,22 +5243,15 @@ Editor::located () _pending_locate_request = false; _pending_initial_locate = false; + _last_update_time = 0; } void Editor::region_view_added (RegionView * rv) { - for (list::iterator pr = selection->regions.pending.begin (); pr != selection->regions.pending.end (); ++pr) { - if (rv->region ()->id () == (*pr)) { - selection->add (rv); - selection->regions.pending.erase (pr); - break; - } - } - MidiRegionView* mrv = dynamic_cast (rv); if (mrv) { - list > > > >::iterator rnote; + list > >::iterator rnote; for (rnote = selection->pending_midi_note_selection.begin(); rnote != selection->pending_midi_note_selection.end(); ++rnote) { if (rv->region()->id () == (*rnote).first) { mrv->select_notes ((*rnote).second); @@ -5147,21 +5270,37 @@ Editor::region_view_removed () _summary->set_background_dirty (); } -RouteTimeAxisView* -Editor::axis_view_from_route (boost::shared_ptr r) const +AxisView* +Editor::axis_view_by_stripable (boost::shared_ptr s) const { - TrackViewList::const_iterator j = track_views.begin (); - while (j != track_views.end()) { - RouteTimeAxisView* rtv = dynamic_cast (*j); - if (rtv && rtv->route() == r) { - return rtv; + for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) { + if ((*j)->stripable() == s) { + return *j; } - ++j; } return 0; } +AxisView* +Editor::axis_view_by_control (boost::shared_ptr c) const +{ + for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) { + if ((*j)->control() == c) { + return *j; + } + + TimeAxisView::Children kids = (*j)->get_child_list (); + + for (TimeAxisView::Children::iterator k = kids.begin(); k != kids.end(); ++k) { + if ((*k)->control() == c) { + return (*k).get(); + } + } + } + + return 0; +} TrackViewList Editor::axis_views_from_routes (boost::shared_ptr r) const @@ -5169,7 +5308,7 @@ Editor::axis_views_from_routes (boost::shared_ptr r) const TrackViewList t; for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { - TimeAxisView* tv = axis_view_from_route (*i); + TimeAxisView* tv = time_axis_view_from_stripable (*i); if (tv) { t.push_back (tv); } @@ -5228,6 +5367,8 @@ Editor::add_stripables (StripableList& sl) TrackViewList new_selection; bool from_scratch = (track_views.size() == 0); + sl.sort (Stripable::Sorter()); + for (StripableList::iterator s = sl.begin(); s != sl.end(); ++s) { if ((v = boost::dynamic_pointer_cast (*s)) != 0) { @@ -5276,8 +5417,7 @@ Editor::add_stripables (StripableList& sl) */ if (!from_scratch && !new_selection.empty()) { - selection->tracks.clear(); - selection->add (new_selection); + selection->set (new_selection); begin_selection_op_history(); } @@ -5341,6 +5481,16 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) next_tv = (*i); } + // skip VCAs (cannot be selected, n/a in editor-mixer) + if (dynamic_cast (next_tv)) { + /* VCAs are sorted last in line -- route_sorter.h, jump to top */ + next_tv = track_views.front(); + } + if (dynamic_cast (next_tv)) { + /* just in case: no master, only a VCA remains */ + next_tv = 0; + } + if (next_tv) { set_selected_mixer_strip (*next_tv); @@ -5357,6 +5507,9 @@ Editor::timeaxisview_deleted (TimeAxisView *tv) void Editor::hide_track_in_display (TimeAxisView* tv, bool apply_to_selection) { + if (!tv) { + return; + } if (apply_to_selection) { for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ) { @@ -5379,6 +5532,18 @@ Editor::hide_track_in_display (TimeAxisView* tv, bool apply_to_selection) } } +void +Editor::show_track_in_display (TimeAxisView* tv, bool move_into_view) +{ + if (!tv) { + return; + } + _routes->show_track_in_display (*tv); + if (move_into_view) { + ensure_time_axis_view_is_visible (*tv, false); + } +} + bool Editor::sync_track_view_list_and_routes () { @@ -5398,15 +5563,15 @@ Editor::foreach_time_axis_view (sigc::slot theslot) } } -/** Find a RouteTimeAxisView by the ID of its route */ -RouteTimeAxisView* -Editor::get_route_view_by_route_id (const PBD::ID& id) const +/** Find a StripableTimeAxisView by the ID of its stripable */ +StripableTimeAxisView* +Editor::get_stripable_time_axis_by_id (const PBD::ID& id) const { - RouteTimeAxisView* v; + StripableTimeAxisView* v; for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { - if((v = dynamic_cast(*i)) != 0) { - if(v->route()->id() == id) { + if((v = dynamic_cast(*i)) != 0) { + if(v->stripable()->id() == id) { return v; } } @@ -5631,8 +5796,6 @@ Editor::super_rapid_screen_update () /* PLAYHEAD AND VIEWPORT */ - 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 @@ -5642,46 +5805,92 @@ Editor::super_rapid_screen_update () * 2. if we're not rolling, there's nothing to do here (locates are handled elsewhere). * 3. if we're still at the same frame that we were last time, there's nothing to do. */ + if (_pending_locate_request || !_session->transport_rolling ()) { + _last_update_time = 0; + return; + } - if (!_pending_locate_request && _session->transport_speed() != 0 && frame != last_update_frame) { + if (_dragging_playhead) { + _last_update_time = 0; + return; + } - last_update_frame = frame; + bool latent_locate = false; + framepos_t frame = _session->audible_frame (&latent_locate); + const int64_t now = g_get_monotonic_time (); + double err = 0; - if (!_dragging_playhead) { - playhead_cursor->set_position (frame); - } + if (_session->exporting ()) { + /* freewheel/export may be faster or slower than transport_speed() / SR. + * Also exporting multiple ranges locates/jumps without a _pending_locate_request. + */ + _last_update_time = 0; + } - if (!_stationary_playhead) { + if (_last_update_time > 0) { + /* interpolate and smoothen playhead position */ + const double ds = (now - _last_update_time) * _session->transport_speed() * _session->nominal_frame_rate () * 1e-6; + framepos_t guess = playhead_cursor->current_frame () + rint (ds); + err = frame - guess; - if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0 && !pending_visual_change.being_handled) { - /* We only do this if we aren't already - handling a visual change (ie if - pending_visual_change.being_handled is - false) so that these requests don't stack - up there are too many of them to handle in - time. - */ - reset_x_origin_to_follow_playhead (); - } + guess += err * .12 + _err_screen_engine; // time-constant based on 25fps (super_rapid_screen_update) + _err_screen_engine += .0144 * (err - _err_screen_engine); // tc^2 - } else { +#if 0 // DEBUG + printf ("eng: %ld gui:%ld (%+6.1f) diff: %6.1f (err: %7.2f)\n", + frame, guess, ds, + err, _err_screen_engine); +#endif - if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0 && !pending_visual_change.being_handled) { - framepos_t const frame = playhead_cursor->current_frame (); - double target = ((double)frame - (double)current_page_samples()/2.0); - if (target <= 0.0) { - target = 0.0; - } - // compare to EditorCursor::set_position() - double const old_pos = sample_to_pixel_unrounded (leftmost_frame); - double const new_pos = sample_to_pixel_unrounded (target); - if (rint (new_pos) != rint (old_pos)) { - reset_x_origin (pixel_to_sample (floor (new_pos))); - } - } + frame = guess; + } else { + _err_screen_engine = 0; + } - } + if (err > 8192 || latent_locate) { + // in case of x-runs or freewheeling + _last_update_time = 0; + frame = _session->audible_frame (); + } else { + _last_update_time = now; + } + if (playhead_cursor->current_frame () == frame) { + return; + } + + playhead_cursor->set_position (frame); + + if (_session->requested_return_frame() >= 0) { + _last_update_time = 0; + return; + } + + if (!_follow_playhead || pending_visual_change.being_handled) { + /* We only do this if we aren't already + * handling a visual change (ie if + * pending_visual_change.being_handled is + * false) so that these requests don't stack + * up there are too many of them to handle in + * time. + */ + return; + } + + if (!_stationary_playhead) { + reset_x_origin_to_follow_playhead (); + } else { + framepos_t const frame = playhead_cursor->current_frame (); + double target = ((double)frame - (double)current_page_samples() / 2.0); + if (target <= 0.0) { + target = 0.0; + } + // compare to EditorCursor::set_position() + double const old_pos = sample_to_pixel_unrounded (leftmost_frame); + double const new_pos = sample_to_pixel_unrounded (target); + if (rint (new_pos) != rint (old_pos)) { + reset_x_origin (pixel_to_sample (new_pos)); + } } } @@ -5703,7 +5912,7 @@ Editor::session_going_away () clicked_routeview = 0; entered_regionview = 0; entered_track = 0; - last_update_frame = 0; + _last_update_time = 0; _drags->abort (); playhead_cursor->hide (); @@ -5743,6 +5952,9 @@ Editor::session_going_away () hide_measures (); clear_marker_display (); + delete tempo_lines; + tempo_lines = 0; + stop_step_editing (); if (own_window()) { @@ -5764,31 +5976,13 @@ Editor::trigger_script (int i) LuaInstance::instance()-> call_action (i); } -void -Editor::set_script_action_name (int i, const std::string& n) -{ - string const a = string_compose (X_("script-action-%1"), i + 1); - Glib::RefPtr act = ActionManager::get_action(X_("Editor"), a.c_str()); - assert (act); - if (n.empty ()) { - act->set_label (string_compose (_("Unset #%1"), i + 1)); - act->set_tooltip (_("no action bound")); - act->set_sensitive (false); - } else { - act->set_label (n); - act->set_tooltip (n); - act->set_sensitive (true); - } - KeyEditor::UpdateBindings (); -} - void Editor::show_editor_list (bool yn) { if (yn) { - _the_notebook.show (); + _editor_list_vbox.show (); } else { - _the_notebook.hide (); + _editor_list_vbox.hide (); } } @@ -5835,18 +6029,6 @@ Editor::update_region_layering_order_editor () void Editor::setup_fade_images () { - _fade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadein-linear"))); - _fade_in_images[FadeSymmetric] = new Gtk::Image (get_icon_path (X_("fadein-symmetric"))); - _fade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadein-fast-cut"))); - _fade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadein-slow-cut"))); - _fade_in_images[FadeConstantPower] = new Gtk::Image (get_icon_path (X_("fadein-constant-power"))); - - _fade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadeout-linear"))); - _fade_out_images[FadeSymmetric] = new Gtk::Image (get_icon_path (X_("fadeout-symmetric"))); - _fade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadeout-fast-cut"))); - _fade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadeout-slow-cut"))); - _fade_out_images[FadeConstantPower] = new Gtk::Image (get_icon_path (X_("fadeout-constant-power"))); - _xfade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadein-linear"))); _xfade_in_images[FadeSymmetric] = new Gtk::Image (get_icon_path (X_("fadein-symmetric"))); _xfade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadein-fast-cut")));