/*
- Copyright (C) 2000-2006 Paul Davis
+ Copyright (C) 2000-2007 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
+/* Note: public Editor methods are documented in public_editor.h */
+
#include <unistd.h>
#include <cstdlib>
#include <cmath>
#include <string>
#include <algorithm>
+#include <boost/none.hpp>
+
#include <sigc++/bind.h>
#include <pbd/convert.h>
#include <pbd/error.h>
-#include <pbd/stacktrace.h>
+#include <pbd/enumwriter.h>
#include <pbd/memento_command.h>
+#include <glibmm/miscutils.h>
#include <gtkmm/image.h>
#include <gdkmm/color.h>
#include <gdkmm/bitmap.h>
+#include <gtkmm2ext/grouped_buttons.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+#include <gtkmm2ext/choice.h>
#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
#include <ardour/location.h>
#include <ardour/audioplaylist.h>
#include <ardour/audioregion.h>
-#include <ardour/region.h>
+#include <ardour/midi_region.h>
#include <ardour/session_route.h>
+#include <ardour/session_directory.h>
+#include <ardour/session_state_utils.h>
#include <ardour/tempo.h>
#include <ardour/utils.h>
+#include <ardour/profile.h>
#include <control_protocol/control_protocol.h>
#include "ardour_ui.h"
#include "editor.h"
-#include "grouped_buttons.h"
#include "keyboard.h"
#include "marker.h"
#include "playlist_selector.h"
#include "editing.h"
#include "public_editor.h"
#include "crossfade_edit.h"
-#include "audio_time_axis.h"
#include "canvas_impl.h"
#include "actions.h"
+#include "sfdb_ui.h"
#include "gui_thread.h"
#ifdef FFT_ANALYSIS
#include "i18n.h"
-/* <CMT Additions> */
+#ifdef WITH_CMT
#include "imageframe_socket_handler.h"
-/* </CMT Additions> */
+#endif
using namespace std;
using namespace sigc;
using namespace Gtkmm2ext;
using namespace Editing;
+using PBD::internationalize;
using PBD::atoi;
const double Editor::timebar_height = 15.0;
#include "editor_xpms"
static const gchar *_snap_type_strings[] = {
- N_("None"),
N_("CD Frames"),
N_("SMPTE Frames"),
N_("SMPTE Seconds"),
N_("Beats"),
N_("Bars"),
N_("Marks"),
- N_("Edit Cursor"),
N_("Region starts"),
N_("Region ends"),
N_("Region syncs"),
};
static const gchar *_snap_mode_strings[] = {
- N_("Normal"),
+ N_("No Grid"),
+ N_("Grid"),
N_("Magnetic"),
0
};
+static const gchar *_edit_point_strings[] = {
+ N_("Playhead"),
+ N_("Marker"),
+ N_("Mouse"),
+ 0
+};
+
static const gchar *_zoom_focus_strings[] = {
N_("Left"),
N_("Right"),
N_("Center"),
N_("Playhead"),
- N_("Edit Cursor"),
+ N_("Mouse"),
+ N_("Edit Point"),
0
};
+#ifdef USE_RUBBERBAND
+static const gchar *_rb_opt_strings[] = {
+ N_("Mushy"),
+ N_("Smooth"),
+ N_("Balanced multitimbral mixture"),
+ N_("Unpitched percussion with stable notes"),
+ N_("Crisp monophonic instrumental"),
+ N_("Unpitched solo percussion"),
+ 0
+};
+#endif
+
/* Soundfile drag-n-drop */
Gdk::Cursor* Editor::cross_hair_cursor = 0;
Gdk::Cursor* Editor::time_fx_cursor = 0;
Gdk::Cursor* Editor::fader_cursor = 0;
Gdk::Cursor* Editor::speaker_cursor = 0;
+Gdk::Cursor* Editor::midi_pencil_cursor = 0;
+Gdk::Cursor* Editor::midi_select_cursor = 0;
+Gdk::Cursor* Editor::midi_erase_cursor = 0;
Gdk::Cursor* Editor::wait_cursor = 0;
Gdk::Cursor* Editor::timebar_cursor = 0;
+Gdk::Cursor* Editor::transparent_cursor = 0;
void
show_me_the_size (Requisition* r, const char* what)
cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
}
-void
-check_adjustment (Gtk::Adjustment* adj)
-{
- cerr << "CHANGE adj = "
- << adj->get_lower () << ' '
- << adj->get_upper () << ' '
- << adj->get_value () << ' '
- << adj->get_step_increment () << ' '
- << adj->get_page_increment () << ' '
- << adj->get_page_size () << ' '
- << endl;
-
-}
-
-Editor::Editor (AudioEngine& eng)
- : engine (eng),
-
+Editor::Editor ()
+ :
/* time display buttons */
minsec_label (_("Mins:Secs")),
bbt_label (_("Bars:Beats")),
smpte_label (_("Timecode")),
- frame_label (_("Frames")),
+ frame_label (_("Samples")),
tempo_label (_("Tempo")),
meter_label (_("Meter")),
mark_label (_("Location Markers")),
range_mark_label (_("Range Markers")),
transport_mark_label (_("Loop/Punch Ranges")),
+ cd_mark_label (_("CD Markers")),
- edit_packer (3, 3, false),
+ edit_packer (3, 3, true),
/* the values here don't matter: layout widgets
reset them as needed.
vertical_adjustment (0.0, 0.0, 10.0, 400.0),
horizontal_adjustment (0.0, 0.0, 20.0, 1200.0),
+ tempo_lines(0),
+ marker_tempo_lines(0),
+
/* tool bar related */
- edit_cursor_clock (X_("editcursor"), false, X_("EditCursorClock"), true),
+ edit_point_clock (X_("editpoint"), false, X_("EditPointClock"), true),
zoom_range_clock (X_("zoomrange"), false, X_("ZoomRangeClock"), true, true),
toolbar_selection_clock_table (2,3),
automation_mode_button (_("mode")),
global_automation_button (_("automation")),
- /* <CMT Additions> */
+#ifdef WITH_CMT
image_socket_listener(0),
- /* </CMT Additions> */
+#endif
/* nudge */
- nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true)
+ nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true),
+ meters_running(false)
{
constructed = false;
session = 0;
- selection = new Selection;
- cut_buffer = new Selection;
+ selection = new Selection (this);
+ cut_buffer = new Selection (this);
selection->TimeChanged.connect (mem_fun(*this, &Editor::time_selection_changed));
selection->TracksChanged.connect (mem_fun(*this, &Editor::track_selection_changed));
selection->RegionsChanged.connect (mem_fun(*this, &Editor::region_selection_changed));
selection->PointsChanged.connect (mem_fun(*this, &Editor::point_selection_changed));
+ selection->MarkersChanged.connect (mem_fun(*this, &Editor::marker_selection_changed));
clicked_regionview = 0;
- clicked_trackview = 0;
- clicked_audio_trackview = 0;
+ clicked_axisview = 0;
+ clicked_routeview = 0;
clicked_crossfadeview = 0;
clicked_control_point = 0;
- latest_regionview = 0;
last_update_frame = 0;
drag_info.item = 0;
current_mixer_strip = 0;
current_bbt_points = 0;
-
- snap_type_strings = I18N (_snap_type_strings);
- snap_mode_strings = I18N (_snap_mode_strings);
- zoom_focus_strings = I18N(_zoom_focus_strings);
-
- snap_type = SnapToFrame;
- set_snap_to (snap_type);
- snap_mode = SnapNormal;
- set_snap_mode (snap_mode);
+
+ snap_type_strings = I18N (_snap_type_strings);
+ snap_mode_strings = I18N (_snap_mode_strings);
+ zoom_focus_strings = I18N (_zoom_focus_strings);
+ edit_point_strings = I18N (_edit_point_strings);
+#ifdef USE_RUBBERBAND
+ rb_opt_strings = I18N (_rb_opt_strings);
+#endif
+
snap_threshold = 5.0;
bbt_beat_subdivision = 4;
canvas_width = 0;
autoscroll_active = false;
autoscroll_timeout_tag = -1;
interthread_progress_window = 0;
+ logo_item = 0;
#ifdef FFT_ANALYSIS
analysis_window = 0;
_show_waveforms_recording = true;
first_action_message = 0;
export_dialog = 0;
+ export_range_markers_dialog = 0;
show_gain_after_trim = false;
ignore_route_list_reorder = false;
no_route_list_redisplay = false;
verbose_cursor_on = true;
route_removal = false;
- track_spacing = 0;
show_automatic_regions_in_region_list = true;
- region_list_sort_type = (Editing::RegionListSortType) 0;
+
+ region_list_sort_type = (Editing::RegionListSortType) 0;
have_pending_keyboard_selection = false;
_follow_playhead = true;
_xfade_visibility = true;
new_transport_marker_menu = 0;
editor_mixer_strip_width = Wide;
show_editor_mixer_when_tracks_arrive = false;
+ region_edit_menu_split_multichannel_item = 0;
region_edit_menu_split_item = 0;
temp_location = 0;
- region_edit_menu_split_multichannel_item = 0;
leftmost_frame = 0;
ignore_mouse_mode_toggle = false;
+ ignore_midi_edit_mode_toggle = false;
current_stepping_trackview = 0;
entered_track = 0;
entered_regionview = 0;
+ entered_marker = 0;
clear_entered_track = false;
_new_regionviews_show_envelope = false;
- current_timestretch = 0;
+ current_timefx = 0;
in_edit_group_row_change = false;
last_canvas_frame = 0;
- edit_cursor = 0;
playhead_cursor = 0;
button_release_can_deselect = true;
canvas_idle_queued = false;
_dragging_playhead = false;
+ _dragging_edit_point = false;
+ _dragging_hscrollbar = false;
+ select_new_marker = false;
+ zoomed_to_region = false;
+
+ scrubbing_direction = 0;
+
+ sfbrowser = 0;
+ ignore_route_order_sync = false;
- location_marker_color = color_map[cLocationMarker];
- location_range_color = color_map[cLocationRange];
- location_cd_marker_color = color_map[cLocationCDMarker];
- location_loop_color = color_map[cLocationLoop];
- location_punch_color = color_map[cLocationPunch];
+ location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
+ location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
+ location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
+ location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
+ location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
range_marker_drag_rect = 0;
marker_drag_line = 0;
-
+ tempo_map_change_idle_handler_id = -1;
+ canvas_hroizontally_scrolled_handler_id = -1;
+ set_midi_edit_mode (MidiEditPencil, true);
set_mouse_mode (MouseObject, true);
+ last_visual_state.frames_per_unit = 0;
+
frames_per_unit = 2048; /* too early to use reset_zoom () */
reset_hscrollbar_stepping ();
initialize_canvas ();
edit_controls_vbox.set_spacing (0);
- horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
- vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling));
+ horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled), false);
+ vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling), true);
track_canvas.set_hadjustment (horizontal_adjustment);
track_canvas.set_vadjustment (vertical_adjustment);
edit_vscrollbar.set_adjustment (vertical_adjustment);
edit_hscrollbar.set_adjustment (horizontal_adjustment);
- edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscrollbar_button_press));
- edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release));
+ edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscrollbar_button_press), false);
+ edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release), false);
edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate));
edit_hscrollbar.set_name ("EditorHScrollbar");
build_cursors ();
setup_toolbar ();
+ setup_midi_toolbar ();
- edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
+ edit_point_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_point_clock_changed));
+ ArdourCanvas::Canvas* time_pad = manage(new ArdourCanvas::Canvas());
+ ArdourCanvas::SimpleLine* pad_line_1 = manage(new ArdourCanvas::SimpleLine(*time_pad->root(),
+ 0.0, 1.0, 100.0, 1.0));
+ pad_line_1->property_color_rgba() = 0xFF0000FF;
+ pad_line_1->show();
+ time_pad->show();
+
+ time_canvas_vbox.pack_start (*_ruler_separator, false, false);
time_canvas_vbox.pack_start (*minsec_ruler, false, false);
time_canvas_vbox.pack_start (*smpte_ruler, false, false);
time_canvas_vbox.pack_start (*frames_ruler, false, false);
time_canvas_vbox.pack_start (*bbt_ruler, false, false);
time_canvas_vbox.pack_start (time_canvas, true, true);
- time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars));
+ time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars) + 5);
bbt_label.set_name ("EditorTimeButton");
bbt_label.set_size_request (-1, (int)timebar_height);
mark_label.set_size_request (-1, (int)timebar_height);
mark_label.set_alignment (1.0, 0.5);
mark_label.set_padding (5,0);
+ cd_mark_label.set_name ("EditorTimeButton");
+ cd_mark_label.set_size_request (-1, (int)timebar_height);
+ cd_mark_label.set_alignment (1.0, 0.5);
+ cd_mark_label.set_padding (5,0);
range_mark_label.set_name ("EditorTimeButton");
range_mark_label.set_size_request (-1, (int)timebar_height);
range_mark_label.set_alignment (1.0, 0.5);
time_button_vbox.pack_start (mark_label, false, false);
time_button_event_box.add (time_button_vbox);
+ time_button_event_box.set_name ("TimebarLabelBase");
+ time_button_frame.set_shadow_type (Gtk::SHADOW_NONE);
time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- time_button_event_box.set_name ("TimebarLabelBase");
time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
+ time_button_frame.add (time_button_event_box);
+ time_button_frame.set_name ("TimebarLabelBase");
+ time_button_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+
/* these enable us to have a dedicated window (for cursor setting, etc.)
for the canvas areas.
*/
edit_packer.set_border_width (0);
edit_packer.set_name ("EditorWindow");
- edit_packer.attach (edit_vscrollbar, 0, 1, 1, 3, FILL, FILL|EXPAND, 0, 0);
+ edit_packer.attach (edit_vscrollbar, 3, 4, 1, 2, FILL, FILL|EXPAND, 0, 0);
- edit_packer.attach (time_button_event_box, 1, 2, 0, 1, FILL, FILL, 0, 0);
- edit_packer.attach (time_canvas_event_box, 2, 3, 0, 1, FILL|EXPAND, FILL, 0, 0);
+ edit_packer.attach (time_button_frame, 0, 2, 0, 1, FILL, SHRINK, 0, 0);
+ edit_packer.attach (time_canvas_event_box, 2, 4, 0, 1, FILL|EXPAND, FILL, 0, 0);
edit_packer.attach (controls_layout, 1, 2, 1, 2, FILL, FILL|EXPAND, 0, 0);
edit_packer.attach (track_canvas_event_box, 2, 3, 1, 2, FILL|EXPAND, FILL|EXPAND, 0, 0);
CellRendererToggle* route_list_visible_cell = dynamic_cast<CellRendererToggle*>(route_list_display.get_column_cell_renderer (0));
route_list_visible_cell->property_activatable() = true;
route_list_visible_cell->property_radio() = false;
-
+
route_display_model->signal_row_deleted().connect (mem_fun (*this, &Editor::route_list_delete));
route_display_model->signal_row_changed().connect (mem_fun (*this, &Editor::route_list_change));
edit_group_display.set_name ("EditGroupList");
edit_group_display.get_selection()->set_mode (SELECTION_SINGLE);
- edit_group_display.set_headers_visible (false);
+ edit_group_display.set_headers_visible (true);
edit_group_display.set_reorderable (false);
edit_group_display.set_rules_hint (true);
edit_group_display.set_size_request (75, -1);
region_list_display.append_column (_("Regions"), region_list_columns.name);
region_list_display.set_headers_visible (false);
+ CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(region_list_display.get_column_cell_renderer (0));
+ region_name_cell->property_editable() = true;
+ region_name_cell->signal_edited().connect (mem_fun (*this, &Editor::region_name_edit));
+
region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter));
TreeViewColumn* tv_col = region_list_display.get_column(0);
nlabel = manage (new Label (_("Regions")));
nlabel->set_angle (-90);
- the_notebook.append_page (region_list_scroller, *nlabel);
+ the_notebook.append_page (region_list_scroller, *nlabel);
nlabel = manage (new Label (_("Tracks/Busses")));
nlabel->set_angle (-90);
- the_notebook.append_page (route_list_scroller, *nlabel);
+ the_notebook.append_page (route_list_scroller, *nlabel);
nlabel = manage (new Label (_("Snapshots")));
nlabel->set_angle (-90);
the_notebook.append_page (snapshot_display_scroller, *nlabel);
nlabel = manage (new Label (_("Edit Groups")));
nlabel->set_angle (-90);
the_notebook.append_page (*edit_group_display_packer, *nlabel);
- nlabel = manage (new Label (_("Chunks")));
- nlabel->set_angle (-90);
- the_notebook.append_page (named_selection_scroller, *nlabel);
+
+ if (!Profile->get_sae()) {
+ nlabel = manage (new Label (_("Chunks")));
+ nlabel->set_angle (-90);
+ the_notebook.append_page (named_selection_scroller, *nlabel);
+ }
the_notebook.set_show_tabs (true);
the_notebook.set_scrollable (true);
edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
- top_hbox.pack_start (toolbar_frame, true, true);
+ top_hbox.pack_start (toolbar_frame, false, true);
+ top_hbox.pack_start (midi_toolbar_frame, false, true);
HBox *hbox = manage (new HBox);
hbox->pack_start (edit_pane, true, true);
set_name ("EditorWindow");
add_accel_group (ActionManager::ui_manager->get_accel_group());
+ status_bar_hpacker.show ();
+
+ vpacker.pack_end (status_bar_hpacker, false, false);
vpacker.pack_end (global_hpacker, true, true);
/* register actions now so that set_state() can find them and set toggles/checks etc */
register_actions ();
-
+
+ snap_type = SnapToBeat;
+ set_snap_to (snap_type);
+ snap_mode = SnapOff;
+ set_snap_mode (snap_mode);
+ _edit_point = EditAtMouse;
+ set_edit_point_preference (_edit_point);
+
XMLNode* node = ARDOUR_UI::instance()->editor_settings();
set_state (*node);
set_icon_list (window_icons);
set_default_icon_list (window_icons);
}
- set_title (_("ardour: editor"));
+
+ WindowTitle title(Glib::get_application_name());
+ title += _("Editor");
+ set_title (title.get_string());
set_wmclass (X_("ardour_editor"), "Ardour");
add (vpacker);
ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll));
Config->ParameterChanged.connect (mem_fun (*this, &Editor::parameter_changed));
+ Route::SyncOrderKeys.connect (mem_fun (*this, &Editor::sync_order_keys));
constructed = true;
instant_save ();
Editor::~Editor()
{
- /* <CMT Additions> */
+#ifdef WITH_CMT
if(image_socket_listener)
{
if(image_socket_listener->is_connected())
delete image_socket_listener ;
image_socket_listener = 0 ;
}
- /* </CMT Additions> */
+#endif
}
void
void
Editor::show_window ()
{
- show_all ();
- present ();
+ show_all_children ();
+
+ /* re-hide editor list if necessary */
+ editor_list_button_toggled ();
/* now reset all audio_time_axis heights, because widgets might need
to be re-hidden
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
-}
-void
-Editor::tie_vertical_scrolling ()
-{
- double y1 = vertical_adjustment.get_value();
- controls_layout.get_vadjustment()->set_value (y1);
- playhead_cursor->set_y_axis(y1);
- edit_cursor->set_y_axis(y1);
+ present ();
}
void
}
if (session) {
- session->add_instant_xml(get_state(), session->path());
+ session->add_instant_xml(get_state());
} else {
- Config->add_instant_xml(get_state(), get_user_ardour_path());
+ Config->add_instant_xml(get_state());
}
}
void
-Editor::edit_cursor_clock_changed()
+Editor::edit_point_clock_changed()
{
- if (edit_cursor->current_frame != edit_cursor_clock.current_time()) {
- edit_cursor->set_position (edit_cursor_clock.current_time());
+ if (_dragging_edit_point) {
+ return;
}
-}
+ if (selection->markers.empty()) {
+ return;
+ }
+
+ bool ignored;
+ Location* loc = find_location_from_marker (selection->markers.front(), ignored);
+
+ if (!loc) {
+ return;
+ }
+
+ loc->move_to (edit_point_clock.current_time());
+}
void
Editor::zoom_adjustment_changed ()
}
double step = fraction * current_page_frames();
- nframes_t target;
- if ((fraction < 0.0f) && (session->transport_frame() < (nframes_t) fabs(step))) {
- target = 0;
- } else if ((fraction > 0.0f) && (max_frames - session->transport_frame() < step)) {
- target = (max_frames - (current_page_frames()*2)); // allow room for slop in where the PH is on the screen
+ /*
+ _control_scroll_target is an optional<T>
+
+ it acts like a pointer to an nframes_t, with
+ a operator conversion to boolean to check
+ that it has a value could possibly use
+ playhead_cursor->current_frame to store the
+ value and a boolean in the class to know
+ when it's out of date
+ */
+
+ if (!_control_scroll_target) {
+ _control_scroll_target = session->transport_frame();
+ _dragging_playhead = true;
+ }
+
+ if ((fraction < 0.0f) && (*_control_scroll_target < (nframes_t) fabs(step))) {
+ *_control_scroll_target = 0;
+ } else if ((fraction > 0.0f) && (max_frames - *_control_scroll_target < step)) {
+ *_control_scroll_target = max_frames - (current_page_frames()*2); // allow room for slop in where the PH is on the screen
} else {
- target = (session->transport_frame() + (nframes_t) floor ((fraction * current_page_frames())));
+ *_control_scroll_target += (nframes_t) floor (step);
}
/* move visuals, we'll catch up with it later */
- playhead_cursor->set_position (target);
-
- if (target > (current_page_frames() / 2)) {
+ playhead_cursor->set_position (*_control_scroll_target);
+ UpdateAllTransportClocks (*_control_scroll_target);
+
+ if (*_control_scroll_target > (current_page_frames() / 2)) {
/* try to center PH in window */
- reset_x_origin (target - (current_page_frames()/2));
+ reset_x_origin (*_control_scroll_target - (current_page_frames()/2));
} else {
reset_x_origin (0);
}
- /* cancel the existing */
+ /*
+ Now we do a timeout to actually bring the session to the right place
+ according to the playhead. This is to avoid reading disk buffers on every
+ call to control_scroll, which is driven by ScrollTimeline and therefore
+ probably by a control surface wheel which can generate lots of events.
+ */
+ /* cancel the existing timeout */
control_scroll_connection.disconnect ();
- /* add the next one */
+ /* add the next timeout */
- control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), target), 50);
+ control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
}
bool
Editor::deferred_control_scroll (nframes_t target)
{
- session->request_locate (target);
+ session->request_locate (*_control_scroll_target, session->transport_rolling());
+ // reset for next stream
+ _control_scroll_target = boost::none;
+ _dragging_playhead = false;
return false;
}
if (new_end > last_canvas_frame) {
last_canvas_frame = new_end;
+ horizontal_adjustment.set_upper (last_canvas_frame / frames_per_unit);
reset_scrolling_region ();
}
if (session) {
bool dirty = session->dirty();
- string wintitle = _("ardour: editor: ");
-
- if (dirty) {
- wintitle += '[';
- }
-
- wintitle += session->name();
+ string session_name;
if (session->snap_name() != session->name()) {
- wintitle += ':';
- wintitle += session->snap_name();
+ session_name = session->snap_name();
+ } else {
+ session_name = session->name();
}
if (dirty) {
- wintitle += ']';
+ session_name = "*" + session_name;
}
- set_title (wintitle);
+ WindowTitle title(session_name);
+ title += Glib::get_application_name();
+ set_title (title.get_string());
}
}
session_connections.push_back (session->TransportStateChange.connect (mem_fun(*this, &Editor::map_transport_state)));
session_connections.push_back (session->PositionChanged.connect (mem_fun(*this, &Editor::map_position_change)));
session_connections.push_back (session->RouteAdded.connect (mem_fun(*this, &Editor::handle_new_route)));
- session_connections.push_back (session->AudioRegionAdded.connect (mem_fun(*this, &Editor::handle_new_audio_region)));
- session_connections.push_back (session->AudioRegionRemoved.connect (mem_fun(*this, &Editor::handle_audio_region_removed)));
+ session_connections.push_back (session->RegionAdded.connect (mem_fun(*this, &Editor::handle_new_region)));
+ session_connections.push_back (session->RegionRemoved.connect (mem_fun(*this, &Editor::handle_region_removed)));
session_connections.push_back (session->DurationChanged.connect (mem_fun(*this, &Editor::handle_new_duration)));
session_connections.push_back (session->edit_group_added.connect (mem_fun(*this, &Editor::add_edit_group)));
session_connections.push_back (session->edit_group_removed.connect (mem_fun(*this, &Editor::edit_groups_changed)));
edit_groups_changed ();
- edit_cursor_clock.set_session (session);
+ edit_point_clock.set_session (session);
zoom_range_clock.set_session (session);
_playlist_selector->set_session (session);
nudge_clock.set_session (session);
}
session->locations()->add (loc, false);
session->set_auto_loop_location (loc);
- }
- else {
+ } else {
// force name
loc->set_name (_("Loop"));
}
}
session->locations()->add (loc, false);
session->set_auto_punch_location (loc);
- }
- else {
+ } else {
// force name
loc->set_name (_("Punch"));
}
session->locations()->StateChanged.connect (mem_fun(*this, &Editor::refresh_location_display_s));
session->locations()->end_location()->changed.connect (mem_fun(*this, &Editor::end_location_changed));
+ if (sfbrowser) {
+ sfbrowser->set_session (session);
+ }
+
handle_new_duration ();
redisplay_regions ();
if (ARDOUR_UI::instance()->session_is_new ()) {
- TreeModel::Children rows = route_display_model->children();
+ TreeModel::Children rows = route_display_model->children();
TreeModel::Children::iterator i;
no_route_list_redisplay = true;
for (i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
- AudioTimeAxisView *atv;
+ RouteTimeAxisView *rtv;
- if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
- if (atv->route()->master()) {
+ if ((rtv = dynamic_cast<RouteTimeAxisView*>(tv)) != 0) {
+ if (rtv->route()->is_master()) {
route_list_display.get_selection()->unselect (i);
}
}
redisplay_route_list ();
}
- /* register for undo history */
+ /* register for undo history */
- session->register_with_memento_command_factory(_id, this);
+ session->register_with_memento_command_factory(_id, this);
+
+ start_updating ();
}
void
mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
}
+
+ {
+ RefPtr<Bitmap> bits;
+ char pix[4] = { 0, 0, 0, 0 };
+ bits = Bitmap::create (pix, 2, 2);
+ Gdk::Color c;
+ transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
+ }
+
+ {
+ RefPtr<Bitmap> bits;
+ char pix[4] = { 0, 0, 0, 0 };
+ bits = Bitmap::create (pix, 2, 2);
+ Gdk::Color c;
+ transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
+ }
grabber_cursor = new Gdk::Cursor (HAND2);
cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
time_fx_cursor = new Gdk::Cursor (SIZING);
wait_cursor = new Gdk::Cursor (WATCH);
timebar_cursor = new Gdk::Cursor(LEFT_PTR);
+ midi_pencil_cursor = new Gdk::Cursor (PENCIL);
+ midi_select_cursor = new Gdk::Cursor (CENTER_PTR);
+ midi_erase_cursor = new Gdk::Cursor (DRAPED_BOX);
}
+/** Pop up a context menu for when the user clicks on a fade in or fade out */
void
Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType item_type)
{
}
items.push_back (SeparatorElem());
-
- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
+
+ if (Profile->get_sae()) {
+ items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
+ items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
+ } else {
+ items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
+ items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
+ items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
+ items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
+ items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
+ }
+
break;
case FadeOutItem:
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
- items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
- items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
- items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
- items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+ if (Profile->get_sae()) {
+ items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
+ items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+ } else {
+ items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
+ items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+ items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
+ items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
+ items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
+ }
break;
break;
case StreamItem:
- if (clicked_audio_trackview->get_diskstream()) {
+ if (clicked_routeview->get_diskstream()) {
build_menu_function = &Editor::build_track_context_menu;
} else {
build_menu_function = &Editor::build_track_bus_context_menu;
case RegionViewNameHighlight:
if (!with_selection) {
if (region_edit_menu_split_item) {
- if (clicked_regionview && clicked_regionview->region()->covers (edit_cursor->current_frame)) {
- ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, true);
+ if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) {
+ ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, true);
} else {
- ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, false);
+ ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false);
}
}
/*
return;
}
- if (clicked_audio_trackview && clicked_audio_trackview->audio_track()) {
+ if (item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) {
/* Bounce to disk */
edit_items.push_back (SeparatorElem());
- switch (clicked_audio_trackview->audio_track()->freeze_state()) {
+ switch (clicked_routeview->audio_track()->freeze_state()) {
case AudioTrack::NoFreeze:
edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
break;
MenuList& edit_items = track_region_context_menu.items();
edit_items.clear();
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
- if (atv) {
+ if (rtv) {
boost::shared_ptr<Diskstream> ds;
boost::shared_ptr<Playlist> pl;
- if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
+ if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
Playlist::RegionList* regions = pl->regions_at ((nframes_t) floor ( (double)frame * ds->speed()));
for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
- add_region_context_items (atv->audio_view(), (*i), edit_items);
+ add_region_context_items (rtv->view(), (*i), edit_items);
}
delete regions;
}
MenuList& edit_items = track_crossfade_context_menu.items();
edit_items.clear ();
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
+ AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
if (atv) {
boost::shared_ptr<Diskstream> ds;
}
#endif /* FFT_ANALYSIS */
-
-
Menu*
Editor::build_track_selection_context_menu (nframes_t ignored)
{
edit_items.clear ();
add_selection_context_items (edit_items);
- add_dstream_context_items (edit_items);
+ // edit_items.push_back (SeparatorElem());
+ // add_dstream_context_items (edit_items);
return &track_selection_context_menu;
}
+/** Add context menu items relevant to crossfades.
+ * @param edit_items List to add the items to.
+ */
void
Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Crossfade> xfade, Menu_Helpers::MenuList& edit_items, bool many)
{
}
}
+/** Add an element to a menu, settings its sensitivity.
+ * @param m Menu to add to.
+ * @param e Element to add.
+ * @param s true to make sensitive, false to make insensitive
+ */
+void
+Editor::add_item_with_sensitivity (Menu_Helpers::MenuList& m, Menu_Helpers::MenuElem e, bool s) const
+{
+ m.push_back (e);
+ if (!s) {
+ m.back().set_sensitive (false);
+ }
+}
+
void
-Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region> region, Menu_Helpers::MenuList& edit_items)
+Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> region, Menu_Helpers::MenuList& edit_items)
{
using namespace Menu_Helpers;
Menu *region_menu = manage (new Menu);
region_menu->set_name ("ArdourContextMenu");
boost::shared_ptr<AudioRegion> ar;
+ boost::shared_ptr<MidiRegion> mr;
if (region) {
ar = boost::dynamic_pointer_cast<AudioRegion> (region);
+ mr = boost::dynamic_pointer_cast<MidiRegion> (region);
}
/* when this particular menu pops up, make the relevant region
become selected.
*/
- // region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
+ region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::rename_region)));
items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region)));
items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun (*this, &Editor::lower_region_to_bottom)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor)));
+ items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_point)));
items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)));
+ items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::play_selected_region)));
items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)));
items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection)));
#ifdef FFT_ANALYSIS
- items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection)));
+ if (ar)
+ items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection)));
#endif
items.push_back (SeparatorElem());
- items.push_back (CheckMenuElem (_("Lock"), mem_fun(*this, &Editor::toggle_region_lock)));
- region_lock_item = static_cast<CheckMenuItem*>(&items.back());
+ sigc::connection fooc;
+
+ items.push_back (CheckMenuElem (_("Lock")));
+ CheckMenuItem* region_lock_item = static_cast<CheckMenuItem*>(&items.back());
+ fooc = region_lock_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_lock));
if (region->locked()) {
+ fooc.block (true);
region_lock_item->set_active();
+ fooc.block (false);
}
- items.push_back (CheckMenuElem (_("Mute"), mem_fun(*this, &Editor::toggle_region_mute)));
- region_mute_item = static_cast<CheckMenuItem*>(&items.back());
+ items.push_back (CheckMenuElem (_("Mute")));
+ CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
+ fooc = region_mute_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_mute));
if (region->muted()) {
+ fooc.block (true);
region_mute_item->set_active();
+ fooc.block (false);
}
- items.push_back (CheckMenuElem (_("Opaque"), mem_fun(*this, &Editor::toggle_region_opaque)));
- region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
- if (region->opaque()) {
- region_opaque_item->set_active();
+
+ if (!Profile->get_sae()) {
+ items.push_back (CheckMenuElem (_("Opaque")));
+ CheckMenuItem* region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
+ fooc = region_opaque_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_opaque));
+ if (region->opaque()) {
+ fooc.block (true);
+ region_opaque_item->set_active();
+ fooc.block (false);
+ }
}
items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)));
if (region->at_natural_position()) {
items.back().set_sensitive (false);
}
-
+
items.push_back (SeparatorElem());
-
+
if (ar) {
RegionView* rv = sv->find_view (ar);
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
-
- items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
- items.push_back (CheckMenuElem (_("Envelope Visible"), mem_fun(*this, &Editor::toggle_gain_envelope_visibility)));
- region_envelope_visible_item = static_cast<CheckMenuItem*> (&items.back());
-
- if (arv->envelope_visible()) {
- region_envelope_visible_item->set_active (true);
- }
-
- items.push_back (CheckMenuElem (_("Envelope Active"), mem_fun(*this, &Editor::toggle_gain_envelope_active)));
- region_envelope_active_item = static_cast<CheckMenuItem*> (&items.back());
+ if (!Profile->get_sae()) {
+ items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
+
+ items.push_back (CheckMenuElem (_("Envelope Visible")));
+ CheckMenuItem* region_envelope_visible_item = static_cast<CheckMenuItem*> (&items.back());
+ fooc = region_envelope_visible_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_visibility));
+ if (arv->envelope_visible()) {
+ fooc.block (true);
+ region_envelope_visible_item->set_active (true);
+ fooc.block (false);
+ }
+
+ items.push_back (CheckMenuElem (_("Envelope Active")));
+ CheckMenuItem* region_envelope_active_item = static_cast<CheckMenuItem*> (&items.back());
+ fooc = region_envelope_active_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_active));
+
+ if (ar->envelope_active()) {
+ fooc.block (true);
+ region_envelope_active_item->set_active (true);
+ fooc.block (false);
+ }
- if (ar->envelope_active()) {
- region_envelope_active_item->set_active (true);
+ items.push_back (SeparatorElem());
}
- items.push_back (SeparatorElem());
-
if (ar->scale_amplitude() != 1.0f) {
items.push_back (MenuElem (_("DeNormalize"), mem_fun(*this, &Editor::denormalize_region)));
} else {
items.push_back (MenuElem (_("Normalize"), mem_fun(*this, &Editor::normalize_region)));
}
+
+ } else if (mr) {
+ items.push_back (MenuElem (_("Quantize"), mem_fun(*this, &Editor::quantize_region)));
+ items.push_back (SeparatorElem());
}
+
items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region)));
items.push_back (SeparatorElem());
-
/* range related stuff */
items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_audio_region)));
- items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_audio_region)));
+ items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_region)));
items.push_back (SeparatorElem());
/* Nudge region */
MenuList& trim_items = trim_menu->items();
trim_menu->set_name ("ArdourContextMenu");
- trim_items.push_back (MenuElem (_("Start to edit cursor"), mem_fun(*this, &Editor::trim_region_from_edit_cursor)));
- trim_items.push_back (MenuElem (_("Edit cursor to end"), mem_fun(*this, &Editor::trim_region_to_edit_cursor)));
+ trim_items.push_back (MenuElem (_("Start to edit point"), mem_fun(*this, &Editor::trim_region_from_edit_point)));
+ trim_items.push_back (MenuElem (_("Edit point to end"), mem_fun(*this, &Editor::trim_region_to_edit_point)));
+ trim_items.push_back (MenuElem (_("Trim To Loop"), mem_fun(*this, &Editor::trim_region_to_loop)));
+ trim_items.push_back (MenuElem (_("Trim To Punch"), mem_fun(*this, &Editor::trim_region_to_punch)));
items.push_back (MenuElem (_("Trim"), *trim_menu));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
region_edit_menu_split_multichannel_item = &items.back();
- items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
+ items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
+ items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_clicked_region)));
edit_items.push_back (SeparatorElem());
}
+/** Add context menu items relevant to selection ranges.
+ * @param edit_items List to add the items to.
+ */
void
Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
{
selection_menu->set_name ("ArdourContextMenu");
items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
- items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::set_route_loop_selection)));
+ items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
#ifdef FFT_ANALYSIS
items.push_back (SeparatorElem());
#endif
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Separate range to track"), mem_fun(*this, &Editor::separate_region_from_selection)));
- items.push_back (MenuElem (_("Separate range to region list"), mem_fun(*this, &Editor::new_region_from_selection)));
+ items.push_back (MenuElem (_("Extend Range to End of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
+ items.push_back (MenuElem (_("Extend Range to Start of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
+
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Convert to region in-place"), mem_fun(*this, &Editor::separate_region_from_selection)));
+ items.push_back (MenuElem (_("Convert to region in region list"), mem_fun(*this, &Editor::new_region_from_selection)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
+
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
+ items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
+
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection)));
- items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
- items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Bounce range"), mem_fun(*this, &Editor::bounce_range_selection)));
items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
-
- edit_items.push_back (MenuElem (_("Range"), *selection_menu));
- edit_items.push_back (SeparatorElem());
}
+
void
Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
{
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
- play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
+ play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point)));
play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)));
play_items.push_back (SeparatorElem());
select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
- select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
- select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
- select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
- select_items.push_back (MenuElem (_("Select all between cursors"), bind (mem_fun(*this, &Editor::select_all_selectables_between_cursors), playhead_cursor, edit_cursor)));
+ select_items.push_back (MenuElem (_("Select All After Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
+ select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
+ select_items.push_back (MenuElem (_("Select All After Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
+ select_items.push_back (MenuElem (_("Select All Before Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
+ select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
+ select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
+ select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between)));
+
select_items.push_back (SeparatorElem());
edit_items.push_back (MenuElem (_("Select"), *select_menu));
cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
- cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
- cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), mem_fun(*this, &Editor::mouse_paste)));
+ cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
cutnpaste_items.push_back (SeparatorElem());
edit_items.push_back (SeparatorElem());
nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (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 cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
+ play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point)));
play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
edit_items.push_back (MenuElem (_("Play"), *play_menu));
select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
- select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
+ select_items.push_back (MenuElem (_("Select all after edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
+ select_items.push_back (MenuElem (_("Select all before edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
edit_items.push_back (SeparatorElem());
nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
void
Editor::set_snap_to (SnapType st)
-{
+{
+ unsigned int snap_ind = (unsigned int)st;
snap_type = st;
- string str = snap_type_strings[(int) st];
+
+ if ( snap_ind > snap_type_strings.size() - 1 ) {
+ snap_ind = 0;
+ snap_type = (SnapType)snap_ind;
+ }
+
+ string str = snap_type_strings[snap_ind];
if (str != snap_type_selector.get_active_text()) {
snap_type_selector.set_active_text (str);
case SnapToAEighthBeat:
case SnapToAQuarterBeat:
case SnapToAThirdBeat:
+ compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + (nframes_t)(canvas_width * frames_per_unit));
update_tempo_based_rulers ();
+ break;
default:
/* relax */
break;
instant_save ();
}
+void
+Editor::set_edit_point_preference (EditPoint ep)
+{
+ bool changed = _edit_point != ep;
+
+ _edit_point = ep;
+ string str = edit_point_strings[(int)ep];
+
+ if (str != edit_point_selector.get_active_text ()) {
+ edit_point_selector.set_active_text (str);
+ }
+
+ if (!changed) {
+ return;
+ }
+
+ if (Profile->get_sae()) {
+
+ switch (zoom_focus) {
+ case ZoomFocusMouse:
+ case ZoomFocusPlayhead:
+ case ZoomFocusEdit:
+ switch (_edit_point) {
+ case EditAtMouse:
+ set_zoom_focus (ZoomFocusMouse);
+ break;
+ case EditAtPlayhead:
+ set_zoom_focus (ZoomFocusPlayhead);
+ break;
+ case EditAtSelectedMarker:
+ set_zoom_focus (ZoomFocusEdit);
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ instant_save ();
+}
int
Editor::set_state (const XMLNode& node)
horizontal_adjustment.set_value (0);
}
- if (session && (prop = node.property ("edit-cursor"))) {
- nframes_t pos = atol (prop->value().c_str());
- edit_cursor->set_position (pos);
- } else {
- edit_cursor->set_position (0);
+ if ((prop = node.property ("mixer-width"))) {
+ editor_mixer_strip_width = Width (string_2_enum (prop->value(), editor_mixer_strip_width));
}
if ((prop = node.property ("zoom-focus"))) {
set_snap_mode ((SnapMode) atoi (prop->value()));
}
+ if ((prop = node.property ("edit-point"))) {
+ set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point));
+ }
+
if ((prop = node.property ("mouse-mode"))) {
MouseMode m = str2mousemode(prop->value());
mouse_mode = MouseMode ((int) m + 1); /* lie, force mode switch */
if ((prop = node.property ("follow-playhead"))) {
bool yn = (prop->value() == "yes");
+ set_follow_playhead (yn);
RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-follow-playhead"));
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 (tact->get_active() != yn) {
+ tact->set_active (yn);
+ }
}
}
-
if ((prop = node.property ("region-list-sort-type"))) {
region_list_sort_type = (Editing::RegionListSortType) -1; // force change
reset_region_list_sort_type(str2regionlistsorttype(prop->value()));
tact->set_active (yn);
}
}
+
+ if ((prop = node.property ("show-editor-list"))) {
+
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+ assert(act);
+ if (act) {
+
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ bool yn = (prop->value() == X_("yes"));
+
+ /* do it twice to force the change */
+
+ tact->set_active (!yn);
+ tact->set_active (yn);
+ }
+ }
return 0;
node->add_child_nocopy (*geometry);
}
+ maybe_add_mixer_strip_width (*node);
+
snprintf (buf, sizeof(buf), "%d", (int) zoom_focus);
node->add_property ("zoom-focus", buf);
snprintf (buf, sizeof(buf), "%f", frames_per_unit);
snprintf (buf, sizeof(buf), "%d", (int) snap_mode);
node->add_property ("snap-mode", buf);
+ node->add_property ("edit-point", enum_2_string (_edit_point));
+
snprintf (buf, sizeof (buf), "%" PRIu32, playhead_cursor->current_frame);
node->add_property ("playhead", buf);
- snprintf (buf, sizeof (buf), "%" PRIu32, edit_cursor->current_frame);
- node->add_property ("edit-cursor", buf);
node->add_property ("show-waveforms", _show_waveforms ? "yes" : "no");
node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
node->add_property (X_("show-editor-mixer"), tact->get_active() ? "yes" : "no");
}
+
+ act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+ if (act) {
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no");
+ }
return *node;
}
}
void
-Editor::snap_to (nframes_t& start, int32_t direction, bool for_mark)
+Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
{
Location* before = 0;
Location* after = 0;
- if (!session) {
+ if (!session || snap_mode == SnapOff) {
return;
}
- const nframes_t one_second = session->frame_rate();
- const nframes_t one_minute = session->frame_rate() * 60;
- const nframes_t one_smpte_second = (nframes_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame());
- nframes_t one_smpte_minute = (nframes_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame() * 60);
- nframes_t presnap = start;
+ const nframes64_t one_second = session->frame_rate();
+ const nframes64_t one_minute = session->frame_rate() * 60;
+ const nframes64_t one_smpte_second = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame());
+ nframes64_t one_smpte_minute = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame() * 60);
+ nframes64_t presnap = start;
switch (snap_type) {
- case SnapToFrame:
- break;
-
case SnapToCDFrame:
if (direction) {
start = (nframes_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
break;
case SnapToAThirtysecondBeat:
- start = session->tempo_map().round_to_beat_subdivision (start, 32);
- break;
+ start = session->tempo_map().round_to_beat_subdivision (start, 32);
+ break;
case SnapToASixteenthBeat:
- start = session->tempo_map().round_to_beat_subdivision (start, 16);
- break;
+ start = session->tempo_map().round_to_beat_subdivision (start, 16);
+ break;
case SnapToAEighthBeat:
- start = session->tempo_map().round_to_beat_subdivision (start, 8);
- break;
+ start = session->tempo_map().round_to_beat_subdivision (start, 8);
+ break;
case SnapToAQuarterBeat:
- start = session->tempo_map().round_to_beat_subdivision (start, 4);
- break;
-
- case SnapToAThirdBeat:
- start = session->tempo_map().round_to_beat_subdivision (start, 3);
- break;
+ start = session->tempo_map().round_to_beat_subdivision (start, 4);
+ break;
- case SnapToEditCursor:
- start = edit_cursor->current_frame;
+ case SnapToAThirdBeat:
+ start = session->tempo_map().round_to_beat_subdivision (start, 3);
break;
case SnapToMark:
}
default:
+ /* handled at entry */
return;
}
}
+double
+Editor::snap_length_beats (nframes_t start)
+{
+ if (!session) {
+ return 1.0;
+ }
+
+ /* FIXME: This could/should also work with non-tempo based snap settings (ie seconds) */
+
+ switch (snap_type) {
+ case SnapToBar:
+ return session->tempo_map().meter_at(start).beats_per_bar();
+
+ case SnapToBeat:
+ return 1.0;
+
+ case SnapToAThirtysecondBeat:
+ return 1.0 / (double)32.0;
+ break;
+
+ case SnapToASixteenthBeat:
+ return 1.0 / (double)16.0;
+ break;
+
+ case SnapToAEighthBeat:
+ return 1.0 / (double)8.0;
+ break;
+
+ case SnapToAQuarterBeat:
+ return 1.0 / (double)4.0;
+ break;
+
+ case SnapToAThirdBeat:
+ return 1.0 / (double)3.0;
+
+ default:
+ return 1.0;
+ }
+}
+
void
Editor::setup_toolbar ()
{
string pixmap_path;
+#ifdef GTKOSX
+ const guint32 FUDGE = 38; // Combo's are stupid - they steal space from the entry for the button
+#else
const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button
-
+#endif
/* Mode Buttons (tool selection) */
mouse_move_button.add (*(manage (new Image (::get_icon("tool_object")))));
mouse_move_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_move_button);
- mouse_select_button.add (*(manage (new Image (get_xpm("tool_range.xpm")))));
- mouse_select_button.set_relief(Gtk::RELIEF_NONE);
- mouse_mode_buttons.push_back (&mouse_select_button);
- mouse_gain_button.add (*(manage (new Image (::get_icon("tool_gain")))));
- mouse_gain_button.set_relief(Gtk::RELIEF_NONE);
- mouse_mode_buttons.push_back (&mouse_gain_button);
+
+ if (!Profile->get_sae()) {
+ mouse_select_button.add (*(manage (new Image (get_xpm("tool_range.xpm")))));
+ mouse_select_button.set_relief(Gtk::RELIEF_NONE);
+ mouse_mode_buttons.push_back (&mouse_select_button);
+
+ mouse_gain_button.add (*(manage (new Image (::get_icon("tool_gain")))));
+ mouse_gain_button.set_relief(Gtk::RELIEF_NONE);
+ mouse_mode_buttons.push_back (&mouse_gain_button);
+ }
+
mouse_zoom_button.add (*(manage (new Image (::get_icon("tool_zoom")))));
mouse_zoom_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_zoom_button);
mouse_mode_buttons.push_back (&mouse_timefx_button);
mouse_audition_button.add (*(manage (new Image (::get_icon("tool_audition")))));
mouse_audition_button.set_relief(Gtk::RELIEF_NONE);
+ mouse_note_button.add (*(manage (new Image (::get_icon("tool_note")))));
+ mouse_note_button.set_relief(Gtk::RELIEF_NONE);
+ mouse_mode_buttons.push_back (&mouse_note_button);
mouse_mode_buttons.push_back (&mouse_audition_button);
mouse_mode_button_set = new GroupedButtons (mouse_mode_buttons);
mode_box->set_spacing(4);
mouse_mode_button_box.set_spacing(1);
mouse_mode_button_box.pack_start(mouse_move_button, true, true);
- mouse_mode_button_box.pack_start(mouse_select_button, true, true);
+ if (!Profile->get_sae()) {
+ mouse_mode_button_box.pack_start(mouse_select_button, true, true);
+ }
mouse_mode_button_box.pack_start(mouse_zoom_button, true, true);
- mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
+ if (!Profile->get_sae()) {
+ mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
+ }
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(mouse_note_button, true, true);
mouse_mode_button_box.set_homogeneous(true);
vector<string> edit_mode_strings;
mouse_zoom_button.set_name ("MouseModeButton");
mouse_timefx_button.set_name ("MouseModeButton");
mouse_audition_button.set_name ("MouseModeButton");
+ mouse_note_button.set_name ("MouseModeButton");
ARDOUR_UI::instance()->tooltips().set_tip (mouse_move_button, _("Select/Move Objects"));
ARDOUR_UI::instance()->tooltips().set_tip (mouse_select_button, _("Select/Move Ranges"));
ARDOUR_UI::instance()->tooltips().set_tip (mouse_zoom_button, _("Select Zoom Range"));
ARDOUR_UI::instance()->tooltips().set_tip (mouse_timefx_button, _("Stretch/Shrink Regions"));
ARDOUR_UI::instance()->tooltips().set_tip (mouse_audition_button, _("Listen to Specific Regions"));
+ ARDOUR_UI::instance()->tooltips().set_tip (mouse_note_button, _("Edit MIDI Notes"));
mouse_move_button.unset_flags (CAN_FOCUS);
mouse_select_button.unset_flags (CAN_FOCUS);
mouse_zoom_button.unset_flags (CAN_FOCUS);
mouse_timefx_button.unset_flags (CAN_FOCUS);
mouse_audition_button.unset_flags (CAN_FOCUS);
+ mouse_note_button.unset_flags (CAN_FOCUS);
mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
+ mouse_note_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseNote));
// mouse_move_button.set_active (true);
/* Zoom */
zoom_box.set_spacing (1);
- zoom_box.set_border_width (2);
+ zoom_box.set_border_width (0);
zoom_in_button.set_name ("EditorTimeButton");
zoom_in_button.set_size_request(-1,16);
ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
zoom_focus_selector.set_name ("ZoomFocusSelector");
- Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edit Cursor", FUDGE, 0);
+ Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, _("Playhead"), FUDGE, 0);
set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
zoom_box.pack_start (zoom_in_button, false, false);
zoom_box.pack_start (zoom_out_full_button, false, false);
- /* Edit Cursor / Snap */
-
snap_box.set_spacing (1);
snap_box.set_border_width (2);
snap_type_selector.set_name ("SnapTypeSelector");
- Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
+ Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, _("SMPTE Seconds"), 2+FUDGE, 10);
set_popdown_strings (snap_type_selector, snap_type_strings);
snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
- ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
+ ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Snap/Grid Units"));
snap_mode_selector.set_name ("SnapModeSelector");
- Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10);
+ Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, _("Magnetic Snap"), 2+FUDGE, 10);
set_popdown_strings (snap_mode_selector, snap_mode_strings);
snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
+ ARDOUR_UI::instance()->tooltips().set_tip (snap_mode_selector, _("Snap/Grid Mode"));
- snap_box.pack_start (edit_cursor_clock, false, false);
+ edit_point_selector.set_name ("SnapModeSelector");
+ Gtkmm2ext::set_size_request_to_display_given_text (edit_point_selector, _("Playhead"), 2+FUDGE, 10);
+ set_popdown_strings (edit_point_selector, edit_point_strings);
+ edit_point_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_point_selection_done));
+ ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point"));
+
+ snap_box.pack_start (edit_point_clock, false, false);
snap_box.pack_start (snap_mode_selector, false, false);
snap_box.pack_start (snap_type_selector, false, false);
-
+ snap_box.pack_start (edit_point_selector, false, false);
/* Nudge */
/* Pack everything in... */
- HBox* hbox = new HBox;
+ HBox* hbox = manage (new HBox);
hbox->set_spacing(10);
- tools_tearoff = new TearOff (*hbox);
+ tools_tearoff = manage (new TearOff (*hbox));
tools_tearoff->set_name ("MouseModeBase");
tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
toolbar_frame.add (toolbar_base);
}
-int
-Editor::convert_drop_to_paths (vector<ustring>& paths,
- const RefPtr<Gdk::DragContext>& context,
- gint x,
- gint y,
- const SelectionData& data,
- guint info,
- guint time)
-{
- if (session == 0) {
+void
+Editor::setup_midi_toolbar ()
+{
+ string pixmap_path;
+
+ /* Mode Buttons (tool selection) */
+
+ vector<ToggleButton *> midi_tool_buttons;
+
+ midi_tool_pencil_button.add (*(manage (new Image (::get_icon("midi_tool_pencil")))));
+ midi_tool_pencil_button.set_relief(Gtk::RELIEF_NONE);
+ midi_tool_buttons.push_back (&midi_tool_pencil_button);
+ midi_tool_select_button.add (*(manage (new Image (::get_icon("midi_tool_select")))));
+ midi_tool_select_button.set_relief(Gtk::RELIEF_NONE);
+ midi_tool_buttons.push_back (&midi_tool_select_button);
+ midi_tool_erase_button.add (*(manage (new Image (::get_icon("midi_tool_erase")))));
+ midi_tool_erase_button.set_relief(Gtk::RELIEF_NONE);
+ midi_tool_buttons.push_back (&midi_tool_erase_button);
+
+ midi_tool_pencil_button.set_active(true);
+
+ midi_tool_button_set = new GroupedButtons (midi_tool_buttons);
+
+ midi_tool_button_box.set_border_width (2);
+ midi_tool_button_box.set_spacing(4);
+ midi_tool_button_box.set_spacing(1);
+ midi_tool_button_box.pack_start(midi_tool_pencil_button, true, true);
+ midi_tool_button_box.pack_start(midi_tool_select_button, true, true);
+ midi_tool_button_box.pack_start(midi_tool_erase_button, true, true);
+ midi_tool_button_box.set_homogeneous(true);
+
+ midi_tool_pencil_button.set_name ("MouseModeButton");
+ midi_tool_select_button.set_name ("MouseModeButton");
+ midi_tool_erase_button.set_name ("MouseModeButton");
+
+ ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_pencil_button, _("Add/Move/Stretch Notes"));
+ ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_select_button, _("Select/Move Notes"));
+ ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_erase_button, _("Erase Notes"));
+
+ midi_tool_pencil_button.unset_flags (CAN_FOCUS);
+ midi_tool_select_button.unset_flags (CAN_FOCUS);
+ midi_tool_erase_button.unset_flags (CAN_FOCUS);
+
+ midi_tool_pencil_button.signal_toggled().connect (bind (mem_fun(*this,
+ &Editor::midi_edit_mode_toggled), Editing::MidiEditPencil));
+ midi_tool_select_button.signal_toggled().connect (bind (mem_fun(*this,
+ &Editor::midi_edit_mode_toggled), Editing::MidiEditSelect));
+ midi_tool_erase_button.signal_toggled().connect (bind (mem_fun(*this,
+ &Editor::midi_edit_mode_toggled), Editing::MidiEditErase));
+
+ /* Pack everything in... */
+
+ midi_tools_tearoff = manage (new TearOff (midi_tool_button_box));
+ midi_tools_tearoff->set_name ("MouseModeBase");
+
+ /*
+ midi_tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&midi_toolbar_hbox),
+ &midi_tools_tearoff->tearoff_window()));
+ midi_tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&midi_toolbar_hbox),
+ &midi_tools_tearoff->tearoff_window(), 0));
+ midi_tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&midi_toolbar_hbox),
+ &midi_tools_tearoff->tearoff_window()));
+ midi_tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&midi_toolbar_hbox),
+ &midi_tools_tearoff->tearoff_window(), 0));
+ */
+
+ midi_toolbar_hbox.set_spacing (10);
+ midi_toolbar_hbox.set_border_width (1);
+
+ midi_toolbar_hbox.pack_start (*midi_tools_tearoff, false, true);
+
+ midi_tool_button_box.show_all ();
+ midi_toolbar_hbox.show_all();
+ midi_tools_tearoff->show_all();
+
+ midi_toolbar_base.set_name ("ToolBarBase");
+ midi_toolbar_base.add (midi_toolbar_hbox);
+
+ midi_toolbar_frame.set_shadow_type (SHADOW_OUT);
+ midi_toolbar_frame.set_name ("BaseFrame");
+ midi_toolbar_frame.add (midi_toolbar_base);
+}
+
+int
+Editor::convert_drop_to_paths (vector<ustring>& paths,
+ const RefPtr<Gdk::DragContext>& context,
+ gint x,
+ gint y,
+ const SelectionData& data,
+ guint info,
+ guint time)
+
+{
+ if (session == 0) {
return -1;
}
vector<ustring> uris = data.get_uris();
if (uris.empty()) {
-
+
/* This is seriously fucked up. Nautilus doesn't say that its URI lists
are actually URI lists. So do it by hand.
*/
}
for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
+
if ((*i).substr (0,7) == "file://") {
- string p = *i;
+
+ ustring p = *i;
PBD::url_decode (p);
- paths.push_back (p.substr (7));
+
+ // scan forward past three slashes
+
+ ustring::size_type slashcnt = 0;
+ ustring::size_type n = 0;
+ ustring::iterator x = p.begin();
+
+ while (slashcnt < 3 && x != p.end()) {
+ if ((*x) == '/') {
+ slashcnt++;
+ } else if (slashcnt == 3) {
+ break;
+ }
+ ++n;
+ ++x;
+ }
+
+ if (slashcnt != 3 || x == p.end()) {
+ error << _("malformed URL passed to drag-n-drop code") << endmsg;
+ continue;
+ }
+
+ paths.push_back (p.substr (n - 1));
}
}
if (session->transport_stopped()) {
have_pending_keyboard_selection = false;
}
+
+ update_loop_range_view (true);
}
/* UNDO/REDO */
-Editor::State::State ()
+Editor::State::State (PublicEditor const * e)
{
- selection = new Selection;
+ selection = new Selection (e);
}
Editor::State::~State ()
UndoAction
Editor::get_memento () const
{
- State *state = new State;
+ State *state = new State (this);
store_state (*state);
return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
}
}
-struct TrackViewByPositionSorter
-{
- bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
- return a->y_position < b->y_position;
- }
-};
-
-bool
-Editor::extend_selection_to_track (TimeAxisView& view)
-{
- if (selection->selected (&view)) {
- /* already selected, do nothing */
- return false;
- }
-
- if (selection->tracks.empty()) {
-
- if (!selection->selected (&view)) {
- selection->set (&view);
- return true;
- } else {
- return false;
- }
- }
-
- /* something is already selected, so figure out which range of things to add */
-
- TrackViewList to_be_added;
- TrackViewList sorted = track_views;
- TrackViewByPositionSorter cmp;
- bool passed_clicked = false;
- bool forwards = true;
-
- sorted.sort (cmp);
-
- if (!selection->selected (&view)) {
- to_be_added.push_back (&view);
- }
-
- /* figure out if we should go forward or backwards */
-
- for (TrackViewList::iterator i = sorted.begin(); i != sorted.end(); ++i) {
-
- if ((*i) == &view) {
- passed_clicked = true;
- }
-
- if (selection->selected (*i)) {
- if (passed_clicked) {
- forwards = true;
- } else {
- forwards = false;
- }
- break;
- }
- }
-
- passed_clicked = false;
-
- if (forwards) {
-
- for (TrackViewList::iterator i = sorted.begin(); i != sorted.end(); ++i) {
-
- if ((*i) == &view) {
- passed_clicked = true;
- continue;
- }
-
- if (passed_clicked) {
- if ((*i)->hidden()) {
- continue;
- }
- if (selection->selected (*i)) {
- break;
- } else if (!(*i)->hidden()) {
- to_be_added.push_back (*i);
- }
- }
- }
-
- } else {
-
- for (TrackViewList::reverse_iterator r = sorted.rbegin(); r != sorted.rend(); ++r) {
-
- if ((*r) == &view) {
- passed_clicked = true;
- continue;
- }
-
- if (passed_clicked) {
-
- if ((*r)->hidden()) {
- continue;
- }
-
- if (selection->selected (*r)) {
- break;
- } else if (!(*r)->hidden()) {
- to_be_added.push_back (*r);
- }
- }
- }
- }
-
- if (!to_be_added.empty()) {
- selection->add (to_be_added);
- return true;
- }
-
- return false;
-}
-
-
-bool
-Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no_remove)
-{
- bool commit = false;
-
- switch (op) {
- case Selection::Toggle:
- if (selection->selected (&view)) {
- if (!no_remove) {
- selection->remove (&view);
- commit = true;
- }
- } else {
- selection->add (&view);
- commit = false;
- }
- break;
-
- case Selection::Add:
- if (!selection->selected (&view)) {
- selection->add (&view);
- commit = true;
- }
- break;
-
- case Selection::Set:
- if (selection->selected (&view) && selection->tracks.size() == 1) {
- /* no commit necessary */
- } else {
-
- /* reset track selection if there is only 1 other track
- selected OR if no_remove is not set (its there to
- prevent deselecting a multi-track selection
- when clicking on an already selected track
- for some reason.
- */
-
- if (selection->tracks.empty()) {
- selection->set (&view);
- commit = true;
- } else if (selection->tracks.size() == 1 || !no_remove) {
- selection->set (&view);
- commit = true;
- }
- }
- break;
-
- case Selection::Extend:
- commit = extend_selection_to_track (view);
- break;
- }
-
- return commit;
-}
-
-bool
-Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool no_remove)
-{
- if (!clicked_trackview) {
- return false;
- }
-
- if (!press) {
- return false;
- }
-
- return set_selected_track (*clicked_trackview, op, no_remove);
-}
-
-bool
-Editor::set_selected_control_point_from_click (Selection::Operation op, bool no_remove)
-{
- if (!clicked_control_point) {
- return false;
- }
-
- /* select this point and any others that it represents */
-
- double y1, y2;
- nframes_t x1, x2;
-
- x1 = pixel_to_frame (clicked_control_point->get_x() - 10);
- x2 = pixel_to_frame (clicked_control_point->get_x() + 10);
- y1 = clicked_control_point->get_x() - 10;
- y2 = clicked_control_point->get_y() + 10;
-
- return select_all_within (x1, x2, y1, y2, op);
-}
-
-void
-Editor::get_relevant_audio_tracks (set<AudioTimeAxisView*>& relevant_tracks)
-{
- /* step one: get all selected tracks and all tracks in the relevant edit groups */
-
- for (TrackSelection::iterator ti = selection->tracks.begin(); ti != selection->tracks.end(); ++ti) {
-
- AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*ti);
-
- if (!atv) {
- continue;
- }
-
- RouteGroup* group = atv->route()->edit_group();
-
- if (group && group->is_active()) {
-
- /* active group for this track, loop over all tracks and get every member of the group */
-
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-
- AudioTimeAxisView* tatv;
-
- if ((tatv = dynamic_cast<AudioTimeAxisView*> (*i)) != 0) {
-
- if (tatv->route()->edit_group() == group) {
- relevant_tracks.insert (tatv);
- }
- }
- }
- } else {
- relevant_tracks.insert (atv);
- }
- }
-}
-
-void
-Editor::mapover_audio_tracks (slot<void,AudioTimeAxisView&,uint32_t> sl)
-{
- set<AudioTimeAxisView*> relevant_tracks;
-
- get_relevant_audio_tracks (relevant_tracks);
-
- uint32_t sz = relevant_tracks.size();
-
- for (set<AudioTimeAxisView*>::iterator ati = relevant_tracks.begin(); ati != relevant_tracks.end(); ++ati) {
- sl (**ati, sz);
- }
-}
-
-void
-Editor::mapped_set_selected_regionview_from_click (RouteTimeAxisView& tv, uint32_t ignored,
- RegionView* basis, vector<RegionView*>* all_equivs)
-{
- boost::shared_ptr<Playlist> pl;
- vector<boost::shared_ptr<Region> > results;
- RegionView* marv;
- boost::shared_ptr<Diskstream> ds;
-
- if ((ds = tv.get_diskstream()) == 0) {
- /* bus */
- return;
- }
-
- if (&tv == &basis->get_time_axis_view()) {
- /* looking in same track as the original */
- return;
- }
-
- if ((pl = ds->playlist()) != 0) {
- pl->get_equivalent_regions (basis->region(), results);
- }
-
- for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
- if ((marv = tv.view()->find_view (*ir)) != 0) {
- all_equivs->push_back (marv);
- }
- }
-}
-
-bool
-Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, bool no_track_remove)
-{
- vector<RegionView*> all_equivalent_regions;
- bool commit = false;
-
- if (!clicked_regionview || !clicked_audio_trackview) {
- return false;
- }
-
- if (press) {
- button_release_can_deselect = false;
- }
-
- if (op == Selection::Toggle || op == Selection::Set) {
-
- mapover_audio_tracks (bind (mem_fun (*this, &Editor::mapped_set_selected_regionview_from_click),
- clicked_regionview, &all_equivalent_regions));
-
-
- /* add clicked regionview since we skipped all other regions in the same track as the one it was in */
-
- all_equivalent_regions.push_back (clicked_regionview);
-
- switch (op) {
- case Selection::Toggle:
-
- if (clicked_regionview->get_selected()) {
- if (press) {
-
- /* whatever was clicked was selected already; do nothing here but allow
- the button release to deselect it
- */
-
- button_release_can_deselect = true;
-
- } else {
-
- if (button_release_can_deselect) {
-
- /* just remove this one region, but only on a permitted button release */
-
- selection->remove (clicked_regionview);
- commit = true;
-
- /* no more deselect action on button release till a new press
- finds an already selected object.
- */
-
- button_release_can_deselect = false;
- }
- }
-
- } else {
-
- if (press) {
- /* add all the equivalent regions, but only on button press */
-
- if (!all_equivalent_regions.empty()) {
- commit = true;
- }
-
- for (vector<RegionView*>::iterator i = all_equivalent_regions.begin(); i != all_equivalent_regions.end(); ++i) {
- selection->add (*i);
- }
- }
- }
- break;
-
- case Selection::Set:
- if (!clicked_regionview->get_selected()) {
- selection->set (all_equivalent_regions);
- commit = true;
- } else {
- /* no commit necessary: clicked on an already selected region */
- goto out;
- }
- break;
-
- default:
- /* silly compiler */
- break;
- }
-
- } else if (op == Selection::Extend) {
-
- list<Selectable*> results;
- nframes_t last_frame;
- nframes_t first_frame;
-
- /* 1. find the last selected regionview in the track that was clicked in */
-
- last_frame = 0;
- first_frame = max_frames;
-
- for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) {
- if (&(*x)->get_time_axis_view() == &clicked_regionview->get_time_axis_view()) {
-
- if ((*x)->region()->last_frame() > last_frame) {
- last_frame = (*x)->region()->last_frame();
- }
-
- if ((*x)->region()->first_frame() < first_frame) {
- first_frame = (*x)->region()->first_frame();
- }
- }
- }
-
- /* 2. figure out the boundaries for our search for new objects */
-
- switch (clicked_regionview->region()->coverage (first_frame, last_frame)) {
- case OverlapNone:
- if (last_frame < clicked_regionview->region()->first_frame()) {
- first_frame = last_frame;
- last_frame = clicked_regionview->region()->last_frame();
- } else {
- last_frame = first_frame;
- first_frame = clicked_regionview->region()->first_frame();
- }
- break;
-
- case OverlapExternal:
- if (last_frame < clicked_regionview->region()->first_frame()) {
- first_frame = last_frame;
- last_frame = clicked_regionview->region()->last_frame();
- } else {
- last_frame = first_frame;
- first_frame = clicked_regionview->region()->first_frame();
- }
- break;
-
- case OverlapInternal:
- if (last_frame < clicked_regionview->region()->first_frame()) {
- first_frame = last_frame;
- last_frame = clicked_regionview->region()->last_frame();
- } else {
- last_frame = first_frame;
- first_frame = clicked_regionview->region()->first_frame();
- }
- break;
-
- case OverlapStart:
- case OverlapEnd:
- /* nothing to do except add clicked region to selection, since it
- overlaps with the existing selection in this track.
- */
- break;
- }
-
- /* 2. find all selectable objects (regionviews in this case) between that one and the end of the
- one that was clicked.
- */
-
- set<AudioTimeAxisView*> relevant_tracks;
-
- get_relevant_audio_tracks (relevant_tracks);
-
- for (set<AudioTimeAxisView*>::iterator t = relevant_tracks.begin(); t != relevant_tracks.end(); ++t) {
- (*t)->get_selectables (first_frame, last_frame, -1.0, -1.0, results);
- }
-
- /* 3. convert to a vector of audio regions */
-
- vector<RegionView*> regions;
-
- for (list<Selectable*>::iterator x = results.begin(); x != results.end(); ++x) {
- RegionView* arv;
-
- if ((arv = dynamic_cast<RegionView*>(*x)) != 0) {
- regions.push_back (arv);
- }
- }
-
- if (!regions.empty()) {
- selection->add (regions);
- commit = true;
- }
- }
-
- out:
- return commit;
-}
-
-void
-Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> region, Selection::Operation op)
-{
- vector<RegionView*> all_equivalent_regions;
-
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-
- RouteTimeAxisView* tatv;
-
- if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
-
- boost::shared_ptr<Playlist> pl;
- vector<boost::shared_ptr<Region> > results;
- RegionView* marv;
- boost::shared_ptr<Diskstream> ds;
-
- if ((ds = tatv->get_diskstream()) == 0) {
- /* bus */
- continue;
- }
-
- if ((pl = (ds->playlist())) != 0) {
- pl->get_region_list_equivalent_regions (region, results);
- }
-
- for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
- if ((marv = tatv->view()->find_view (*ir)) != 0) {
- all_equivalent_regions.push_back (marv);
- }
- }
-
- }
- }
-
- begin_reversible_command (_("set selected regions"));
-
- switch (op) {
- case Selection::Toggle:
- /* XXX this is not correct */
- selection->toggle (all_equivalent_regions);
- break;
- case Selection::Set:
- selection->set (all_equivalent_regions);
- break;
- case Selection::Extend:
- selection->add (all_equivalent_regions);
- break;
- case Selection::Add:
- selection->add (all_equivalent_regions);
- break;
- }
-
- commit_reversible_command () ;
-}
-
-bool
-Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, boost::weak_ptr<Region> weak_r)
-{
- RegionView* rv;
- boost::shared_ptr<Region> r (weak_r.lock());
-
- if (!r) {
- return true;
- }
-
- boost::shared_ptr<AudioRegion> ar;
-
- if ((ar = boost::dynamic_pointer_cast<AudioRegion> (r)) == 0) {
- return true;
- }
-
- if ((rv = sv->find_view (ar)) == 0) {
- return true;
- }
-
- /* don't reset the selection if its something other than
- a single other region.
- */
-
- if (selection->regions.size() > 1) {
- return true;
- }
-
- begin_reversible_command (_("set selected regions"));
-
- selection->set (rv);
-
- commit_reversible_command () ;
-
- return true;
-}
-
void
Editor::set_edit_group_solo (Route& route, bool yn)
{
}
void
-Editor::duplicate_dialog (bool dup_region)
+Editor::duplicate_dialog (bool with_dialog)
{
- if (dup_region) {
- if (clicked_regionview == 0) {
- return;
- }
- } else {
+ float times = 1.0f;
+
+ if (mouse_mode == MouseRange) {
if (selection->time.length() == 0) {
return;
}
}
- ArdourDialog win ("duplicate dialog");
- Entry entry;
- Label label (_("Duplicate how many times?"));
-
- win.get_vbox()->pack_start (label);
- win.add_action_widget (entry, RESPONSE_ACCEPT);
- win.add_button (Stock::OK, RESPONSE_ACCEPT);
- win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
-
- win.set_position (WIN_POS_MOUSE);
-
- entry.set_text ("1");
- set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
- entry.select_region (0, -1);
- entry.grab_focus ();
+
+ if (mouse_mode != MouseRange) {
+ ensure_entered_region_selected (true);
- switch (win.run ()) {
- case RESPONSE_ACCEPT:
- break;
- default:
- return;
+ if (selection->regions.empty()) {
+ return;
+ }
}
- string text = entry.get_text();
- float times;
+ if (with_dialog) {
- if (sscanf (text.c_str(), "%f", ×) == 1) {
- if (dup_region) {
- RegionSelection regions;
- regions.add (clicked_regionview);
- duplicate_some_regions (regions, times);
- } else {
- duplicate_selection (times);
+ ArdourDialog win ("duplicate dialog");
+ Label label (_("Duplicate how many times?"));
+ Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
+ SpinButton spinner (adjustment);
+
+ win.get_vbox()->set_spacing (12);
+ win.get_vbox()->pack_start (label);
+
+ /* dialogs have ::add_action_widget() but that puts the spinner in the wrong
+ place, visually. so do this by hand.
+ */
+
+ win.get_vbox()->pack_start (spinner);
+ spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
+
+ label.show ();
+ spinner.show ();
+
+ win.add_button (Stock::OK, RESPONSE_ACCEPT);
+ win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+
+ win.set_position (WIN_POS_MOUSE);
+
+ spinner.grab_focus ();
+
+ switch (win.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
}
+
+ times = adjustment.get_value();
+ }
+
+ if (mouse_mode == MouseRange) {
+ duplicate_selection (times);
+ } else {
+ duplicate_some_regions (selection->regions, times);
}
}
void
Editor::show_verbose_canvas_cursor ()
{
- verbose_canvas_cursor->raise_to_top();
- verbose_canvas_cursor->show();
+ verbose_canvas_cursor->raise_to_top();
+ verbose_canvas_cursor->show();
verbose_cursor_visible = true;
}
void
Editor::hide_verbose_canvas_cursor ()
{
- verbose_canvas_cursor->hide();
+ verbose_canvas_cursor->hide();
verbose_cursor_visible = false;
}
verbose_canvas_cursor->property_text() = txt.c_str();
}
+void
+Editor::set_edit_mode (EditMode m)
+{
+ Config->set_edit_mode (m);
+}
+
+void
+Editor::cycle_edit_mode ()
+{
+ switch (Config->get_edit_mode()) {
+ case Slide:
+ Config->set_edit_mode (Splice);
+ break;
+ case Splice:
+ Config->set_edit_mode (Slide);
+ break;
+ }
+}
+
void
Editor::edit_mode_selection_done ()
{
Editor::snap_type_selection_done ()
{
string choice = snap_type_selector.get_active_text();
- SnapType snaptype = SnapToFrame;
+ SnapType snaptype = SnapToBeat;
if (choice == _("Beats/3")) {
snaptype = SnapToAThirdBeat;
snaptype = SnapToBar;
} else if (choice == _("Marks")) {
snaptype = SnapToMark;
- } else if (choice == _("Edit Cursor")) {
- snaptype = SnapToEditCursor;
} else if (choice == _("Region starts")) {
snaptype = SnapToRegionStart;
} else if (choice == _("Region ends")) {
snaptype = SnapToSeconds;
} else if (choice == _("Minutes")) {
snaptype = SnapToMinutes;
- } else if (choice == _("None")) {
- snaptype = SnapToFrame;
}
RefPtr<RadioAction> ract = snap_type_action (snaptype);
string choice = snap_mode_selector.get_active_text();
SnapMode mode = SnapNormal;
- if (choice == _("Normal")) {
+ if (choice == _("No Grid")) {
+ mode = SnapOff;
+ } else if (choice == _("Grid")) {
mode = SnapNormal;
} else if (choice == _("Magnetic")) {
mode = SnapMagnetic;
}
void
-Editor::zoom_focus_selection_done ()
-{
- string choice = zoom_focus_selector.get_active_text();
- ZoomFocus focus_type = ZoomFocusLeft;
-
- if (choice == _("Left")) {
- focus_type = ZoomFocusLeft;
- } else if (choice == _("Right")) {
- focus_type = ZoomFocusRight;
- } else if (choice == _("Center")) {
- focus_type = ZoomFocusCenter;
- } else if (choice == _("Playhead")) {
- focus_type = ZoomFocusPlayhead;
- } else if (choice == _("Edit Cursor")) {
- focus_type = ZoomFocusEdit;
- }
-
- RefPtr<RadioAction> ract = zoom_focus_action (focus_type);
-
- if (ract) {
- ract->set_active ();
- }
-}
-
-gint
-Editor::edit_controls_button_release (GdkEventButton* ev)
+Editor::cycle_edit_point (bool with_marker)
{
- if (Keyboard::is_context_menu_event (ev)) {
- ARDOUR_UI::instance()->add_route ();
+ switch (_edit_point) {
+ case EditAtMouse:
+ set_edit_point_preference (EditAtPlayhead);
+ break;
+ case EditAtPlayhead:
+ if (with_marker) {
+ set_edit_point_preference (EditAtSelectedMarker);
+ } else {
+ set_edit_point_preference (EditAtMouse);
+ }
+ break;
+ case EditAtSelectedMarker:
+ set_edit_point_preference (EditAtMouse);
+ break;
}
- return TRUE;
}
void
-Editor::track_selection_changed ()
+Editor::edit_point_selection_done ()
{
- switch (selection->tracks.size()){
- case 0:
- break;
- default:
- set_selected_mixer_strip (*(selection->tracks.front()));
- break;
- }
+ string choice = edit_point_selector.get_active_text();
+ EditPoint ep = EditAtSelectedMarker;
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->set_selected (false);
- if (mouse_mode == MouseRange) {
- (*i)->hide_selection ();
- }
+ if (choice == _("Marker")) {
+ set_edit_point_preference (EditAtSelectedMarker);
+ } else if (choice == _("Playhead")) {
+ set_edit_point_preference (EditAtPlayhead);
+ } else {
+ set_edit_point_preference (EditAtMouse);
}
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- (*i)->set_selected (true);
- if (mouse_mode == MouseRange) {
- (*i)->show_selection (selection->time);
- }
+ RefPtr<RadioAction> ract = edit_point_action (ep);
+
+ if (ract) {
+ ract->set_active (true);
}
}
void
-Editor::time_selection_changed ()
+Editor::zoom_focus_selection_done ()
{
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->hide_selection ();
- }
-
- if (selection->tracks.empty()) {
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->show_selection (selection->time);
- }
- } else {
- for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
- (*i)->show_selection (selection->time);
- }
- }
+ string choice = zoom_focus_selector.get_active_text();
+ ZoomFocus focus_type = ZoomFocusLeft;
- if (selection->time.empty()) {
- ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false);
+ if (choice == _("Left")) {
+ focus_type = ZoomFocusLeft;
+ } else if (choice == _("Right")) {
+ focus_type = ZoomFocusRight;
+ } else if (choice == _("Center")) {
+ focus_type = ZoomFocusCenter;
+ } else if (choice == _("Play")) {
+ focus_type = ZoomFocusPlayhead;
+ } else if (choice == _("Edit")) {
+ focus_type = ZoomFocusEdit;
+ } else if (choice == _("Edit Point")) {
+ focus_type = ZoomFocusEdit;
} else {
- ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
- }
-}
+ focus_type = ZoomFocusMouse;
+ }
+
+ RefPtr<RadioAction> ract = zoom_focus_action (focus_type);
-void
-Editor::region_selection_changed ()
-{
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->set_selected_regionviews (selection->regions);
+ if (ract) {
+ ract->set_active ();
}
-}
+}
-void
-Editor::point_selection_changed ()
+gint
+Editor::edit_controls_button_release (GdkEventButton* ev)
{
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
- (*i)->set_selected_points (selection->points);
+ if (Keyboard::is_context_menu_event (ev)) {
+ ARDOUR_UI::instance()->add_route (this);
}
+ return TRUE;
}
gint
/* this handles just right-clicks */
if (ev->button != 3) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
Editor::TrackViewList *
if ((_show_measures = yn) == true) {
draw_measures ();
}
- DisplayControlChanged (ShowMeasures);
instant_save ();
}
}
/* catch up */
update_current_screen ();
}
- DisplayControlChanged (FollowPlayhead);
instant_save ();
}
}
label.show ();
dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT);
- dialog.add_button (_("Keep playlist"), RESPONSE_CANCEL);
+ dialog.add_button (_("Keep playlist"), RESPONSE_REJECT);
dialog.add_button (_("Cancel"), RESPONSE_CANCEL);
switch (dialog.run ()) {
return false;
}
+
+/** A new snapshot has been selected.
+ */
void
Editor::snapshot_display_selection_changed ()
{
bool
Editor::snapshot_display_button_press (GdkEventButton* ev)
{
- return false;
+ if (ev->button == 3) {
+ /* Right-click on the snapshot list. Work out which snapshot it
+ was over. */
+ Gtk::TreeModel::Path path;
+ Gtk::TreeViewColumn* col;
+ int cx;
+ int cy;
+ snapshot_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy);
+ Gtk::TreeModel::iterator iter = snapshot_display_model->get_iter (path);
+ if (iter) {
+ Gtk::TreeModel::Row row = *iter;
+ popup_snapshot_context_menu (ev->button, ev->time, row[snapshot_display_columns.real_name]);
+ }
+ return true;
+ }
+
+ return false;
+}
+
+
+/** Pop up the snapshot display context menu.
+ * @param button Button used to open the menu.
+ * @param time Menu open time.
+ * @snapshot_name Name of the snapshot that the menu click was over.
+ */
+
+void
+Editor::popup_snapshot_context_menu (int button, int32_t time, Glib::ustring snapshot_name)
+{
+ using namespace Menu_Helpers;
+
+ MenuList& items (snapshot_context_menu.items());
+ items.clear ();
+
+ const bool modification_allowed = (session->snap_name() != snapshot_name && session->name() != snapshot_name);
+
+ add_item_with_sensitivity (items, MenuElem (_("Remove"), bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)), modification_allowed);
+
+ add_item_with_sensitivity (items, MenuElem (_("Rename"), bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)), modification_allowed);
+
+ snapshot_context_menu.popup (button, time);
+}
+
+void
+Editor::rename_snapshot (Glib::ustring old_name)
+{
+ ArdourPrompter prompter(true);
+
+ string new_name;
+
+ prompter.set_name ("Prompter");
+ prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+ prompter.set_prompt (_("New name of snapshot"));
+ prompter.set_initial_text (old_name);
+
+ if (prompter.run() == RESPONSE_ACCEPT) {
+ prompter.get_result (new_name);
+ if (new_name.length()) {
+ session->rename_state (old_name, new_name);
+ redisplay_snapshots ();
+ }
+ }
+}
+
+
+void
+Editor::remove_snapshot (Glib::ustring name)
+{
+ vector<string> choices;
+
+ std::string prompt = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(cannot be undone)"), name);
+
+ choices.push_back (_("No, do nothing."));
+ choices.push_back (_("Yes, remove it."));
+
+ Gtkmm2ext::Choice prompter (prompt, choices);
+
+ if (prompter.run () == 1) {
+ session->remove_state (name);
+ redisplay_snapshots ();
+ }
}
void
return;
}
- vector<string*>* states;
+ vector<sys::path> state_file_paths;
- if ((states = session->possible_states()) == 0) {
- return;
- }
+ get_state_files_in_directory (session->session_directory().root_path(),
+ state_file_paths);
+
+ if (state_file_paths.empty()) return;
+
+ vector<string> state_file_names(get_file_names_no_extension(state_file_paths));
snapshot_display_model->clear ();
- for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
- string statename = *(*i);
+ for (vector<string>::iterator i = state_file_names.begin();
+ i != state_file_names.end(); ++i)
+ {
+ string statename = (*i);
TreeModel::Row row = *(snapshot_display_model->append());
/* this lingers on in case we ever want to change the visible
row[snapshot_display_columns.visible_name] = display_name;
row[snapshot_display_columns.real_name] = statename;
}
-
- delete states;
}
void
);
}
+/**
+ * Make new playlists for a given track and also any others that belong
+ * to the same active edit group.
+ * @param v Track.
+ */
+
void
-Editor::new_playlists ()
+Editor::new_playlists (TimeAxisView* v)
{
begin_reversible_command (_("new playlists"));
- mapover_audio_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist));
+ mapover_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist), v);
commit_reversible_command ();
}
+/**
+ * Use a copy of the current playlist for a given track and also any others that belong
+ * to the same active edit group.
+ * @param v Track.
+ */
+
void
-Editor::copy_playlists ()
+Editor::copy_playlists (TimeAxisView* v)
{
begin_reversible_command (_("copy playlists"));
- mapover_audio_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist));
+ mapover_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist), v);
commit_reversible_command ();
}
+/**
+ * Clear the current playlist for a given track and also any others that belong
+ * to the same active edit group.
+ * @param v Track.
+ */
+
void
-Editor::clear_playlists ()
+Editor::clear_playlists (TimeAxisView* v)
{
begin_reversible_command (_("clear playlists"));
- mapover_audio_tracks (mem_fun (*this, &Editor::mapped_clear_playlist));
+ mapover_tracks (mem_fun (*this, &Editor::mapped_clear_playlist), v);
commit_reversible_command ();
}
void
-Editor::mapped_use_new_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz)
{
atv.use_new_playlist (sz > 1 ? false : true);
}
void
-Editor::mapped_use_copy_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz)
{
atv.use_copy_playlist (sz > 1 ? false : true);
}
void
-Editor::mapped_clear_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_clear_playlist (RouteTimeAxisView& atv, uint32_t sz)
{
atv.clear_playlist ();
}
return key_press_focus_accelerator_handler (*this, ev);
}
+bool
+Editor::on_key_release_event (GdkEventKey* ev)
+{
+ return Gtk::Window::on_key_release_event (ev);
+ // return key_press_focus_accelerator_handler (*this, ev);
+}
+
void
Editor::reset_x_origin (nframes_t frame)
{
}
void
-Editor::set_frames_per_unit (double fpu)
+Editor::swap_visual_state ()
{
- nframes_t frames;
+ if (last_visual_state.frames_per_unit == 0) {
+ // never set
+ return;
+ }
+
+ /* note: the correct functionality here is very dependent on the ordering of
+ setting zoom focus, horizontal position and finally zoom. this is because
+ it is set_frames_per_unit() that overwrites last_visual_state.
+ */
+
+ set_zoom_focus (last_visual_state.zoom_focus);
+ reposition_and_zoom (last_visual_state.leftmost_frame, last_visual_state.frames_per_unit);
+ zoomed_to_region = false;
+}
+void
+Editor::set_frames_per_unit (double fpu)
+{
/* this is the core function that controls the zoom level of the canvas. it is called
whenever one or more calls are made to reset_zoom(). it executes in an idle handler.
*/
fpu = 2.0;
}
- // convert fpu to frame count
-
- frames = (nframes_t) floor (fpu * canvas_width);
/* don't allow zooms that fit more than the maximum number
of frames into an 800 pixel wide space.
if (fpu == frames_per_unit) {
return;
}
+
+ last_visual_state.frames_per_unit = frames_per_unit;
+ last_visual_state.leftmost_frame = leftmost_frame;
+ last_visual_state.zoom_focus = zoom_focus;
frames_per_unit = fpu;
+ post_zoom ();
+}
+
+void
+Editor::post_zoom ()
+{
+ // convert fpu to frame count
+
+ nframes_t frames = (nframes_t) floor (frames_per_unit * canvas_width);
- if (frames != zoom_range_clock.current_duration()) {
+ if (frames_per_unit != zoom_range_clock.current_duration()) {
zoom_range_clock.set (frames);
}
reset_hscrollbar_stepping ();
reset_scrolling_region ();
-
- if (edit_cursor) edit_cursor->set_position (edit_cursor->current_frame);
+
if (playhead_cursor) playhead_cursor->set_position (playhead_cursor->current_frame);
instant_save ();
}
-void
-Editor::canvas_horizontally_scrolled ()
-{
- /* this is the core function that controls horizontal scrolling of the canvas. it is called
- whenever the horizontal_adjustment emits its "value_changed" signal. it executes in an
- idle handler.
- */
-
- leftmost_frame = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
- nframes_t rightmost_frame = leftmost_frame + current_page_frames ();
-
- if (rightmost_frame > last_canvas_frame) {
- last_canvas_frame = rightmost_frame;
- reset_scrolling_region ();
- }
-
- update_fixed_rulers ();
- tempo_map_changed (Change (0));
-}
-
void
Editor::queue_visual_change (nframes_t where)
{
pending_visual_change.pending = VisualChange::Type (pending_visual_change.pending | VisualChange::TimeOrigin);
pending_visual_change.time_origin = where;
-
+
if (pending_visual_change.idle_handler_id < 0) {
pending_visual_change.idle_handler_id = g_idle_add (_idle_visual_changer, this);
}
pending_visual_change.frames_per_unit = fpu;
if (pending_visual_change.idle_handler_id < 0) {
- pending_visual_change.idle_handler_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE, _idle_visual_changer, this, 0);
+ pending_visual_change.idle_handler_id = g_idle_add ( _idle_visual_changer, this);
}
+
}
int
VisualChange::Type p = pending_visual_change.pending;
pending_visual_change.pending = (VisualChange::Type) 0;
- pending_visual_change.idle_handler_id = -1;
-
+
if (p & VisualChange::ZoomLevel) {
set_frames_per_unit (pending_visual_change.frames_per_unit);
- }
+ compute_fixed_ruler_scale ();
+ compute_current_bbt_points(pending_visual_change.time_origin, pending_visual_change.time_origin + (nframes_t)(canvas_width * pending_visual_change.frames_per_unit));
+ compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + (nframes_t)(canvas_width * pending_visual_change.frames_per_unit));
+ update_tempo_based_rulers ();
+ }
if (p & VisualChange::TimeOrigin) {
- if (pending_visual_change.time_origin != leftmost_frame) {
+
+ nframes_t time_origin = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
+ if (time_origin != pending_visual_change.time_origin) {
horizontal_adjustment.set_value (pending_visual_change.time_origin/frames_per_unit);
- /* the signal handler will do the rest */
} else {
update_fixed_rulers();
- tempo_map_changed (Change (0));
+ redisplay_tempo (true);
}
}
+ pending_visual_change.idle_handler_id = -1;
- return 0;
+ return 0; /* this is always a one-shot call */
}
struct EditorOrderTimeAxisSorter {
};
void
-Editor::sort_track_selection ()
+Editor::sort_track_selection (TrackSelection* sel)
{
EditorOrderTimeAxisSorter cmp;
- selection->tracks.sort (cmp);
+
+ if (sel) {
+ sel->sort (cmp);
+ } else {
+ selection->tracks.sort (cmp);
+ }
+}
+
+nframes64_t
+Editor::get_preferred_edit_position (bool ignore_playhead)
+{
+ bool ignored;
+ nframes64_t where = 0;
+ EditPoint ep = _edit_point;
+
+ if (entered_marker) {
+ return entered_marker->position();
+ }
+
+ if (ignore_playhead && ep == EditAtPlayhead) {
+ ep = EditAtSelectedMarker;
+ }
+
+ switch (ep) {
+ case EditAtPlayhead:
+ where = session->audible_frame();
+ break;
+
+ case EditAtSelectedMarker:
+ if (!selection->markers.empty()) {
+ bool is_start;
+ Location* loc = find_location_from_marker (selection->markers.front(), is_start);
+ if (loc) {
+ if (is_start) {
+ where = loc->start();
+ } else {
+ where = loc->end();
+ }
+ break;
+ }
+ }
+ /* fallthru */
+
+ default:
+ case EditAtMouse:
+ if (!mouse_frame (where, ignored)) {
+ /* XXX not right but what can we do ? */
+ return 0;
+ }
+ snap_to (where);
+ break;
+ }
+
+ return where;
+}
+
+void
+Editor::set_loop_range (nframes_t start, nframes_t end, string cmd)
+{
+ if (!session) return;
+
+ begin_reversible_command (cmd);
+
+ Location* tll;
+
+ if ((tll = transport_loop_location()) == 0) {
+ Location* loc = new Location (start, end, _("Loop"), Location::IsAutoLoop);
+ XMLNode &before = session->locations()->get_state();
+ session->locations()->add (loc, true);
+ session->set_auto_loop_location (loc);
+ XMLNode &after = session->locations()->get_state();
+ session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+ }
+ else {
+ XMLNode &before = tll->get_state();
+ tll->set_hidden (false, this);
+ tll->set (start, end);
+ XMLNode &after = tll->get_state();
+ session->add_command (new MementoCommand<Location>(*tll, &before, &after));
+ }
+
+ commit_reversible_command ();
+}
+
+void
+Editor::set_punch_range (nframes_t start, nframes_t end, string cmd)
+{
+ if (!session) return;
+
+ begin_reversible_command (cmd);
+
+ Location* tpl;
+
+ if ((tpl = transport_punch_location()) == 0) {
+ Location* loc = new Location (start, end, _("Loop"), Location::IsAutoPunch);
+ XMLNode &before = session->locations()->get_state();
+ session->locations()->add (loc, true);
+ session->set_auto_loop_location (loc);
+ XMLNode &after = session->locations()->get_state();
+ session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+ }
+ else {
+ XMLNode &before = tpl->get_state();
+ tpl->set_hidden (false, this);
+ tpl->set (start, end);
+ XMLNode &after = tpl->get_state();
+ session->add_command (new MementoCommand<Location>(*tpl, &before, &after));
+ }
+
+ commit_reversible_command ();
+}
+
+RegionSelection
+Editor::get_regions_at (nframes64_t where, const TrackSelection& ts) const
+{
+ RegionSelection rs;
+ const TrackSelection* tracks;
+
+ if (ts.empty()) {
+ tracks = &track_views;
+ } else {
+ tracks = &ts;
+ }
+
+ for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
+
+ AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t);
+
+ if (atv) {
+ boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Playlist> pl;
+
+ if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
+
+ Playlist::RegionList* regions = pl->regions_at ((nframes_t) floor ( (double)where * ds->speed()));
+
+ for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+
+ RegionView* rv = atv->audio_view()->find_view (*i);
+
+ if (rv) {
+ rs.push_back (rv);
+ }
+ }
+
+ delete regions;
+ }
+ }
+ }
+
+ return rs;
+}
+
+
+RegionSelection
+Editor::get_regions_after (nframes64_t where, const TrackSelection& ts) const
+{
+ RegionSelection rs;
+ const TrackSelection* tracks;
+
+ if (ts.empty()) {
+ tracks = &track_views;
+ } else {
+ tracks = &ts;
+ }
+
+ for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
+
+ AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t);
+
+ if (atv) {
+ boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Playlist> pl;
+
+ if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
+
+ Playlist::RegionList* regions = pl->regions_touched ((nframes_t) floor ( (double)where * ds->speed()), max_frames);
+
+ for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+
+ RegionView* rv = atv->audio_view()->find_view (*i);
+
+ if (rv) {
+ rs.push_back (rv);
+ }
+ }
+
+ delete regions;
+ }
+ }
+ }
+
+ return rs;
+}
+
+RegionSelection&
+Editor::get_regions_for_action ()
+{
+ if (!selection->regions.empty()) {
+ return selection->regions;
+ }
+
+ nframes64_t where = get_preferred_edit_position();
+ tmp_regions = get_regions_at (where, selection->tracks);
+ return tmp_regions;
}
+void
+Editor::get_regions_corresponding_to (boost::shared_ptr<Region> region, vector<RegionView*>& regions)
+{
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+
+ RouteTimeAxisView* tatv;
+
+ if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
+
+ boost::shared_ptr<Playlist> pl;
+ vector<boost::shared_ptr<Region> > results;
+ RegionView* marv;
+ boost::shared_ptr<Diskstream> ds;
+
+ if ((ds = tatv->get_diskstream()) == 0) {
+ /* bus */
+ continue;
+ }
+
+ if ((pl = (ds->playlist())) != 0) {
+ pl->get_region_list_equivalent_regions (region, results);
+ }
+
+ for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
+ if ((marv = tatv->view()->find_view (*ir)) != 0) {
+ regions.push_back (marv);
+ }
+ }
+
+ }
+ }
+}
projects / ardour.git / blobdiff