#include <sigc++/bind.h>
+#include <pbd/convert.h>
#include <pbd/error.h>
#include <gtkmm/image.h>
#include <gtkmm2ext/utils.h>
#include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
#include <ardour/plugin_manager.h>
#include <ardour/location.h>
#include <ardour/audioplaylist.h>
#include <ardour/tempo.h>
#include <ardour/utils.h>
+#include <control_protocol/control_protocol.h>
+
#include "ardour_ui.h"
#include "editor.h"
#include "grouped_buttons.h"
#include "actions.h"
#include "gui_thread.h"
+#ifdef FFT_ANALYSIS
+#include "analysis_window.h"
+#endif
+
#include "i18n.h"
/* <CMT Additions> */
using namespace std;
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace Glib;
using namespace Gtkmm2ext;
using namespace Editing;
+using PBD::internationalize;
+using PBD::atoi;
+
const double Editor::timebar_height = 15.0;
#include "editor_xpms"
static const int32_t splice_index = 1;
static const gchar *edit_mode_strings[] = {
- N_("Slide"),
- N_("Splice"),
+ N_("Slide Edit"),
+ N_("Splice Edit"),
0
};
};
static const gchar *snap_mode_strings[] = {
- N_("Normal"),
- N_("Magnetic"),
+ N_("Normal Snap"),
+ N_("Magnetic Snap"),
0
};
static const gchar *zoom_focus_strings[] = {
- N_("Left"),
- N_("Right"),
- N_("Center"),
- N_("Playhead"),
- N_("Edit Cursor"),
+ N_("Focus Left"),
+ N_("Focus Right"),
+ N_("Focus Center"),
+ N_("Focus Play"),
+ N_("Focus Edit"),
0
};
Gdk::Cursor* Editor::wait_cursor = 0;
Gdk::Cursor* Editor::timebar_cursor = 0;
-bool
-Editor::on_key_press_event (GdkEventKey* ev)
-{
- GtkWindow* win = gobj();
-
- /* This exists to allow us to override the way GTK handles
- key events. The normal sequence is:
-
- a) event is delivered to a GtkWindow
- b) accelerators/mnemonics are activated
- c) if (b) didn't handle the event, propagate to
- the focus widget and/or focus chain
-
- The problem with this is that if the accelerators include
- keys without modifiers, such as the space bar or the
- letter "e", then pressing the key while typing into
- a text entry widget results in the accelerator being
- activated, instead of the desired letter appearing
- in the text entry.
-
- There is no good way of fixing this, but this
- represents a compromise. The idea is that
- key events involving modifiers (not Shift)
- get routed into the activation pathway first, then
- get propagated to the focus widget if necessary.
-
- If the key event doesn't involve modifiers,
- we deliver to the focus widget first, thus allowing
- it to get "normal text" without interference
- from acceleration.
-
- Of course, this can also be problematic: if there
- is a widget with focus, then it will swallow
- all "normal text" accelerators.
- */
-
- if (ev->state & ~Gdk::SHIFT_MASK) {
- /* modifiers in effect, accelerate first */
- if (!gtk_window_activate_key (win, ev)) {
- return gtk_window_propagate_key_event (win, ev);
- } else {
- return true;
- }
- }
-
- /* no modifiers, propagate first */
-
- if (!gtk_window_propagate_key_event (win, ev)) {
- return gtk_window_activate_key (win, ev);
- }
-
-
- return true;
-}
-
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),
reset them as needed.
*/
- vertical_adjustment (0.0, 0.0, 400.0, 10),
- horizontal_adjustment (0.0, 0.0, 1200.0, 20),
+ vertical_adjustment (0.0, 0.0, 10.0, 400.0),
+ horizontal_adjustment (0.0, 0.0, 20.0, 1200.0),
/* tool bar related */
- selection_start_clock (X_("SelectionStartClock"), true),
- selection_end_clock (X_("SelectionEndClock"), true),
edit_cursor_clock (X_("EditCursorClock"), true),
zoom_range_clock (X_("ZoomRangeClock"), true, true),
toolbar_selection_clock_table (2,3),
- mouse_mode_button_table (2, 3),
+ //mouse_mode_button_table (2, 3),
- mouse_select_button (_("range")),
+ /*mouse_select_button (_("range")),
mouse_move_button (_("object")),
mouse_gain_button (_("gain")),
mouse_zoom_button (_("zoom")),
mouse_timefx_button (_("timefx")),
- mouse_audition_button (_("listen")),
+ mouse_audition_button (_("listen")),*/
automation_mode_button (_("mode")),
global_automation_button (_("automation")),
- edit_mode_label (_("Edit Mode")),
- snap_type_label (_("Snap To")),
- snap_mode_label(_("Snap Mode")),
- zoom_focus_label (_("Zoom Focus")),
-
/* <CMT Additions> */
image_socket_listener(0),
/* </CMT Additions> */
/* nudge */
- nudge_label (_("Nudge")),
nudge_clock (X_("NudgeClock"), true, true)
{
canvas_height = 0;
autoscroll_timeout_tag = -1;
interthread_progress_window = 0;
+
+#ifdef FFT_ANALYSIS
+ analysis_window = 0;
+#endif
+
current_interthread_info = 0;
_show_measures = true;
_show_waveforms = true;
route_list_menu = 0;
region_list_menu = 0;
marker_menu = 0;
+ range_marker_menu = 0;
marker_menu_item = 0;
tm_marker_menu = 0;
transport_marker_menu = 0;
clear_entered_track = false;
_new_regionviews_show_envelope = false;
current_timestretch = 0;
-
+ in_edit_group_row_change = false;
+ last_canvas_frame = 0;
edit_cursor = 0;
playhead_cursor = 0;
+ button_release_can_deselect = true;
location_marker_color = color_map[cLocationMarker];
location_range_color = color_map[cLocationRange];
set_mouse_mode (MouseObject, true);
frames_per_unit = 2048; /* too early to use set_frames_per_unit */
+ reset_hscrollbar_stepping ();
+
zoom_focus = ZoomFocusLeft;
+ set_zoom_focus (ZoomFocusLeft);
zoom_range_clock.ValueChanged.connect (mem_fun(*this, &Editor::zoom_adjustment_changed));
initialize_rulers ();
edit_packer.set_col_spacings (0);
edit_packer.set_row_spacings (0);
edit_packer.set_homogeneous (false);
+ 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_hscrollbar, 1, 2, 0, 1, FILL|EXPAND, FILL, 0, 0);
-
- edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, FILL, 0, 0);
- edit_packer.attach (time_canvas_event_box, 1, 2, 1, 2, FILL|EXPAND, FILL, 0, 0);
-
- edit_packer.attach (controls_layout, 0, 1, 2, 3, FILL, FILL|EXPAND, 0, 0);
- edit_packer.attach (track_canvas_event_box, 1, 2, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0);
- edit_packer.attach (edit_vscrollbar, 2, 3, 2, 3, FILL, FILL|EXPAND, 0, 0);
-
- edit_frame.set_name ("BaseFrame");
- edit_frame.set_shadow_type (SHADOW_IN);
- edit_frame.add (edit_packer);
-
- zoom_in_button.set_name ("EditorTimeButton");
- zoom_out_button.set_name ("EditorTimeButton");
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom in"));
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom out"));
-
- zoom_out_full_button.set_name ("EditorTimeButton");
- ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to session"));
+ 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);
- zoom_in_button.add (*(manage (new Image (Stock::ZOOM_IN, ICON_SIZE_BUTTON))));
- zoom_out_button.add (*(manage (new Image (Stock::ZOOM_OUT, ICON_SIZE_BUTTON))));
- zoom_out_full_button.add (*(manage (new Image (Stock::ZOOM_FIT, ICON_SIZE_BUTTON))));
-
- zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
- zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
- zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session));
-
- zoom_indicator_box.pack_start (zoom_out_button, false, false);
- zoom_indicator_box.pack_start (zoom_in_button, false, false);
- zoom_indicator_box.pack_start (zoom_range_clock, false, false);
- zoom_indicator_box.pack_start (zoom_out_full_button, false, false);
-
- zoom_indicator_label.set_text (_("Zoom Span"));
- zoom_indicator_label.set_name ("ToolBarLabel");
+ 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);
- zoom_indicator_vbox.set_spacing (3);
- zoom_indicator_vbox.set_border_width (3);
- zoom_indicator_vbox.pack_start (zoom_indicator_label, false, false);
- zoom_indicator_vbox.pack_start (zoom_indicator_box, false, false);
+ edit_packer.attach (edit_hscrollbar, 2, 3, 2, 3, FILL|EXPAND, FILL, 0, 0);
- bottom_hbox.set_border_width (3);
+ bottom_hbox.set_border_width (2);
bottom_hbox.set_spacing (3);
route_display_model = ListStore::create(route_display_columns);
group_model = ListStore::create(group_columns);
edit_group_display.set_model (group_model);
+ edit_group_display.append_column (_("Name"), group_columns.text);
edit_group_display.append_column (_("Active"), group_columns.is_active);
edit_group_display.append_column (_("Visible"), group_columns.is_visible);
- edit_group_display.append_column (_("Name"), group_columns.text);
edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
edit_group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
edit_group_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
+ edit_group_display.get_column (0)->set_expand (true);
+ edit_group_display.get_column (1)->set_expand (false);
+ edit_group_display.get_column (2)->set_expand (false);
edit_group_display.set_headers_visible (true);
+ /* name is directly editable */
+
+ CellRendererText* name_cell = dynamic_cast<CellRendererText*>(edit_group_display.get_column_cell_renderer (0));
+ name_cell->property_editable() = true;
+ name_cell->signal_edited().connect (mem_fun (*this, &Editor::edit_group_name_edit));
+
/* use checkbox for the active + visible columns */
- CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(edit_group_display.get_column_cell_renderer (0));
+ CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(edit_group_display.get_column_cell_renderer (1));
active_cell->property_activatable() = true;
active_cell->property_radio() = false;
VBox* edit_group_display_packer = manage (new VBox());
HButtonBox* edit_group_display_button_box = manage (new HButtonBox());
- Button* edit_group_add_button = manage (new Button ("+"));
- Button* edit_group_remove_button = manage (new Button("-"));
+ edit_group_display_button_box->set_homogeneous (true);
+
+ Button* edit_group_add_button = manage (new Button ());
+ Button* edit_group_remove_button = manage (new Button ());
+
+ Widget* w;
+
+ w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+ w->show();
+ edit_group_add_button->add (*w);
+
+ w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
+ w->show();
+ edit_group_remove_button->add (*w);
edit_group_add_button->signal_clicked().connect (mem_fun (*this, &Editor::new_edit_group));
edit_group_remove_button->signal_clicked().connect (mem_fun (*this, &Editor::remove_selected_edit_group));
region_list_display.set_model (region_list_model);
region_list_display.append_column (_("Regions"), region_list_columns.name);
region_list_display.set_headers_visible (false);
+ region_list_display.set_hover_expand (true);
region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter));
snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::snapshot_display_selection_changed));
snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Editor::snapshot_display_button_press), false);
- the_notebook.append_page (region_list_scroller, _("Regions"));
- the_notebook.append_page (route_list_scroller, _("Tracks/Busses"));
- the_notebook.append_page (snapshot_display_scroller, _("Snapshots"));
- the_notebook.append_page (*edit_group_display_packer, _("Edit Groups"));
- the_notebook.append_page (named_selection_scroller, _("Chunks"));
+ Gtk::Label* nlabel;
+
+ nlabel = manage (new Label (_("Regions")));
+ nlabel->set_angle (-90);
+ 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);
+ 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);
+
the_notebook.set_show_tabs (true);
the_notebook.set_scrollable (true);
the_notebook.popup_enable ();
+ the_notebook.set_tab_pos (Gtk::POS_RIGHT);
- TearOff *notebook_tearoff = manage (new TearOff (the_notebook, true));
- notebook_tearoff->tearoff_window().set_size_request (200, 400);
-
- edit_pane.pack1 (edit_frame, true, true);
- edit_pane.pack2 (*notebook_tearoff, false, true);
+ edit_pane.pack1 (edit_packer, true, true);
+ edit_pane.pack2 (the_notebook, false, true);
edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
/* nudge stuff */
- nudge_forward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(right_arrow_xpm)))));
- nudge_backward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(left_arrow_xpm)))));
+ nudge_forward_button.add (*(manage (new Image (get_xpm("right_arrow.xpm")))));
+ nudge_backward_button.add (*(manage (new Image (get_xpm("left_arrow.xpm")))));
- ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge region/selection forwards"));
- ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge region/selection backwards"));
+ ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge Region/Selection Forwards"));
+ ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge Region/Selection Backwards"));
nudge_forward_button.set_name ("TransportButton");
nudge_backward_button.set_name ("TransportButton");
signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
signal_delete_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
+ /* allow external control surfaces/protocols to do various things */
+
+ ControlProtocol::ZoomToSession.connect (mem_fun (*this, &Editor::temporal_zoom_session));
+ ControlProtocol::ZoomIn.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), false));
+ ControlProtocol::ZoomOut.connect (bind (mem_fun (*this, &Editor::temporal_zoom_step), true));
+ ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll));
constructed = true;
instant_save ();
}
}
}
-gint
-Editor::left_track_canvas (GdkEventCrossing *ev)
-{
- set_entered_track (0);
- set_entered_regionview (0);
- return FALSE;
-}
-
-
void
Editor::show_window ()
{
which will do the same updates.
*/
- if (session && !no_zoom_repos_update) {
- horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
- }
-
if (!no_zoom_repos_update) {
horizontal_adjustment.set_value (leftmost_frame/frames_per_unit);
update_fixed_rulers ();
ZoomChanged (); /* EMIT_SIGNAL */
+ 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);
if (session) {
session->add_instant_xml(get_state(), session->path());
} else {
- Config->add_instant_xml(get_state(), Config->get_user_ardour_path());
+ Config->add_instant_xml(get_state(), get_user_ardour_path());
}
}
{
if (frame != leftmost_frame) {
leftmost_frame = frame;
- double pixel = frame_to_pixel (frame);
- if (pixel >= horizontal_adjustment.get_upper()) {
- horizontal_adjustment.set_upper (frame_to_pixel (frame + (current_page_frames())));
+
+ jack_nframes_t rightmost_frame = leftmost_frame + current_page_frames ();
+
+ if (rightmost_frame > last_canvas_frame) {
+ last_canvas_frame = rightmost_frame;
+ reset_scrolling_region ();
}
+
horizontal_adjustment.set_value (frame/frames_per_unit);
- XOriginChanged (); /* EMIT_SIGNAL */
}
}
temporal_zoom (fpu);
}
+void
+Editor::control_scroll (float fraction)
+{
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::control_scroll), fraction));
+
+ if (!session) {
+ return;
+ }
+
+ double step = fraction * current_page_frames();
+ jack_nframes_t target;
+
+ if ((fraction < 0.0f) && (session->transport_frame() < (jack_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
+ } else {
+ target = (session->transport_frame() + (jack_nframes_t) floor ((fraction * current_page_frames())));
+ }
+
+ /* move visuals, we'll catch up with it later */
+
+ playhead_cursor->set_position (target);
+
+ if (target > (current_page_frames() / 2)) {
+ /* try to center PH in window */
+ reposition_x_origin (target - (current_page_frames()/2));
+ } else {
+ reposition_x_origin (0);
+ }
+
+ /* cancel the existing */
+
+ control_scroll_connection.disconnect ();
+
+ /* add the next one */
+
+ control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), target), 50);
+}
+
+bool
+Editor::deferred_control_scroll (jack_nframes_t target)
+{
+ session->request_locate (target);
+ return false;
+}
+
void
Editor::canvas_horizontally_scrolled ()
{
leftmost_frame = (jack_nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
-
+
update_fixed_rulers ();
if (!edit_hscroll_dragging) {
Editor::reposition_and_zoom (jack_nframes_t frame, double nfpu)
{
if (!repos_zoom_queued) {
- Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::deferred_reposition_and_zoom), frame, nfpu));
+ Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::deferred_reposition_and_zoom), frame, nfpu));
repos_zoom_queued = true;
}
}
void
Editor::session_control_changed (Session::ControlType t)
{
- // right now we're only tracking the loop and punch state
+ // right now we're only tracking some state here
switch (t) {
case Session::AutoLoop:
update_punch_range_view (true);
break;
+ case Session::LayeringModel:
+ update_layering_model ();
+ break;
+
default:
break;
}
}
-void
-Editor::fake_handle_new_audio_region (AudioRegion *region)
-{
- Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::handle_new_audio_region), region));
-}
-
-void
-Editor::fake_handle_audio_region_removed (AudioRegion *region)
-{
- Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::handle_audio_region_removed), region));
-}
-
-void
-Editor::fake_handle_new_duration ()
-{
- Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &Editor::handle_new_duration));
-}
-
void
Editor::start_scrolling ()
{
scroll_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
(mem_fun(*this, &Editor::update_current_screen));
-
- slower_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
- (mem_fun(*this, &Editor::update_slower));
}
void
void
Editor::handle_new_duration ()
{
- reset_scrolling_region ();
+ ENSURE_GUI_THREAD (mem_fun (*this, &Editor::handle_new_duration));
- if (session) {
- horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
- horizontal_adjustment.set_value (leftmost_frame/frames_per_unit);
+ jack_nframes_t new_end = session->get_maximum_extent() + (jack_nframes_t) floorf (current_page_frames() * 0.10f);
+
+ if (new_end > last_canvas_frame) {
+ last_canvas_frame = new_end;
+ reset_scrolling_region ();
}
+
+ horizontal_adjustment.set_value (leftmost_frame/frames_per_unit);
}
void
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_p)));
- session_connections.push_back (session->AudioRegionAdded.connect (mem_fun(*this, &Editor::fake_handle_new_audio_region)));
- session_connections.push_back (session->AudioRegionRemoved.connect (mem_fun(*this, &Editor::fake_handle_audio_region_removed)));
- session_connections.push_back (session->DurationChanged.connect (mem_fun(*this, &Editor::fake_handle_new_duration)));
+ 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->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)));
session_connections.push_back (session->NamedSelectionAdded.connect (mem_fun(*this, &Editor::handle_new_named_selection)));
edit_groups_changed ();
edit_cursor_clock.set_session (session);
- selection_start_clock.set_session (session);
- selection_end_clock.set_session (session);
zoom_range_clock.set_session (session);
_playlist_selector->set_session (session);
nudge_clock.set_session (session);
+#ifdef FFT_ANALYSIS
+ if (analysis_window != 0)
+ analysis_window->set_session (session);
+#endif
+
switch (session->get_edit_mode()) {
case Splice:
edit_mode_selector.set_active_text (edit_mode_strings[splice_index]);
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));
- reset_scrolling_region ();
+ bool yn;
+ RefPtr<Action> act;
+
+ act = ActionManager::get_action (X_("Editor"), X_("toggle-xfades-active"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+ /* do it twice to force the change */
+ yn = session->get_crossfades_active();
+ tact->set_active (!yn);
+ tact->set_active (yn);
+ }
+
+ act = ActionManager::get_action (X_("Editor"), X_("toggle-auto-xfades"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+ /* do it twice to force the change */
+ yn = Config->get_auto_xfade ();
+ tact->set_active (!yn);
+ tact->set_active (yn);
+ }
+
+ /* xfade visibility state set from editor::set_state() */
+
+ update_crossfade_model ();
+ update_layering_model ();
+
+ handle_new_duration ();
redisplay_regions ();
redisplay_named_selections ();
leftmost_frame = 0;
- horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
horizontal_adjustment.set_value (0);
restore_ruler_visibility ();
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
if (atv) {
- DiskStream* ds;
+ AudioDiskstream* ds;
Playlist* pl;
if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
if (atv) {
- DiskStream* ds;
+ AudioDiskstream* ds;
Playlist* pl;
AudioPlaylist* apl;
return &track_crossfade_context_menu;
}
+#ifdef FFT_ANALYSIS
+void
+Editor::analyze_region_selection()
+{
+ if (analysis_window == 0) {
+ analysis_window = new AnalysisWindow();
+
+ if (session != 0)
+ analysis_window->set_session(session);
+
+ analysis_window->show_all();
+ }
+
+ analysis_window->set_regionmode();
+ analysis_window->analyze();
+
+ analysis_window->present();
+}
+
+void
+Editor::analyze_range_selection()
+{
+ if (analysis_window == 0) {
+ analysis_window = new AnalysisWindow();
+
+ if (session != 0)
+ analysis_window->set_session(session);
+
+ analysis_window->show_all();
+ }
+
+ analysis_window->set_rangemode();
+ analysis_window->analyze();
+
+ analysis_window->present();
+}
+#endif /* FFT_ANALYSIS */
+
+
+
Menu*
Editor::build_track_selection_context_menu (jack_nframes_t ignored)
{
items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_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)));
+#endif
+
items.push_back (SeparatorElem());
/* XXX hopefully this nonsense will go away with SigC++ 2.X, where the compiler
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"), mem_fun (*this, &Editor::set_selection_from_audio_region)));
+ items.push_back (SeparatorElem());
+
/* Nudge region */
Menu *nudge_menu = manage (new Menu());
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)));
+
+#ifdef FFT_ANALYSIS
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Analyze range"), mem_fun(*this, &Editor::analyze_range_selection)));
+#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 (SeparatorElem());
items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
items.push_back (SeparatorElem());
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 (SeparatorElem());
edit_items.push_back (MenuElem (_("Select"), *select_menu));
/* Adding new material */
- Menu *import_menu = manage (new Menu());
- MenuList& import_items = import_menu->items();
- import_menu->set_name ("ArdourContextMenu");
-
- import_items.push_back (MenuElem (_("Insert Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
- import_items.push_back (MenuElem (_("Insert external sndfile"), bind (mem_fun(*this, &Editor::insert_sndfile), false)));
-
- edit_items.push_back (MenuElem (_("Import"), *import_menu));
+ edit_items.push_back (SeparatorElem());
+ edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
+ edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
/* Nudge track */
instant_save ();
}
-void
-Editor::add_location_from_selection ()
-{
- if (selection->time.empty()) {
- return;
- }
-
- if (session == 0 || clicked_trackview == 0) {
- return;
- }
-
- jack_nframes_t start = selection->time[clicked_selection].start;
- jack_nframes_t end = selection->time[clicked_selection].end;
-
- Location *location = new Location (start, end, "selection");
-
- session->begin_reversible_command (_("add marker"));
- session->add_undo (session->locations()->get_memento());
- session->locations()->add (location, true);
- session->add_redo_no_execute (session->locations()->get_memento());
- session->commit_reversible_command ();
-}
-
-void
-Editor::add_location_from_playhead_cursor ()
-{
- jack_nframes_t where = session->audible_frame();
-
- Location *location = new Location (where, where, "mark", Location::IsMark);
- session->begin_reversible_command (_("add marker"));
- session->add_undo (session->locations()->get_memento());
- session->locations()->add (location, true);
- session->add_redo_no_execute (session->locations()->get_memento());
- session->commit_reversible_command ();
-}
-
-
int
Editor::set_state (const XMLNode& node)
{
}
if ((prop = node.property ("zoom"))) {
- set_frames_per_unit (atof (prop->value()));
+ set_frames_per_unit (PBD::atof (prop->value()));
}
if ((prop = node.property ("snap-to"))) {
if ((prop = node.property ("follow-playhead"))) {
bool yn = (prop->value() == "yes");
- RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead"));
+ 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 */
if ((prop = node.property ("xfades-visible"))) {
bool yn = (prop->value() == "yes");
_xfade_visibility = !yn;
- set_xfade_visibility (yn);
+ // set_xfade_visibility (yn);
}
if ((prop = node.property ("show-editor-mixer"))) {
Editor::setup_toolbar ()
{
string pixmap_path;
+
+ const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button
+
+
+ /* Mode Buttons (tool selection) */
+
vector<ToggleButton *> mouse_mode_buttons;
+ mouse_move_button.add (*(manage (new Image (get_xpm("tool_object.xpm")))));
+ 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_xpm("tool_gain.xpm")))));
+ mouse_gain_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_gain_button);
+ mouse_zoom_button.add (*(manage (new Image (get_xpm("tool_zoom.xpm")))));
+ mouse_zoom_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_zoom_button);
+ mouse_timefx_button.add (*(manage (new Image (get_xpm("tool_stretch.xpm")))));
+ mouse_timefx_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_timefx_button);
+ mouse_audition_button.add (*(manage (new Image (get_xpm("tool_audition.xpm")))));
+ mouse_audition_button.set_relief(Gtk::RELIEF_NONE);
mouse_mode_buttons.push_back (&mouse_audition_button);
+
mouse_mode_button_set = new GroupedButtons (mouse_mode_buttons);
- mouse_mode_button_table.set_homogeneous (true);
- mouse_mode_button_table.set_col_spacings (2);
- mouse_mode_button_table.set_row_spacings (2);
- mouse_mode_button_table.set_border_width (5);
-
- mouse_mode_button_table.attach (mouse_move_button, 0, 1, 0, 1);
- mouse_mode_button_table.attach (mouse_select_button, 1, 2, 0, 1);
- mouse_mode_button_table.attach (mouse_zoom_button, 2, 3, 0, 1);
-
- mouse_mode_button_table.attach (mouse_gain_button, 0, 1, 1, 2);
- mouse_mode_button_table.attach (mouse_timefx_button, 1, 2, 1, 2);
- mouse_mode_button_table.attach (mouse_audition_button, 2, 3, 1, 2);
+ HBox* mode_box = manage(new HBox);
+ mode_box->set_border_width (2);
+ mode_box->set_spacing(4);
+ mouse_mode_button_box.set_spacing(1);
+ mouse_mode_button_box.pack_start(mouse_move_button, true, true);
+ 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);
+ 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.set_homogeneous(true);
+
+ // This one needs a little more "FUDGE" on my machine at least..
+ edit_mode_selector.set_name ("EditModeSelector");
+ Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "Splice Edit", 3+FUDGE, 10);
+ set_popdown_strings (edit_mode_selector, internationalize (edit_mode_strings));
+ edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done));
- mouse_mode_tearoff = manage (new TearOff (mouse_mode_button_table));
+ mode_box->pack_start(edit_mode_selector);
+ mode_box->pack_start(mouse_mode_button_box);
+
+ mouse_mode_tearoff = manage (new TearOff (*mode_box));
mouse_mode_tearoff->set_name ("MouseModeBase");
mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
mouse_timefx_button.set_name ("MouseModeButton");
mouse_audition_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_gain_button, _("draw gain automation"));
- 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_move_button, _("Select/Move Objects"));
+ ARDOUR_UI::instance()->tooltips().set_tip (mouse_select_button, _("Select/Move Ranges"));
+ ARDOUR_UI::instance()->tooltips().set_tip (mouse_gain_button, _("Draw Gain Automation"));
+ 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"));
mouse_move_button.unset_flags (CAN_FOCUS);
mouse_select_button.unset_flags (CAN_FOCUS);
mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
// mouse_move_button.set_active (true);
+
- /* automation control */
-
- global_automation_button.set_name ("MouseModeButton");
- automation_mode_button.set_name ("MouseModeButton");
-
- automation_box.set_spacing (2);
- automation_box.set_border_width (2);
- automation_box.pack_start (global_automation_button, false, false);
- automation_box.pack_start (automation_mode_button, false, false);
-
- /* Edit mode */
-
- edit_mode_label.set_name ("ToolBarLabel");
-
- edit_mode_selector.set_name ("EditModeSelector");
+ /* Zoom */
+
+ zoom_box.set_spacing (1);
+ zoom_box.set_border_width (2);
- edit_mode_box.set_spacing (3);
- edit_mode_box.set_border_width (3);
+ zoom_in_button.set_name ("EditorTimeButton");
+ zoom_in_button.add (*(manage (new Image (get_xpm("zoom_in.xpm")))));
+ zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
+ ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom In"));
+
+ zoom_out_button.set_name ("EditorTimeButton");
+ zoom_out_button.add (*(manage (new Image (get_xpm("zoom_out.xpm")))));
+ zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
+ ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom Out"));
- /* XXX another disgusting hack because of the way combo boxes size themselves */
+ zoom_out_full_button.set_name ("EditorTimeButton");
+ zoom_out_full_button.add (*(manage (new Image (get_xpm("zoom_full.xpm")))));
+ zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session));
+ ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
+
+ zoom_box.pack_start (zoom_out_button, false, false);
+ zoom_box.pack_start (zoom_in_button, false, false);
+ zoom_box.pack_start (zoom_range_clock, false, false);
+ zoom_box.pack_start (zoom_out_full_button, false, false);
+
+ ARDOUR_UI::instance()->tooltips().set_tip (zoom_range_clock, _("Current Zoom Range\n(Width of visible area)"));
+
+ zoom_focus_selector.set_name ("ZoomFocusSelector");
+ Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Focus Center", 2+FUDGE, 0);
+ set_popdown_strings (zoom_focus_selector, internationalize (zoom_focus_strings));
+ zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
- const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button
- Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "EdgtMode", 2+FUDGE, 10);
- set_popdown_strings (edit_mode_selector, internationalize (edit_mode_strings));
- edit_mode_box.pack_start (edit_mode_label, false, false);
- edit_mode_box.pack_start (edit_mode_selector, false, false);
+ zoom_box.pack_start (zoom_focus_selector, false, false);
- edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done));
- /* Snap Type */
+ /* Edit Cursor / Snap */
- snap_type_label.set_name ("ToolBarLabel");
+ snap_box.set_spacing (1);
+ snap_box.set_border_width (2);
snap_type_selector.set_name ("SnapTypeSelector");
-
- snap_type_box.set_spacing (3);
- snap_type_box.set_border_width (3);
-
- /* XXX another disgusting hack because of the way combo boxes size themselves */
-
Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
set_popdown_strings (snap_type_selector, internationalize (snap_type_strings));
-
- snap_type_box.pack_start (snap_type_label, false, false);
- snap_type_box.pack_start (snap_type_selector, false, false);
-
snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
-
- /* Snap mode, not snap type */
-
- snap_mode_label.set_name ("ToolBarLabel");
+ ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
snap_mode_selector.set_name ("SnapModeSelector");
-
- snap_mode_box.set_spacing (3);
- snap_mode_box.set_border_width (3);
-
- Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "SngpMode", 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, internationalize (snap_mode_strings));
-
- snap_mode_box.pack_start (snap_mode_label, false, false);
- snap_mode_box.pack_start (snap_mode_selector, false, false);
-
snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
- /* Zoom focus mode */
-
- zoom_focus_label.set_name ("ToolBarLabel");
-
- zoom_focus_selector.set_name ("ZoomFocusSelector");
-
- zoom_focus_box.set_spacing (3);
- zoom_focus_box.set_border_width (3);
-
- /* XXX another disgusting hack because of the way combo boxes size themselves */
-
- Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edgt Cursor", 2+FUDGE, 10);
- set_popdown_strings (zoom_focus_selector, internationalize (zoom_focus_strings));
-
- zoom_focus_box.pack_start (zoom_focus_label, false, false);
- zoom_focus_box.pack_start (zoom_focus_selector, false, false);
-
- zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
-
- /* selection/cursor clocks */
-
- toolbar_selection_cursor_label.set_name ("ToolBarLabel");
- selection_start_clock_label.set_name ("ToolBarLabel");
- selection_end_clock_label.set_name ("ToolBarLabel");
- edit_cursor_clock_label.set_name ("ToolBarLabel");
-
- selection_start_clock_label.set_text (_("Start:"));
- selection_end_clock_label.set_text (_("End:"));
- edit_cursor_clock_label.set_text (_("Edit"));
+ snap_box.pack_start (edit_cursor_clock, false, false);
+ snap_box.pack_start (snap_mode_selector, false, false);
+ snap_box.pack_start (snap_type_selector, false, false);
- /* the zoom in/out buttons are generally taller than the clocks, so
- put all the toolbar clocks into a size group with one of the
- buttons to make them all equal height.
- this also applies to the various toolbar combos
- */
-
- RefPtr<SizeGroup> toolbar_clock_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
- toolbar_clock_size_group->add_widget (zoom_out_button);
- toolbar_clock_size_group->add_widget (edit_cursor_clock);
- toolbar_clock_size_group->add_widget (zoom_range_clock);
- toolbar_clock_size_group->add_widget (nudge_clock);
- toolbar_clock_size_group->add_widget (edit_mode_selector);
- toolbar_clock_size_group->add_widget (snap_type_selector);
- toolbar_clock_size_group->add_widget (snap_mode_selector);
- toolbar_clock_size_group->add_widget (zoom_focus_selector);
-
- HBox* edit_clock_hbox = manage (new HBox());
- VBox* edit_clock_vbox = manage (new VBox());
-
- edit_clock_hbox->pack_start (edit_cursor_clock, false, false);
-
- edit_clock_vbox->set_spacing (3);
- edit_clock_vbox->set_border_width (3);
- edit_clock_vbox->pack_start (edit_cursor_clock_label, false, false);
- edit_clock_vbox->pack_start (*edit_clock_hbox, false, false);
-
- HBox* hbox = new HBox;
-
- hbox->pack_start (*edit_clock_vbox, false, false);
- hbox->pack_start (zoom_indicator_vbox, false, false);
- hbox->pack_start (zoom_focus_box, false, false);
- hbox->pack_start (snap_type_box, false, false);
- hbox->pack_start (snap_mode_box, false, false);
- hbox->pack_start (edit_mode_box, false, false);
+ /* Nudge */
- VBox *vbox = manage (new VBox);
+ HBox *nudge_box = manage (new HBox);
+ nudge_box->set_spacing(1);
+ nudge_box->set_border_width (2);
- vbox->set_spacing (3);
- vbox->set_border_width (3);
-
- HBox *nbox = manage (new HBox);
-
nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false));
nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false));
- nbox->pack_start (nudge_backward_button, false, false);
- nbox->pack_start (nudge_forward_button, false, false);
- nbox->pack_start (nudge_clock, false, false, 5);
+ nudge_box->pack_start (nudge_backward_button, false, false);
+ nudge_box->pack_start (nudge_forward_button, false, false);
+ nudge_box->pack_start (nudge_clock, false, false);
- nudge_label.set_name ("ToolBarLabel");
- vbox->pack_start (nudge_label, false, false);
- vbox->pack_start (*nbox, false, false);
+ /* Pack everything in... */
- hbox->pack_start (*vbox, false, false);
-
- hbox->show_all ();
+ HBox* hbox = new HBox;
+ hbox->set_spacing(10);
tools_tearoff = new TearOff (*hbox);
tools_tearoff->set_name ("MouseModeBase");
tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
&tools_tearoff->tearoff_window(), 0));
- toolbar_hbox.set_spacing (8);
- toolbar_hbox.set_border_width (2);
+ toolbar_hbox.set_spacing (10);
+ toolbar_hbox.set_border_width (1);
- toolbar_hbox.pack_start (*tools_tearoff, false, false);
toolbar_hbox.pack_start (*mouse_mode_tearoff, false, false);
+ toolbar_hbox.pack_start (*tools_tearoff, false, false);
+
+
+ hbox->pack_start (snap_box, false, false);
+ hbox->pack_start (zoom_box, false, false);
+ hbox->pack_start (*nudge_box, false, false);
+
+ hbox->show_all ();
toolbar_base.set_name ("ToolBarBase");
toolbar_base.add (toolbar_hbox);
toolbar_frame.add (toolbar_base);
}
-gint
-Editor::_autoscroll_canvas (void *arg)
-{
- return ((Editor *) arg)->autoscroll_canvas ();
-}
-
-gint
-Editor::autoscroll_canvas ()
-{
- jack_nframes_t new_frame;
- bool keep_calling = true;
-
- if (autoscroll_direction < 0) {
- if (leftmost_frame < autoscroll_distance) {
- new_frame = 0;
- } else {
- new_frame = leftmost_frame - autoscroll_distance;
- }
- } else {
- if (leftmost_frame > max_frames - autoscroll_distance) {
- new_frame = max_frames;
- } else {
- new_frame = leftmost_frame + autoscroll_distance;
- }
- }
-
- if (new_frame != leftmost_frame) {
- reposition_x_origin (new_frame);
- }
-
- if (new_frame == 0 || new_frame == max_frames) {
- /* we are done */
- return FALSE;
- }
-
- autoscroll_cnt++;
-
- if (autoscroll_cnt == 1) {
-
- /* connect the timeout so that we get called repeatedly */
-
- autoscroll_timeout_tag = gtk_timeout_add (100, _autoscroll_canvas, this);
- keep_calling = false;
-
- } else if (autoscroll_cnt > 10 && autoscroll_cnt < 20) {
-
- /* after about a while, speed up a bit by changing the timeout interval */
-
- autoscroll_timeout_tag = gtk_timeout_add (50, _autoscroll_canvas, this);
- keep_calling = false;
-
- } else if (autoscroll_cnt >= 20 && autoscroll_cnt < 30) {
-
- /* after about another while, speed up some more */
-
- autoscroll_timeout_tag = gtk_timeout_add (25, _autoscroll_canvas, this);
- keep_calling = false;
-
- } else if (autoscroll_cnt >= 30) {
-
- /* we've been scrolling for a while ... crank it up */
-
- autoscroll_distance = 10 * (jack_nframes_t) floor (canvas_width * frames_per_unit);
- }
-
- return keep_calling;
-}
-
-void
-Editor::start_canvas_autoscroll (int dir)
-{
- if (!session) {
- return;
- }
-
- stop_canvas_autoscroll ();
-
- autoscroll_direction = dir;
- autoscroll_distance = (jack_nframes_t) floor ((canvas_width * frames_per_unit)/10.0);
- autoscroll_cnt = 0;
-
- /* do it right now, which will start the repeated callbacks */
-
- autoscroll_canvas ();
-}
-
-void
-Editor::stop_canvas_autoscroll ()
-{
- if (autoscroll_timeout_tag >= 0) {
- gtk_timeout_remove (autoscroll_timeout_tag);
- autoscroll_timeout_tag = -1;
- }
-}
-
int
-Editor::convert_drop_to_paths (vector<string>& paths,
+Editor::convert_drop_to_paths (vector<ustring>& paths,
const RefPtr<Gdk::DragContext>& context,
gint x,
gint y,
for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
if ((*i).substr (0,7) == "file://") {
string p = *i;
- url_decode (p);
+ PBD::url_decode (p);
paths.push_back (p.substr (7));
}
}
*selection = *state->selection;
time_selection_changed ();
- cerr << "RS: RSC\n";
region_selection_changed ();
/* XXX other selection change handlers? */
}
}
-void
-Editor::set_selected_track_from_click (Selection::Operation op, bool with_undo, bool no_remove)
+bool
+Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool with_undo, bool no_remove)
{
+ bool commit = false;
+
if (!clicked_trackview) {
- return;
+ return false;
}
- if (with_undo) {
- begin_reversible_command (_("set selected trackview"));
- }
-
switch (op) {
case Selection::Toggle:
if (selection->selected (clicked_trackview)) {
if (!no_remove) {
selection->remove (clicked_trackview);
+ commit = true;
}
} else {
- selection->toggle (clicked_trackview);
+ selection->add (clicked_trackview);
+ commit = false;
}
break;
+
case Selection::Set:
if (selection->selected (clicked_trackview) && selection->tracks.size() == 1) {
/* no commit necessary */
- return;
}
selection->set (clicked_trackview);
/* not defined yet */
break;
}
-
- if (with_undo) {
- commit_reversible_command ();
- }
+
+ return commit;
}
-void
-Editor::set_selected_control_point_from_click (Selection::Operation op, bool with_undo, bool no_remove)
+bool
+Editor::set_selected_control_point_from_click (bool press, Selection::Operation op, bool with_undo, bool no_remove)
{
if (!clicked_control_point) {
- return;
+ return false;
}
- if (with_undo) {
- begin_reversible_command (_("set selected control point"));
- }
+ /* select this point and any others that it represents */
- switch (op) {
- case Selection::Set:
- break;
- case Selection::Toggle:
- break;
- case Selection::Extend:
- break;
- }
- if (with_undo) {
- commit_reversible_command ();
- }
+ double y1, y2;
+ jack_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::mapover_audio_tracks (slot<void,AudioTimeAxisView&,uint32_t> sl)
+Editor::get_relevant_audio_tracks (AudioTimeAxisView& base, set<AudioTimeAxisView*>& relevant_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) {
/* no active group, or no group */
- relevant_tracks.insert (atv);
+ relevant_tracks.insert (&base);
}
}
+}
+
+void
+Editor::mapover_audio_tracks (slot<void,AudioTimeAxisView&,uint32_t> sl)
+{
+ set<AudioTimeAxisView*> relevant_tracks;
+
+ if (!clicked_audio_trackview) {
+ return;
+ }
- /* step two: apply operation to each track */
+ get_relevant_audio_tracks (*clicked_audio_trackview, relevant_tracks);
uint32_t sz = relevant_tracks.size();
AudioPlaylist* pl;
vector<AudioRegion*> results;
AudioRegionView* marv;
- DiskStream* ds;
-
+ AudioDiskstream* ds;
+
if ((ds = atv.get_diskstream()) == 0) {
/* bus */
return;
}
+
+ if (&atv == &basis->get_time_axis_view()) {
+ /* looking in same track as the original */
+ return;
+ }
+
- if ((pl = ds->playlist()) != 0) {
+ if ((pl = dynamic_cast<AudioPlaylist*>(ds->playlist())) != 0) {
pl->get_equivalent_regions (basis->region, results);
}
}
}
-void
-Editor::set_selected_regionview_from_click (Selection::Operation op, bool no_track_remove)
+bool
+Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, bool no_track_remove)
{
- cerr << "In SSRfC\n";
-
vector<AudioRegionView*> all_equivalent_regions;
+ bool commit = false;
- if (!clicked_regionview) {
- return;
+ if (!clicked_regionview || !clicked_audio_trackview) {
+ return false;
}
- mapover_audio_tracks (bind (mem_fun (*this, &Editor::mapped_set_selected_regionview_from_click),
- clicked_regionview, &all_equivalent_regions));
-
+ 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) {
- cerr << "mapover done\n";
+ /* whatever was clicked was selected already; do nothing here but allow
+ the button release to deselect it
+ */
- begin_reversible_command (_("set selected regionview"));
+ 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;
+ }
+ }
- switch (op) {
- case Selection::Toggle:
- selection->toggle (clicked_regionview);
-#if 0
- if (clicked_regionview->get_selected()) {
- if (/* group && group->is_active() && */ selection->audio_regions.size() > 1) {
- /* reduce selection down to just the one clicked */
- selection->set (clicked_regionview);
} else {
- selection->remove (clicked_regionview);
+
+ if (press) {
+ /* add all the equivalent regions, but only on button press */
+
+ if (!all_equivalent_regions.empty()) {
+ commit = true;
+ }
+
+ for (vector<AudioRegionView*>::iterator i = all_equivalent_regions.begin(); i != all_equivalent_regions.end(); ++i) {
+ selection->add (*i);
+ }
+ }
}
- } else {
- selection->add (all_equivalent_regions);
+ 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;
}
-#endif
- set_selected_track_from_click (op, false, no_track_remove);
- break;
- case Selection::Set:
- // karsten wiese suggested these two lines to make
- // a selected region rise to the top. but this
- // leads to a mismatch between actual layering
- // and visual layering. resolution required ....
- //
- // gnome_canvas_item_raise_to_top (clicked_regionview->get_canvas_group());
- // gnome_canvas_item_raise_to_top (clicked_regionview->get_time_axis_view().canvas_display);
-
- if (clicked_regionview->get_selected()) {
- /* no commit necessary: we are the one selected. */
- return;
+ } else if (op == Selection::Extend) {
- } else {
-
- selection->set (all_equivalent_regions);
- set_selected_track_from_click (op, false, false);
+ list<Selectable*> results;
+ jack_nframes_t last_frame;
+ jack_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 (AudioRegionSelection::iterator x = selection->audio_regions.begin(); x != selection->audio_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();
+ }
+ }
}
- break;
- case Selection::Extend:
- /* not defined yet */
- break;
+ /* 2. figure out the boundaries for our search for new objects */
+
+ switch (clicked_regionview->region.coverage (first_frame, last_frame)) {
+ case OverlapNone:
+ cerr << "no overlap, first = " << first_frame << " last = " << last_frame << " region = "
+ << clicked_regionview->region.first_frame() << " .. " << clicked_regionview->region.last_frame() << endl;
+
+ 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:
+ cerr << "external overlap, first = " << first_frame << " last = " << last_frame << " region = "
+ << clicked_regionview->region.first_frame() << " .. " << clicked_regionview->region.last_frame() << endl;
+
+ 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:
+ cerr << "internal overlap, first = " << first_frame << " last = " << last_frame << " region = "
+ << clicked_regionview->region.first_frame() << " .. " << clicked_regionview->region.last_frame() << endl;
+
+ 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 (*clicked_audio_trackview, 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<AudioRegionView*> audio_regions;
+
+ for (list<Selectable*>::iterator x = results.begin(); x != results.end(); ++x) {
+ AudioRegionView* arv;
+
+ if ((arv = dynamic_cast<AudioRegionView*>(*x)) != 0) {
+ audio_regions.push_back (arv);
+ }
+ }
+
+ if (!audio_regions.empty()) {
+ selection->add (audio_regions);
+ commit = true;
+ }
}
- cerr << "case done\n";
- commit_reversible_command () ;
+ out:
+ return commit;
}
void
AudioPlaylist* pl;
vector<AudioRegion*> results;
AudioRegionView* marv;
- DiskStream* ds;
+ AudioDiskstream* ds;
if ((ds = tatv->get_diskstream()) == 0) {
/* bus */
continue;
}
- if ((pl = ds->playlist()) != 0) {
+ if ((pl = dynamic_cast<AudioPlaylist*>(ds->playlist())) != 0) {
pl->get_region_list_equivalent_regions (*region, results);
}
switch (op) {
case Selection::Toggle:
/* XXX this is not correct */
- selection->add (all_equivalent_regions);
+ selection->toggle (all_equivalent_regions);
break;
case Selection::Set:
selection->set (all_equivalent_regions);
break;
case Selection::Extend:
- /* not defined yet */
+ selection->add (all_equivalent_regions);
break;
}
import_menu->set_name ("ArdourContextMenu");
MenuList& import_items = import_menu->items();
- import_items.push_back (MenuElem (_("... as new track"), bind (mem_fun(*this, &Editor::import_audio), true)));
- import_items.push_back (MenuElem (_("... as new region"), bind (mem_fun(*this, &Editor::import_audio), false)));
-
- Menu* embed_menu = manage (new Menu());
- embed_menu->set_name ("ArdourContextMenu");
- MenuList& embed_items = embed_menu->items();
-
- embed_items.push_back (MenuElem (_("... as new track"), bind (mem_fun(*this, &Editor::insert_sndfile), true)));
- embed_items.push_back (MenuElem (_("... as new region"), mem_fun(*this, &Editor::embed_audio)));
+ import_items.push_back (MenuElem (_("... as new track"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportAsTrack)));
+ import_items.push_back (MenuElem (_("... as new region"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportAsRegion)));
edit_items.push_back (MenuElem (_("Import audio (copy)"), *import_menu));
- edit_items.push_back (MenuElem (_("Embed audio (link)"), *embed_menu));
edit_items.push_back (SeparatorElem());
edit_items.push_back (MenuElem (_("Remove last capture"), mem_fun(*this, &Editor::remove_last_capture)));
+
if (!session->have_captured()) {
edit_items.back().set_sensitive (false);
}
string choice = edit_mode_selector.get_active_text();
EditMode mode = Slide;
- if (choice == _("Splice")) {
+ if (choice == _("Splice Edit")) {
mode = Splice;
- } else if (choice == _("Slide")) {
+ } else if (choice == _("Slide Edit")) {
mode = Slide;
}
string choice = snap_type_selector.get_active_text();
SnapType snaptype = SnapToFrame;
-
+
if (choice == _("Beats/3")) {
- snaptype = SnapToAThirdBeat;
- } else if (choice == _("Beats/4")) {
- snaptype = SnapToAQuarterBeat;
- } else if (choice == _("Beats/8")) {
- snaptype = SnapToAEighthBeat;
- } else if (choice == _("Beats/16")) {
- snaptype = SnapToASixteenthBeat;
- } else if (choice == _("Beats/32")) {
- snaptype = SnapToAThirtysecondBeat;
- } else if (choice == _("Beats")) {
+ snaptype = SnapToAThirdBeat;
+ } else if (choice == _("Beats/4")) {
+ snaptype = SnapToAQuarterBeat;
+ } else if (choice == _("Beats/8")) {
+ snaptype = SnapToAEighthBeat;
+ } else if (choice == _("Beats/16")) {
+ snaptype = SnapToASixteenthBeat;
+ } else if (choice == _("Beats/32")) {
+ snaptype = SnapToAThirtysecondBeat;
+ } else if (choice == _("Beats")) {
snaptype = SnapToBeat;
} else if (choice == _("Bars")) {
snaptype = SnapToBar;
snaptype = SnapToSeconds;
} else if (choice == _("Minutes")) {
snaptype = SnapToMinutes;
- } else if (choice == _("None")) {
+ } else if (choice == _("None")) {
snaptype = SnapToFrame;
}
-
+
set_snap_to (snaptype);
}
string choice = snap_mode_selector.get_active_text();
SnapMode mode = SnapNormal;
- if (choice == _("Normal")) {
+ if (choice == _("Normal Snap")) {
mode = SnapNormal;
- } else if (choice == _("Magnetic")) {
+ } else if (choice == _("Magnetic Snap")) {
mode = SnapMagnetic;
}
string choice = zoom_focus_selector.get_active_text();
ZoomFocus focus_type = ZoomFocusLeft;
- if (choice == _("Left")) {
+ if (choice == _("Focus Left")) {
focus_type = ZoomFocusLeft;
- } else if (choice == _("Right")) {
+ } else if (choice == _("Focus Right")) {
focus_type = ZoomFocusRight;
- } else if (choice == _("Center")) {
+ } else if (choice == _("Focus Center")) {
focus_type = ZoomFocusCenter;
- } else if (choice == _("Playhead")) {
+ } else if (choice == _("Focus Playhead")) {
focus_type = ZoomFocusPlayhead;
- } else if (choice == _("Edit Cursor")) {
+ } else if (choice == _("Focus Edit Cursor")) {
focus_type = ZoomFocusEdit;
}
void
Editor::toggle_follow_playhead ()
{
- RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead"));
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-follow-playhead"));
if (act) {
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
set_follow_playhead (tact->get_active());
Editor::end_location_changed (Location* location)
{
ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location));
- horizontal_adjustment.set_upper (location->end() / frames_per_unit);
+ reset_scrolling_region ();
}
int
{
atv.clear_playlist ();
}
+
+bool
+Editor::on_key_press_event (GdkEventKey* ev)
+{
+ return key_press_focus_accelerator_handler (*this, ev);
+}
+
+void
+Editor::update_layering_model ()
+{
+ RefPtr<Action> act;
+
+ switch (session->get_layer_model()) {
+ case Session::LaterHigher:
+ act = ActionManager::get_action (X_("Editor"), X_("LayerLaterHigher"));
+ break;
+ case Session::MoveAddHigher:
+ act = ActionManager::get_action (X_("Editor"), X_("LayerMoveAddHigher"));
+ break;
+ case Session::AddHigher:
+ act = ActionManager::get_action (X_("Editor"), X_("LayerAddHigher"));
+ break;
+ }
+
+ if (act) {
+ RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
+ if (ract && !ract->get_active()) {
+ ract->set_active (true);
+ }
+ }
+}
+
+
+void
+Editor::update_crossfade_model ()
+{
+ RefPtr<Action> act;
+
+ switch (session->get_xfade_model()) {
+ case FullCrossfade:
+ act = ActionManager::get_action (X_("Editor"), X_("CrossfadesFull"));
+ break;
+ case ShortCrossfade:
+ act = ActionManager::get_action (X_("Editor"), X_("CrossfadesShort"));
+ break;
+ }
+
+ if (act) {
+ RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
+ if (ract && !ract->get_active()) {
+ ract->set_active (true);
+ }
+ }
+}
+
projects / ardour.git / blobdiff