#include "ardour/tempo.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
+#include "ardour/audioengine.h"
#include "control_protocol/control_protocol.h"
#include "editor_regions.h"
#include "editor_locations.h"
#include "editor_snapshots.h"
+#include "editor_summary.h"
#include "i18n.h"
N_("Seconds"),
N_("Minutes"),
N_("Beats/32"),
+ N_("Beats/28"),
+ N_("Beats/24"),
N_("Beats/16"),
+ N_("Beats/14"),
+ N_("Beats/12"),
+ N_("Beats/10"),
N_("Beats/8"),
+ N_("Beats/7"),
+ N_("Beats/6"),
+ N_("Beats/5"),
N_("Beats/4"),
N_("Beats/3"),
+ N_("Beats/2"),
N_("Beats"),
N_("Bars"),
N_("Marks"),
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::time_fx_cursor = 0;
cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
}
+#ifdef GTKOSX
+static void
+pane_size_watcher (Paned* pane)
+{
+ /* if the handle of a pane vanishes into (at least) the tabs of a notebook,
+ it is no longer accessible. so stop that. this doesn't happen on X11,
+ just the quartz backend.
+
+ ugh.
+ */
+
+ int max_width_of_lhs = GTK_WIDGET(pane->gobj())->allocation.width - 25;
+
+ gint pos = pane->get_position ();
+
+ if (pos > max_width_of_lhs) {
+ pane->set_position (max_width_of_lhs);
+ }
+}
+#endif
+
Editor::Editor ()
+ : _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
+
/* time display buttons */
- : minsec_label (_("Mins:Secs"))
+ , minsec_label (_("Mins:Secs"))
, bbt_label (_("Bars:Beats"))
, timecode_label (_("Timecode"))
, frame_label (_("Samples"))
*/
, vertical_adjustment (0.0, 0.0, 10.0, 400.0)
- , horizontal_adjustment (0.0, 0.0, 20.0, 1200.0)
/* tool bar related */
, nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, false, true)
, meters_running(false)
, _pending_locate_request (false)
+ , _pending_initial_locate (false)
{
constructed = false;
clicked_crossfadeview = 0;
clicked_control_point = 0;
last_update_frame = 0;
- _drag = 0;
+ _drags = new DragManager (this);
current_mixer_strip = 0;
current_bbt_points = 0;
tempo_lines = 0;
last_autoscroll_y = 0;
autoscroll_active = false;
autoscroll_timeout_tag = -1;
- interthread_progress_window = 0;
logo_item = 0;
analysis_window = 0;
current_interthread_info = 0;
_show_measures = true;
- _show_waveforms_recording = true;
show_gain_after_trim = false;
verbose_cursor_on = true;
- route_removal = false;
last_item_entered = 0;
last_item_entered_n = 0;
have_pending_keyboard_selection = false;
_follow_playhead = true;
+ _stationary_playhead = false;
_xfade_visibility = true;
editor_ruler_menu = 0;
no_ruler_shown_update = false;
marker_menu = 0;
- start_end_marker_menu = 0;
+ session_range_marker_menu = 0;
range_marker_menu = 0;
marker_menu_item = 0;
- tm_marker_menu = 0;
+ tempo_or_meter_marker_menu = 0;
transport_marker_menu = 0;
new_transport_marker_menu = 0;
editor_mixer_strip_width = Wide;
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;
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;
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));
+ zoom_range_clock.ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed));
bbt_label.set_name ("EditorTimeButton");
bbt_label.set_size_request (-1, (int)timebar_height);
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));
h->pack_start (edit_controls_vbox);
controls_layout.add (*h);
- ARDOUR_UI::instance()->tooltips().set_tip (*_group_tabs, _("Groups: context-click for possible operations"));
-
controls_layout.set_name ("EditControlsBase");
controls_layout.add_events (Gdk::SCROLL_MASK);
controls_layout.signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false);
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" */
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")));
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);
summary_frame->add (*_summary);
summary_frame->show ();
- HBox* summary_hbox = manage (new HBox);
- summary_hbox->pack_start (*summary_arrows_left, false, false);
- summary_hbox->pack_start (*summary_frame, true, true);
- summary_hbox->pack_start (*summary_arrows_right, false, false);
+ _summary_hbox.pack_start (*summary_arrows_left, false, false);
+ _summary_hbox.pack_start (*summary_frame, true, true);
+ _summary_hbox.pack_start (*summary_arrows_right, false, false);
- editor_summary_pane->pack2(*summary_hbox);
+ 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<Paned*> (&edit_pane)));
+ editor_summary_pane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&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<Paned*> (&edit_pane)));
+#ifdef GTKOSX
+ Glib::PropertyProxy<int> proxy = edit_pane.property_position();
+ proxy.signal_changed().connect (bind (sigc::ptr_fun (pane_size_watcher), static_cast<Paned*> (&edit_pane)));
+#endif
top_hbox.pack_start (toolbar_frame, false, true);
HBox *hbox = manage (new HBox);
_playlist_selector = new PlaylistSelector();
_playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
- RegionView::RegionViewGoingAway.connect (*this, boost::bind (&Editor::catch_vanishing_regionview, this, _1));
+ RegionView::RegionViewGoingAway.connect (*this, invalidator (*this), ui_bind (&Editor::catch_vanishing_regionview, this, _1), gui_context());
/* nudge stuff */
nudge_forward_button.add (*(manage (new Image (::get_icon("nudge_right")))));
nudge_backward_button.add (*(manage (new Image (::get_icon("nudge_left")))));
- ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards"));
- ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards"));
-
nudge_forward_button.set_name ("TransportButton");
nudge_backward_button.set_name ("TransportButton");
/* allow external control surfaces/protocols to do various things */
- ControlProtocol::ZoomToSession.connect (*this, boost::bind (&Editor::temporal_zoom_session, this));
- ControlProtocol::ZoomIn.connect (*this, boost::bind (&Editor::temporal_zoom_step, this, false));
- ControlProtocol::ZoomOut.connect (*this, boost::bind (&Editor::temporal_zoom_step, this, true));
- ControlProtocol::ScrollTimeline.connect (*this, boost::bind (&Editor::control_scroll, this, _1));
- BasicUI::AccessAction.connect (*this, boost::bind (&Editor::access_action, this, _1, _2));
- Session::AskAboutPlaylistDeletion.connect (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1));
+ 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, boost::bind (&Editor::parameter_changed, this, _1));
+ Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&Editor::parameter_changed, this, _1), gui_context());
+
+ TimeAxisView::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Editor::timeaxisview_deleted, this, _1), gui_context());
_last_normalization_value = 0;
delete _routes;
delete _route_groups;
delete track_canvas;
- delete _drag;
+ delete _drags;
}
void
audioregionview by itself.
*/
- if (_drag && rv->get_canvas_group() == _drag->item() && !_drag->ending()) {
- _drag->end_grab (0);
- delete _drag;
- _drag = 0;
+ if (_drags->active() && _drags->have_item (rv->get_canvas_group()) && !_drags->ending()) {
+ _drags->abort ();
}
if (clicked_regionview == rv) {
}
if ((entered_regionview = rv) != 0) {
- entered_regionview->entered ();
+ entered_regionview->entered (internal_editing ());
}
}
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
+
+ reset_zoom (frames_per_unit);
}
present ();
if (act) {
act->activate();
}
-
-
}
void
Realized ();
}
-void
-Editor::start_scrolling ()
-{
- scroll_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
- (sigc::mem_fun(*this, &Editor::update_current_screen));
-
-}
-
-void
-Editor::stop_scrolling ()
-{
- scroll_connection.disconnect ();
-}
-
void
Editor::map_position_change (nframes64_t frame)
{
ENSURE_GUI_THREAD (*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);
}
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 ()
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();
/* catch up with the playhead */
_session->request_locate (playhead_cursor->current_frame);
+ _pending_initial_locate = true;
update_title ();
but use Gtkmm2ext::UI::instance()->call_slot();
*/
- _session->TransportStateChange.connect (_session_connections, boost::bind (&Editor::map_transport_state, this));
- _session->PositionChanged.connect (_session_connections, boost::bind (&Editor::map_position_change, this, _1));
- _session->RouteAdded.connect (_session_connections, boost::bind (&Editor::handle_new_route, this, _1));
- _session->DurationChanged.connect (_session_connections, boost::bind (&Editor::handle_new_duration, this));
- _session->DirtyChanged.connect (_session_connections, boost::bind (&Editor::update_title, this));
- _session->TimecodeOffsetChanged.connect (_session_connections, boost::bind (&Editor::update_just_timecode, this));
- _session->tempo_map().StateChanged.connect (_session_connections, boost::bind (&Editor::tempo_map_changed, this, _1));
- _session->Located.connect (_session_connections, boost::bind (&Editor::located, this));
- _session->config.ParameterChanged.connect (_session_connections, boost::bind (&Editor::parameter_changed, this, _1));
- _session->StateSaved.connect (_session_connections, boost::bind (&Editor::session_state_saved, this, _1));
- _session->locations()->added.connect (_session_connections, sigc::mem_fun(*this, &Editor::add_new_location));
- _session->locations()->removed.connect (_session_connections, sigc::mem_fun(*this, &Editor::location_gone));
- _session->locations()->changed.connect (_session_connections, sigc::mem_fun(*this, &Editor::refresh_location_display));
- _session->locations()->StateChanged.connect (_session_connections, sigc::mem_fun(*this, &Editor::refresh_location_display_s));
- _session->locations()->end_location()->changed.connect (_session_connections, sigc::mem_fun(*this, &Editor::end_location_changed));
- _session->history().Changed.connect (_session_connections, boost::bind (&Editor::history_changed, this));
+ _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;
_session->config.map_parameters (pc);
refresh_location_display ();
- handle_new_duration ();
restore_ruler_visibility ();
- //tempo_map_changed (Change (0));
+ //tempo_map_changed (PropertyChange (0));
_session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(static_cast<TimeAxisView*>(*i))->set_samples_per_unit (frames_per_unit);
}
- start_scrolling ();
-
+ super_rapid_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+ sigc::mem_fun (*this, &Editor::super_rapid_screen_update)
+ );
+
switch (_snap_type) {
case SnapToRegionStart:
case SnapToRegionEnd:
/* register for undo history */
_session->register_with_memento_command_factory(_id, this);
- start_updating ();
+ start_updating_meters ();
}
void
grabber_cursor = new Gdk::Cursor (HAND2);
+ {
+ Glib::RefPtr<Gdk::Pixbuf> grabber_note_pixbuf (::get_icon ("grabber_note"));
+ grabber_note_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_note_pixbuf, 5, 10);
+ }
+
{
Glib::RefPtr<Gdk::Pixbuf> grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point"));
grabber_edit_point_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_edit_point_pixbuf, 5, 17);
cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW);
+
+ {
+ Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("trim_left_cursor"));
+ left_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 5, 11);
+ }
+
+ {
+ Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("trim_right_cursor"));
+ right_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 23, 11);
+ }
+
+ {
+ Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("fade_in_cursor"));
+ fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 40);
+ }
+
+ {
+ Glib::RefPtr<Gdk::Pixbuf> 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);
case RegionItem:
case RegionViewName:
case RegionViewNameHighlight:
+ case LeftFrameHandle:
+ case RightFrameHandle:
if (with_selection) {
build_menu_function = &Editor::build_track_selection_context_menu;
} else {
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;
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())) {
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;
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
- Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * ds->speed()));
+ /* 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()) {
+ Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * tr->speed()));
if (selection->regions.size() > 1) {
// there's already a multiple selection: just add a
boost::shared_ptr<Region> dummy_region; // = NULL
add_region_context_items (rtv->view(), dummy_region, edit_items);
} else {
- for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+ for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) {
add_region_context_items (rtv->view(), (*i), edit_items);
}
}
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
if (atv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
boost::shared_ptr<AudioPlaylist> apl;
- if ((
ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
+ if ((
tr = atv->track()) && ((pl = tr->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
Playlist::RegionList* regions = pl->regions_at (frame);
AudioPlaylist::Crossfades xfades;
boost::shared_ptr<Region> dummy_region; // = NULL
add_region_context_items (atv->audio_view(), dummy_region, edit_items);
} else {
- for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+ for (Playlist::RegionList::reverse_iterator i = regions->rbegin(); i != regions->rend(); ++i) {
add_region_context_items (atv->audio_view(), (*i), edit_items);
}
}
}
items.push_back (MenuElem (str, sigc::bind (sigc::mem_fun(*this, &Editor::toggle_xfade_active), boost::weak_ptr<Crossfade> (xfade))));
- items.push_back (MenuElem (_("Edit"), sigc::bind (sigc::mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
+ items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun(*this, &Editor::edit_xfade), boost::weak_ptr<Crossfade> (xfade))));
if (xfade->can_follow_overlap()) {
if (xfade->following_overlap()) {
- str = _("Convert to short");
+ str = _("Convert to Short");
} else {
- str = _("Convert to full");
+ str = _("Convert to Full");
}
items.push_back (MenuElem (str, sigc::bind (sigc::mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
region_menu->signal_map_event().connect (
sigc::bind (sigc::mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(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 editor"), sigc::mem_fun(*this, &Editor::edit_region)));
+ items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::rename_region)));
+ if (mr) {
+ items.push_back (MenuElem (_("List Editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor)));
}
+ items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region)));
}
- items.push_back (MenuElem (_("Raise to top layer"), 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 (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)));
+ 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 (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 (_("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 (MenuElem (_("Spectral Analysis..."), sigc::mem_fun(*this, &Editor::analyze_region_selection)));
}
items.push_back (SeparatorElem());
}
region_lock_item->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_region_lock));
- items.push_back (CheckMenuElem (_("Glue to Bars&Beats")));
+ items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
CheckMenuItem* bbt_glue_item = static_cast<CheckMenuItem*>(&items.back());
- switch (region_to_check->positional_lock_style()) {
- case Region::MusicTime:
+ switch (region_to_check->position_lock_style()) {
+ case MusicTime:
bbt_glue_item->set_active (true);
break;
default:
break;
}
- bbt_glue_item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
+ bbt_glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_region_lock_style));
items.push_back (CheckMenuElem (_("Mute")));
CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
region_mute_item->set_active();
fooc.block (false);
}
+
+ items.push_back (MenuElem (_("Transpose..."), mem_fun(*this, &Editor::pitch_shift_regions)));
if (!Profile->get_sae()) {
items.push_back (CheckMenuElem (_("Opaque")));
}
}
- items.push_back (CheckMenuElem (_("Original position"), sigc::mem_fun(*this, &Editor::naturalize)));
+ items.push_back (CheckMenuElem (_("Original Position"), sigc::mem_fun(*this, &Editor::naturalize)));
if (region_to_check->at_natural_position()) {
items.back().set_sensitive (false);
}
items.push_back (SeparatorElem());
}
- items.push_back (MenuElem (_("Normalize"), sigc::mem_fun(*this, &Editor::normalize_region)));
+ items.push_back (MenuElem (_("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region)));
if (ar->scale_amplitude() != 1) {
items.push_back (MenuElem (_("Reset Gain"), 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 (MenuElem (_("Fork"), sigc::mem_fun(*this, &Editor::fork_region)));
items.push_back (SeparatorElem());
}
MenuList& nudge_items = nudge_menu->items();
nudge_menu->set_name ("ArdourContextMenu");
- nudge_items.push_back (MenuElem (_("Nudge fwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge bwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (sigc::mem_fun(*this, &Editor::nudge_forward_capture_offset))));
- nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (sigc::mem_fun(*this, &Editor::nudge_backward_capture_offset))));
+ nudge_items.push_back (MenuElem (_("Nudge Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Forward by Capture Offset"), (sigc::mem_fun(*this, &Editor::nudge_forward_capture_offset))));
+ nudge_items.push_back (MenuElem (_("Nudge Backward by Capture Offset"), (sigc::mem_fun(*this, &Editor::nudge_backward_capture_offset))));
items.push_back (MenuElem (_("Nudge"), *nudge_menu));
items.push_back (SeparatorElem());
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)));
+ 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)));
+ 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)));
+ 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());
region_edit_menu_split_item->set_sensitive (false);
}
- items.push_back (MenuElem (_("Make mono regions"), (sigc::mem_fun(*this, &Editor::split_multichannel_region))));
+ items.push_back (MenuElem (_("Make Mono Regions"), (sigc::mem_fun(*this, &Editor::split_multichannel_region))));
region_edit_menu_split_multichannel_item = &items.back();
items.push_back (MenuElem (_("Duplicate"), (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 (_("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)));
*/
string::size_type pos = 0;
- string menu_item_name = (region) ? region->name() : _("Selected regions");
+ string menu_item_name = (region) ? region->name() : _("Selected Regions");
while ((pos = menu_item_name.find ("_", pos)) != string::npos) {
menu_item_name.replace (pos, 1, "__");
}
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());
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)));
}
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
- play_items.push_back (MenuElem (_("Play from edit point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
- play_items.push_back (MenuElem (_("Play from start"), sigc::mem_fun(*this, &Editor::play_from_start)));
- play_items.push_back (MenuElem (_("Play region"), sigc::mem_fun(*this, &Editor::play_selected_region)));
+ play_items.push_back (MenuElem (_("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
+ play_items.push_back (MenuElem (_("Play From Start"), sigc::mem_fun(*this, &Editor::play_from_start)));
+ play_items.push_back (MenuElem (_("Play Region"), sigc::mem_fun(*this, &Editor::play_selected_region)));
play_items.push_back (SeparatorElem());
play_items.push_back (MenuElem (_("Loop Region"), sigc::mem_fun(*this, &Editor::loop_selected_region)));
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
- select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
+ select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
select_items.push_back (MenuElem (_("Select All"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
+ select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
+ select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Set range to loop range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Set range to punch range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch)));
+ select_items.push_back (MenuElem (_("Set Range to Loop Range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop)));
+ select_items.push_back (MenuElem (_("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch)));
select_items.push_back (SeparatorElem());
select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
- select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false)));
- select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true)));
- select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), sigc::mem_fun(*this, &Editor::select_range_between)));
+ select_items.push_back (MenuElem (_("Select All Between Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false)));
+ select_items.push_back (MenuElem (_("Select All Within Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true)));
+ select_items.push_back (MenuElem (_("Select Range Between Playhead and Edit Point"), sigc::mem_fun(*this, &Editor::select_range_between)));
edit_items.push_back (MenuElem (_("Select"), *select_menu));
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 (SeparatorElem());
-
edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
/* Adding new material */
nudge_menu->set_name ("ArdourContextMenu");
edit_items.push_back (SeparatorElem());
- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Entire Track Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
+ nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge Entire Track Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
- play_items.push_back (MenuElem (_("Play from edit point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
- play_items.push_back (MenuElem (_("Play from start"), sigc::mem_fun(*this, &Editor::play_from_start)));
+ play_items.push_back (MenuElem (_("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
+ play_items.push_back (MenuElem (_("Play From Start"), sigc::mem_fun(*this, &Editor::play_from_start)));
edit_items.push_back (MenuElem (_("Play"), *play_menu));
/* Selection */
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
- select_items.push_back (MenuElem (_("Select All in track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
+ select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
select_items.push_back (MenuElem (_("Select All"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all), Selection::Set)));
- select_items.push_back (MenuElem (_("Invert selection in track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
+ select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
+ select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Select all after edit point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
- select_items.push_back (MenuElem (_("Select all before edit point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
- select_items.push_back (MenuElem (_("Select all after playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
- select_items.push_back (MenuElem (_("Select all before playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
+ select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
+ select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
+ select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
+ select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
edit_items.push_back (MenuElem (_("Select"), *select_menu));
nudge_menu->set_name ("ArdourContextMenu");
edit_items.push_back (SeparatorElem());
- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Entire Track Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
+ nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Forward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge Entire Track Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Backward"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
instant_save ();
switch (_snap_type) {
- case SnapToAThirtysecondBeat:
- case SnapToASixteenthBeat:
- case SnapToAEighthBeat:
- case SnapToAQuarterBeat:
- case SnapToAThirdBeat:
+ case SnapToBeatDiv32:
+ case SnapToBeatDiv28:
+ case SnapToBeatDiv24:
+ case SnapToBeatDiv16:
+ case SnapToBeatDiv14:
+ case SnapToBeatDiv12:
+ case SnapToBeatDiv10:
+ case SnapToBeatDiv8:
+ case SnapToBeatDiv7:
+ case SnapToBeatDiv6:
+ case SnapToBeatDiv5:
+ case SnapToBeatDiv4:
+ case SnapToBeatDiv3:
+ case SnapToBeatDiv2:
compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
update_tempo_based_rulers ();
break;
default:
/* relax */
break;
- }
+ }
+
+ SnapChanged (); /* EMIT SIGNAL */
}
void
move (x, y);
if (_session && (prop = node.property ("playhead"))) {
- nframes64_t pos = atol (prop->value().c_str());
+ nframes64_t pos;
+ sscanf (prop->value().c_str(), "%" PRIi64, &pos);
playhead_cursor->set_position (pos);
} else {
playhead_cursor->set_position (0);
if ((prop = node.property ("mouse-mode"))) {
MouseMode m = str2mousemode(prop->value());
- mouse_mode = MouseMode ((int) m + 1); /* lie, force mode switch */
set_mouse_mode (m, true);
} else {
- mouse_mode = MouseGain; /* lie, to force the mode switch */
set_mouse_mode (MouseObject, true);
}
nframes64_t pos;
if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) {
reset_x_origin (pos);
- /* this hack prevents the initial call to update_current_screen() from doing re-centering on the playhead */
- last_update_frame = pos;
}
}
+ if ((prop = node.property ("y-origin")) != 0) {
+ reset_y_origin (atof (prop->value ()));
+ }
+
if ((prop = node.property ("internal-edit"))) {
bool yn = string_is_affirmative (prop->value());
RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit"));
}
}
- if ((prop = node.property ("edit-point"))) {
- set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
+ if ((prop = node.property ("join-object-range"))) {
+ join_object_range_button.set_active (string_is_affirmative (prop->value ()));
}
- if ((prop = node.property ("show-waveforms-recording"))) {
- bool yn = string_is_affirmative (prop->value());
- _show_waveforms_recording = !yn;
- RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformsWhileRecording"));
- if (act) {
- RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
- /* do it twice to force the change */
- tact->set_active (!yn);
- tact->set_active (yn);
- }
+ if ((prop = node.property ("edit-point"))) {
+ set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
}
if ((prop = node.property ("show-measures"))) {
}
}
+ if ((prop = node.property ("stationary-playhead"))) {
+ bool yn = (prop->value() == "yes");
+ set_stationary_playhead (yn);
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-stationary-playhead"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+ if (tact->get_active() != yn) {
+ tact->set_active (yn);
+ }
+ }
+ }
+
if ((prop = node.property ("region-list-sort-type"))) {
- _regions->reset_sort_type (str2regionlistsorttype(prop->value()), true);
+ RegionListSortType st;
+ _regions->reset_sort_type ((RegionListSortType) string_2_enum (prop->value(), st), true);
}
if ((prop = node.property ("xfades-visible"))) {
}
}
+ if ((prop = node.property (X_("editor-list-page")))) {
+ the_notebook.set_current_page (atoi (prop->value ()));
+ }
return 0;
}
snprintf(buf, sizeof(buf), "%d", yoff);
geometry->add_property("y-off", string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&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<Paned*>(&editor_summary_pane)->gobj()));
+ geometry->add_property("edit-vertical-pane-pos", string(buf));
node->add_child_nocopy (*geometry);
}
node->add_property ("playhead", buf);
snprintf (buf, sizeof (buf), "%" PRIi64, leftmost_frame);
node->add_property ("left-frame", buf);
+ snprintf (buf, sizeof (buf), "%f", vertical_adjustment.get_value ());
+ node->add_property ("y-origin", buf);
- node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
node->add_property ("show-measures", _show_measures ? "yes" : "no");
node->add_property ("follow-playhead", _follow_playhead ? "yes" : "no");
+ node->add_property ("stationary-playhead", _stationary_playhead ? "yes" : "no");
node->add_property ("xfades-visible", _xfade_visibility ? "yes" : "no");
- node->add_property ("region-list-sort-type", enum2str (_regions->sort_type ()));
+ node->add_property ("region-list-sort-type", enum_2_string (_regions->sort_type ()));
node->add_property ("mouse-mode", enum2str(mouse_mode));
node->add_property ("internal-edit", _internal_editing ? "yes" : "no");
+ node->add_property ("join-object-range", join_object_range_button.get_active () ? "yes" : "no");
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
if (act) {
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);
+
return *node;
}
/** Snap a position to the grid, if appropriate, taking into account current
* grid settings and also the state of any snap modifier keys that may be pressed.
* @param start Position to snap.
- * @param event Event to get current key modifier information from.
+ * @param event Event to get current key modifier information from, or 0.
*/
void
Editor::snap_to_with_modifier (nframes64_t& start, GdkEvent const * event, int32_t direction, bool for_mark)
{
- if (!_session) {
+ if (!_session || !event) {
return;
}
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 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) {
mouse_timefx_button.set_relief(Gtk::RELIEF_NONE);
mouse_audition_button.set_relief(Gtk::RELIEF_NONE);
// internal_edit_button.set_relief(Gtk::RELIEF_NONE);
+ join_object_range_button.set_relief(Gtk::RELIEF_NONE);
HBox* mode_box = manage(new HBox);
mode_box->set_border_width (2);
mode_box->set_spacing(4);
- mouse_mode_button_box.set_spacing(1);
- mouse_mode_button_box.pack_start(mouse_move_button, true, true);
- if (!Profile->get_sae()) {
- mouse_mode_button_box.pack_start(mouse_select_button, true, true);
+
+ /* table containing mode buttons */
+
+ HBox* mouse_mode_button_box = manage (new HBox ());
+
+ if (Profile->get_sae()) {
+ mouse_mode_button_box->pack_start (mouse_move_button);
+ } else {
+ mouse_mode_button_box->pack_start (mouse_move_button);
+ mouse_mode_button_box->pack_start (join_object_range_button);
+ mouse_mode_button_box->pack_start (mouse_select_button);
}
- mouse_mode_button_box.pack_start(mouse_zoom_button, true, true);
+
+ mouse_mode_button_box->pack_start (mouse_zoom_button);
+
if (!Profile->get_sae()) {
- mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
+ mouse_mode_button_box->pack_start (mouse_gain_button);
}
- mouse_mode_button_box.pack_start(mouse_timefx_button, true, true);
- mouse_mode_button_box.pack_start(mouse_audition_button, true, true);
- mouse_mode_button_box.pack_start(internal_edit_button, true, true);
- mouse_mode_button_box.set_homogeneous(true);
+
+ mouse_mode_button_box->pack_start (mouse_timefx_button);
+ mouse_mode_button_box->pack_start (mouse_audition_button);
+ mouse_mode_button_box->pack_start (internal_edit_button);
vector<string> edit_mode_strings;
edit_mode_strings.push_back (edit_mode_to_string (Slide));
set_popdown_strings (edit_mode_selector, edit_mode_strings, true);
edit_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_mode_selection_done));
- mode_box->pack_start(edit_mode_selector);
- mode_box->pack_start(mouse_mode_button_box);
+ mode_box->pack_start (edit_mode_selector);
+ mode_box->pack_start (*mouse_mode_button_box);
- mouse_mode_tearoff = manage (new TearOff (*mode_box));
- mouse_mode_tearoff->set_name ("MouseModeBase");
- mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (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<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
- mouse_mode_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
- mouse_mode_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window()));
- mouse_mode_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &mouse_mode_tearoff->tearoff_window(), 1));
+ _mouse_mode_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_mouse_mode_tearoff->tearoff_window()));
+ _mouse_mode_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &_mouse_mode_tearoff->tearoff_window(), 1));
+ _mouse_mode_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_mouse_mode_tearoff->tearoff_window()));
+ _mouse_mode_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &_mouse_mode_tearoff->tearoff_window(), 1));
mouse_move_button.set_mode (false);
mouse_select_button.set_mode (false);
mouse_zoom_button.set_mode (false);
mouse_timefx_button.set_mode (false);
mouse_audition_button.set_mode (false);
+ join_object_range_button.set_mode (false);
mouse_move_button.set_name ("MouseModeButton");
mouse_select_button.set_name ("MouseModeButton");
mouse_zoom_button.set_name ("MouseModeButton");
mouse_timefx_button.set_name ("MouseModeButton");
mouse_audition_button.set_name ("MouseModeButton");
-
internal_edit_button.set_name ("MouseModeButton");
+ join_object_range_button.set_name ("MouseModeButton");
mouse_move_button.unset_flags (CAN_FOCUS);
mouse_select_button.unset_flags (CAN_FOCUS);
mouse_timefx_button.unset_flags (CAN_FOCUS);
mouse_audition_button.unset_flags (CAN_FOCUS);
internal_edit_button.unset_flags (CAN_FOCUS);
+ join_object_range_button.unset_flags (CAN_FOCUS);
/* Zoom */
- 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_BUTTON))));
+ zoom_in_button.set_image (*(manage (new Image (Stock::ZOOM_IN, Gtk::ICON_SIZE_MENU))));
zoom_in_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In"));
zoom_out_button.set_name ("EditorTimeButton");
- zoom_out_button.set_image (*(manage (new Image (Stock::ZOOM_OUT, Gtk::ICON_SIZE_BUTTON))));
+ zoom_out_button.set_image (*(manage (new Image (Stock::ZOOM_OUT, Gtk::ICON_SIZE_MENU))));
zoom_out_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom Out"));
zoom_out_full_button.set_name ("EditorTimeButton");
- zoom_out_full_button.set_image (*(manage (new Image (Stock::ZOOM_100, Gtk::ICON_SIZE_BUTTON))));
+ zoom_out_full_button.set_image (*(manage (new Image (Stock::ZOOM_100, Gtk::ICON_SIZE_MENU))));
zoom_out_full_button.signal_clicked().connect (sigc::mem_fun(*this, &Editor::temporal_zoom_session));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
zoom_focus_selector.set_name ("ZoomFocusSelector");
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));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
- 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);
/* Track zoom buttons */
tav_expand_button.set_name ("TrackHeightButton");
tav_expand_button.set_size_request(-1,20);
tav_expand_button.add (*(manage (new Image (::get_icon("tav_exp")))));
tav_expand_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), true));
- ARDOUR_UI::instance()->tooltips().set_tip (tav_expand_button, _("Expand Tracks"));
tav_shrink_button.set_name ("TrackHeightButton");
tav_shrink_button.set_size_request(-1,20);
tav_shrink_button.add (*(manage (new Image (::get_icon("tav_shrink")))));
tav_shrink_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), false));
- ARDOUR_UI::instance()->tooltips().set_tip (tav_shrink_button, _("Shrink Tracks"));
-
- 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_expand_button);
+ _zoom_box.pack_start (tav_shrink_button);
+ _zoom_box.pack_start (zoom_focus_selector);
+
+ _zoom_tearoff = manage (new TearOff (_zoom_box));
+
+ _zoom_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_zoom_tearoff->tearoff_window()));
+ _zoom_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &_zoom_tearoff->tearoff_window(), 0));
+ _zoom_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_zoom_tearoff->tearoff_window()));
+ _zoom_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &_zoom_tearoff->tearoff_window(), 0));
+
snap_box.set_spacing (1);
snap_box.set_border_width (2);
snap_type_selector.set_name ("SnapTypeSelector");
set_popdown_strings (snap_type_selector, snap_type_strings, true);
snap_type_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::snap_type_selection_done));
- ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Snap/Grid Units"));
snap_mode_selector.set_name ("SnapModeSelector");
set_popdown_strings (snap_mode_selector, snap_mode_strings, true);
snap_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::snap_mode_selection_done));
- ARDOUR_UI::instance()->tooltips().set_tip (snap_mode_selector, _("Snap/Grid Mode"));
edit_point_selector.set_name ("EditPointSelector");
set_popdown_strings (edit_point_selector, edit_point_strings, true);
edit_point_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_point_selection_done));
- ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point"));
snap_box.pack_start (snap_mode_selector, false, false);
snap_box.pack_start (snap_type_selector, false, false);
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<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
- tools_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
- tools_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
- &tools_tearoff->tearoff_window()));
- tools_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
- &tools_tearoff->tearoff_window(), 0));
+ _tools_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_tools_tearoff->tearoff_window()));
+ _tools_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &_tools_tearoff->tearoff_window(), 0));
+ _tools_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &_tools_tearoff->tearoff_window()));
+ _tools_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&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);
toolbar_frame.add (toolbar_base);
}
+void
+Editor::setup_tooltips ()
+{
+ ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects"));
+ ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation"));
+ ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range"));
+ ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions"));
+ ARDOUR_UI::instance()->set_tip (mouse_audition_button, _("Listen to Specific Regions"));
+ ARDOUR_UI::instance()->set_tip (join_object_range_button, _("Select/Move Objects or Ranges"));
+ ARDOUR_UI::instance()->set_tip (internal_edit_button, _("Edit Region Contents (e.g. notes)"));
+ ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: context-click for possible operations"));
+ ARDOUR_UI::instance()->set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards"));
+ ARDOUR_UI::instance()->set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards"));
+ ARDOUR_UI::instance()->set_tip (zoom_in_button, _("Zoom In"));
+ ARDOUR_UI::instance()->set_tip (zoom_out_button, _("Zoom Out"));
+ ARDOUR_UI::instance()->set_tip (zoom_out_full_button, _("Zoom to Session"));
+ ARDOUR_UI::instance()->set_tip (zoom_focus_selector, _("Zoom focus"));
+ ARDOUR_UI::instance()->set_tip (tav_expand_button, _("Expand Tracks"));
+ ARDOUR_UI::instance()->set_tip (tav_shrink_button, _("Shrink Tracks"));
+ ARDOUR_UI::instance()->set_tip (snap_type_selector, _("Snap/Grid Units"));
+ ARDOUR_UI::instance()->set_tip (snap_mode_selector, _("Snap/Grid Mode"));
+ ARDOUR_UI::instance()->set_tip (edit_point_selector, _("Edit point"));
+ ARDOUR_UI::instance()->set_tip (midi_sound_notes, _("Sound Notes"));
+ ARDOUR_UI::instance()->set_tip (midi_panic_button, _("Send note off and reset controller messages on all MIDI channels"));
+}
+
void
Editor::midi_panic ()
{
/* Midi sound notes */
midi_sound_notes.add (*(manage (new Image (::get_icon("midi_sound_notes")))));
midi_sound_notes.set_relief(Gtk::RELIEF_NONE);
- ARDOUR_UI::instance()->tooltips().set_tip (midi_sound_notes, _("Sound Notes"));
midi_sound_notes.unset_flags (CAN_FOCUS);
/* Panic */
act = ActionManager::get_action (X_("MIDI"), X_("panic"));
midi_panic_button.set_name("MidiPanicButton");
- ARDOUR_UI::instance()->tooltips().set_tip (midi_panic_button, _("Send note off and reset controller messages on all MIDI channels"));
act->connect_proxy (midi_panic_button);
panic_box.pack_start (midi_sound_notes , true, true);
{
ENSURE_GUI_THREAD (*this, &Editor::map_transport_state)
- if (_session->transport_stopped()) {
+ if (_session && _session->transport_stopped()) {
have_pending_keyboard_selection = false;
}
Editor::begin_reversible_command (string name)
{
if (_session) {
- before = &get_state();
_session->begin_reversible_command (name);
}
}
Editor::commit_reversible_command ()
{
if (_session) {
- _session->commit_reversible_command (new MementoCommand<Editor>(*this, before, &get_state()));
+ _session->commit_reversible_command ();
}
}
{
RouteGroup *route_group = 0;
- if ((route_group == route.route_group()) != 0) {
+ if ((route_group = route.route_group()) != 0) {
route_group->apply (&Route::set_mute, yn, this);
} else {
route.set_mute (yn, this);
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;
string choice = snap_type_selector.get_active_text();
SnapType snaptype = SnapToBeat;
- if (choice == _("Beats/3")) {
- snaptype = SnapToAThirdBeat;
+ if (choice == _("Beats/2")) {
+ snaptype = SnapToBeatDiv2;
+ } else if (choice == _("Beats/3")) {
+ snaptype = SnapToBeatDiv3;
} else if (choice == _("Beats/4")) {
- snaptype = SnapToAQuarterBeat;
+ snaptype = SnapToBeatDiv4;
+ } else if (choice == _("Beats/5")) {
+ snaptype = SnapToBeatDiv5;
+ } else if (choice == _("Beats/6")) {
+ snaptype = SnapToBeatDiv6;
+ } else if (choice == _("Beats/7")) {
+ snaptype = SnapToBeatDiv7;
} else if (choice == _("Beats/8")) {
- snaptype = SnapToAEighthBeat;
+ snaptype = SnapToBeatDiv8;
+ } else if (choice == _("Beats/10")) {
+ snaptype = SnapToBeatDiv10;
+ } else if (choice == _("Beats/12")) {
+ snaptype = SnapToBeatDiv12;
+ } else if (choice == _("Beats/14")) {
+ snaptype = SnapToBeatDiv14;
} else if (choice == _("Beats/16")) {
- snaptype = SnapToASixteenthBeat;
+ snaptype = SnapToBeatDiv16;
+ } else if (choice == _("Beats/24")) {
+ snaptype = SnapToBeatDiv24;
+ } else if (choice == _("Beats/28")) {
+ snaptype = SnapToBeatDiv28;
} else if (choice == _("Beats/32")) {
- snaptype = SnapToAThirtysecondBeat;
+ snaptype = SnapToBeatDiv32;
} else if (choice == _("Beats")) {
snaptype = SnapToBeat;
} else if (choice == _("Bars")) {
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;
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());
}
if (which == static_cast<Paned*> (&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);
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<Paned*> (&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);
}
}
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);
}
if (_follow_playhead != yn) {
if ((_follow_playhead = yn) == true) {
/* catch up */
- update_current_screen ();
+ reset_x_origin_to_follow_playhead ();
}
instant_save ();
}
}
+void
+Editor::toggle_stationary_playhead ()
+{
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-stationary-playhead"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::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<Crossfade> wxfade)
{
}
cew.apply ();
- xfade->StateChanged (Change (~0));
+ PropertyChange all_crossfade_properties;
+ all_crossfade_properties.add (ARDOUR::Properties::active);
+ all_crossfade_properties.add (ARDOUR::Properties::follow_overlap);
+ xfade->PropertyChanged (all_crossfade_properties);
}
PlaylistSelector&
return 1.0;
break;
- case SnapToAThirtysecondBeat:
+ case SnapToBeatDiv32:
return 1.0/32.0;
break;
-
- case SnapToASixteenthBeat:
+ case SnapToBeatDiv28:
+ return 1.0/28.0;
+ break;
+ case SnapToBeatDiv24:
+ return 1.0/24.0;
+ break;
+ case SnapToBeatDiv16:
return 1.0/16.0;
break;
-
- case SnapToAEighthBeat:
+ case SnapToBeatDiv14:
+ return 1.0/14.0;
+ break;
+ case SnapToBeatDiv12:
+ return 1.0/12.0;
+ break;
+ case SnapToBeatDiv10:
+ return 1.0/10.0;
+ break;
+ case SnapToBeatDiv8:
return 1.0/8.0;
break;
-
- case SnapToAQuarterBeat:
+ case SnapToBeatDiv7:
+ return 1.0/7.0;
+ break;
+ case SnapToBeatDiv6:
+ return 1.0/6.0;
+ break;
+ case SnapToBeatDiv5:
+ return 1.0/5.0;
+ break;
+ case SnapToBeatDiv4:
return 1.0/4.0;
break;
-
- case SnapToAThirdBeat:
+ case SnapToBeatDiv3:
return 1.0/3.0;
break;
+ case SnapToBeatDiv2:
+ return 1.0/2.0;
+ break;
case SnapToBar:
if (_session) {
return 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<Playlist> 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."),
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);
}
}
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));
}
/**
begin_reversible_command (_("new playlists"));
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists->get (playlists);
- mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, RouteGroup::Edit);
+ mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::edit.property_id);
commit_reversible_command ();
}
begin_reversible_command (_("copy playlists"));
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists->get (playlists);
- mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, RouteGroup::Edit);
+ mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::edit.property_id);
commit_reversible_command ();
}
begin_reversible_command (_("clear playlists"));
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
_session->playlists->get (playlists);
- mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, RouteGroup::Edit);
+ mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::edit.property_id);
commit_reversible_command ();
}
// return key_press_focus_accelerator_handler (*this, ev);
}
+/** Queue up a change to the viewport x origin.
+ * @param frame New x origin.
+ */
void
Editor::reset_x_origin (nframes64_t frame)
{
- //cerr << "resetting x origin" << endl;
queue_visual_change (frame);
}
void
Editor::reposition_and_zoom (nframes64_t frame, double fpu)
{
- //cerr << "Editor::reposition_and_zoom () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG
reset_x_origin (frame);
reset_zoom (fpu);
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
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
void
Editor::post_zoom ()
{
- nframes64_t cef = 0;
-
// convert fpu to frame count
nframes64_t frames = (nframes64_t) floor (frames_per_unit * _canvas_width);
}
}
- 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) {
Editor::queue_visual_change (nframes64_t where)
{
pending_visual_change.add (VisualChange::TimeOrigin);
-
- /* if we're moving beyond the end, make sure the upper limit of the horizontal adjustment
- can reach.
- */
-
- if (_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 ();
}
VisualChange::Type p = pending_visual_change.pending;
pending_visual_change.pending = (VisualChange::Type) 0;
- double last_time_origin = horizontal_adjustment.get_value();
+ double last_time_origin = horizontal_position ();
if (p & VisualChange::ZoomLevel) {
set_frames_per_unit (pending_visual_change.frames_per_unit);
update_tempo_based_rulers ();
}
if (p & VisualChange::TimeOrigin) {
- horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit);
+ set_horizontal_position (pending_visual_change.time_origin / frames_per_unit);
}
if (p & VisualChange::YOrigin) {
vertical_adjustment.set_value (pending_visual_change.y_origin);
}
- nframes64_t csf=0, cef=0;
- nframes64_t current_time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
-
- if (_session) {
- csf = _session->current_start_frame();
- cef = _session->current_end_frame();
- }
-
- /* if we seek beyond the current end of the canvas, move the end */
-
-
- if (last_time_origin == horizontal_adjustment.get_value() ) {
+ if (last_time_origin == horizontal_position ()) {
/* changed signal not emitted */
update_fixed_rulers ();
redisplay_tempo (true);
}
- if (current_time_origin != pending_visual_change.time_origin) {
- cef += current_page_frames() / 10; // Add a little extra so we can see the end marker
- horizontal_adjustment.set_upper (cef / frames_per_unit);
- horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit);
- } else {
- update_fixed_rulers();
- redisplay_tempo (true);
- }
-
_summary->set_overlays_dirty ();
- // cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG
pending_visual_change.idle_handler_id = -1;
return 0; /* this is always a one-shot call */
}
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
+ if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_at (
- (nframes64_t) floor ( (double)where * ds->speed()));
+ (nframes64_t) floor ( (double)where * tr->speed()));
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
RegionView* rv = rtv->view()->find_view (*i);
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
if (rtv) {
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
boost::shared_ptr<Playlist> pl;
- if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
+ if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Playlist::RegionList* regions = pl->regions_touched (
- (nframes64_t) floor ( (double)where * ds->speed()), max_frames);
+ (nframes64_t) floor ( (double)where * tr->speed()), max_frames);
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
for (RegionSelection::iterator i = rs.begin (); i != rs.end(); ++i) {
RouteGroup* g = (*i)->get_time_axis_view().route_group ();
- if (g && g->active_property (RouteGroup::Edit)) {
+ if (g && g->is_active() && g->is_edit()) {
tracks.add (axis_views_from_routes (g->route_list()));
}
boost::shared_ptr<Playlist> pl;
vector<boost::shared_ptr<Region> > results;
RegionView* marv;
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> 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);
}
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);
_have_idled = true;
}
-static gboolean
-_idle_resizer (gpointer arg)
+gboolean
+Editor::_idle_resize (gpointer arg)
{
return ((Editor*)arg)->idle_resize ();
}
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;
}
}
/* 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;
}
}
}
}
+ _pending_resize_amount = 0;
flush_canvas ();
_group_tabs->set_dirty ();
resize_idle_id = -1;
void
Editor::located ()
{
- ENSURE_GUI_THREAD (*this, &Editor::located)
+ ENSURE_GUI_THREAD (*this, &Editor::located);
+
+ playhead_cursor->set_position (_session->audible_frame ());
+ if (_follow_playhead && !_pending_initial_locate) {
+ reset_x_origin_to_follow_playhead ();
+ }
_pending_locate_request = false;
+ _pending_initial_locate = false;
}
void
_summary->set_dirty ();
}
-void
-Editor::streamview_height_changed ()
-{
- _summary->set_dirty ();
-}
-
TimeAxisView*
Editor::axis_view_from_route (boost::shared_ptr<Route> r) const
{
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
- if (route->is_hidden()) {
+ if (route->is_hidden() || route->is_monitor()) {
continue;
}
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));
-
- rtv->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, rtv));
}
_routes->routes_added (new_views);
}
void
-Editor::remove_route (TimeAxisView *tv)
+Editor::timeaxisview_deleted (TimeAxisView *tv)
{
- ENSURE_GUI_THREAD (*this, &Editor::remove_route, tv)
-
- TrackViewList::iterator i;
-
- boost::shared_ptr<Route> route;
- RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (tv);
- if (rtav) {
- route = rtav->route ();
+ if (_session && _session->deletion_in_progress()) {
+ /* the situation is under control */
+ return;
}
+
+ ENSURE_GUI_THREAD (*this, &Editor::timeaxisview_deleted, tv);
- TimeAxisView* next_tv = 0;
+
+ _routes->route_removed (tv);
if (tv == entered_track) {
entered_track = 0;
}
+
+ /* remove it from the list of track views */
+
+ TrackViewList::iterator i;
if ((i = find (track_views.begin(), track_views.end(), tv)) != track_views.end()) {
+ i = track_views.erase (i);
+ }
- i = track_views.erase (i);
+ /* update whatever the current mixer strip is displaying, if revelant */
- if (track_views.empty()) {
- next_tv = 0;
- } else if (i == track_views.end()) {
- next_tv = track_views.front();
- } else {
- next_tv = (*i);
- }
- }
+ boost::shared_ptr<Route> route;
+ RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (tv);
+
+ if (rtav) {
+ route = rtav->route ();
+ }
if (current_mixer_strip && current_mixer_strip->route() == route) {
- if (next_tv) {
- set_selected_mixer_strip (*next_tv);
- } else {
- /* make the editor mixer strip go away setting the
- * button to inactive (which also unticks the menu option)
- */
+ TimeAxisView* next_tv;
- ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer");
- }
- }
+ if (track_views.empty()) {
+ next_tv = 0;
+ } else if (i == track_views.end()) {
+ next_tv = track_views.front();
+ } else {
+ next_tv = (*i);
+ }
+
+
+ if (next_tv) {
+ set_selected_mixer_strip (*next_tv);
+ } else {
+ /* make the editor mixer strip go away setting the
+ * button to inactive (which also unticks the menu option)
+ */
+
+ ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer");
+ }
+ }
}
void
-Editor::hide_track_in_display (TimeAxisView& tv, bool /*temponly*/)
+Editor::hide_track_in_display (TimeAxisView* tv, bool /*temponly*/)
{
- RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (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
}
void
-Editor::remove_a_region (boost::shared_ptr<Region> r)
+Editor::show_a_region (boost::shared_ptr<Region> r)
{
- _session->remove_region_from_region_list (r);
+ r->set_hidden (false);
}
void
_regions->selection_mapover (sigc::mem_fun (*this, &Editor::hide_a_region));
}
+void
+Editor::show_region_in_region_list ()
+{
+ _regions->selection_mapover (sigc::mem_fun (*this, &Editor::show_a_region));
+}
+
void
Editor::start_step_editing ()
{
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;
+
+ if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
+
+ if (_session->transport_speed() < 0) {
+
+ if (frame > (current_page_frames() / 2)) {
+ center_screen (frame-(current_page_frames()/2));
+ } else {
+ center_screen (current_page_frames()/2);
+ }
+
+ } else {
+
+ if (frame < leftmost_frame) {
+ /* moving left */
+ nframes64_t l = 0;
+ if (_session->transport_rolling()) {
+ /* rolling; end up with the playhead at the right of the page */
+ l = frame - current_page_frames ();
+ } else {
+ /* not rolling: end up with the playhead 3/4 of the way along the page */
+ l = frame - (3 * current_page_frames() / 4);
+ }
+
+ if (l < 0) {
+ l = 0;
+ }
+
+ center_screen_internal (l + (current_page_frames() / 2), current_page_frames ());
+ } else {
+ /* moving right */
+ if (_session->transport_rolling()) {
+ /* rolling: end up with the playhead on the left of the page */
+ center_screen_internal (frame + (current_page_frames() / 2), current_page_frames ());
+ } else {
+ /* not rolling: end up with the playhead 1/4 of the way along the page */
+ center_screen_internal (frame + (current_page_frames() / 4), current_page_frames ());
+ }
+ }
+ }
+ }
+}
+
+void
+Editor::super_rapid_screen_update ()
+{
+ if (!_session || !_session->engine().running()) {
+ return;
+ }
+
+ /* METERING / MIXER STRIPS */
+
+ /* update track meters, if required */
+ if (is_mapped() && meters_running) {
+ RouteTimeAxisView* rtv;
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
+ rtv->fast_update ();
+ }
+ }
+ }
+
+ /* and any current mixer strip */
+ if (current_mixer_strip) {
+ current_mixer_strip->fast_update ();
+ }
+
+ /* PLAYHEAD AND VIEWPORT */
+
+ nframes64_t const frame = _session->audible_frame();
+
+ /* There are a few reasons why we might not update the playhead / viewport stuff:
+ *
+ * 1. we don't update things when there's a pending locate request, otherwise
+ * when the editor requests a locate there is a chance that this method
+ * will move the playhead before the locate request is processed, causing
+ * a visual glitch.
+ * 2. if we're not rolling, there's nothing to do here (locates are handled elsewhere).
+ * 3. if we're still at the same frame that we were last time, there's nothing to do.
+ */
+
+ if (!_pending_locate_request && _session->transport_speed() != 0 && frame != last_update_frame) {
+
+ last_update_frame = frame;
+
+ if (!_dragging_playhead) {
+ playhead_cursor->set_position (frame);
+ }
+
+ if (!_stationary_playhead) {
+
+ if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0) {
+ reset_x_origin_to_follow_playhead ();
+ }
+
+ } else {
+
+ /* don't do continuous scroll till the new position is in the rightmost quarter of the
+ editor canvas
+ */
+#if 0
+ // FIXME DO SOMETHING THAT WORKS HERE - this is 2.X code
+ double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit;
+ if (target <= 0.0) {
+ target = 0.0;
+ }
+ if (fabs(target - current) < current_page_frames() / frames_per_unit) {
+ target = (target * 0.15) + (current * 0.85);
+ } else {
+ /* relax */
+ }
+
+ current = target;
+ set_horizontal_position (current);
+#endif
+ }
+
+ }
+}
+
+
+void
+Editor::session_going_away ()
+{
+ _have_idled = false;
+
+ _session_connections.drop_connections ();
+
+ super_rapid_screen_update_connection.disconnect ();
+
+ selection->clear ();
+ cut_buffer->clear ();
+
+ clicked_regionview = 0;
+ clicked_axisview = 0;
+ clicked_routeview = 0;
+ clicked_crossfadeview = 0;
+ entered_regionview = 0;
+ entered_track = 0;
+ last_update_frame = 0;
+ _drags->abort ();
+
+ playhead_cursor->canvas_item.hide ();
+
+ /* rip everything out of the list displays */
+
+ _regions->clear ();
+ _routes->clear ();
+ _route_groups->clear ();
+
+ /* do this first so that deleting a track doesn't reset cms to null
+ and thus cause a leak.
+ */
+
+ if (current_mixer_strip) {
+ if (current_mixer_strip->get_parent() != 0) {
+ global_hpacker.remove (*current_mixer_strip);
+ }
+ delete current_mixer_strip;
+ current_mixer_strip = 0;
+ }
+
+ /* delete all trackviews */
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ delete *i;
+ }
+ track_views.clear ();
+
+ zoom_range_clock.set_session (0);
+ nudge_clock.set_session (0);
+
+ editor_list_button.set_active(false);
+ editor_list_button.set_sensitive(false);
+
+ /* clear tempo/meter rulers */
+ remove_metric_marks ();
+ hide_measures ();
+ clear_marker_display ();
+
+ delete current_bbt_points;
+ current_bbt_points = 0;
+
+ /* get rid of any existing editor mixer strip */
+
+ WindowTitle title(Glib::get_application_name());
+ title += _("Editor");
+
+ set_title (title.get_string());
+
+ SessionHandlePtr::session_going_away ();
+}
+
+
+void
+Editor::show_editor_list (bool yn)
+{
+ if (yn) {
+ the_notebook.show();
+ } else {
+ the_notebook.hide();
+ }
}
projects / ardour.git / blobdiff