X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=0932a046e08f492e78456a4bf5a634bdeb5a9268;hb=beb3eea62bf217d0a7b2a86a96d5c375329df10a;hp=cd1b9e4b7c613e00bf2c90dc42e2ca3f69efdb2e;hpb=332a3d98138e94903ad9c6d35048b0201ff178c8;p=ardour.git diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index cd1b9e4b7c..0932a046e0 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -25,6 +25,8 @@ #include #include +#include + #include #include @@ -44,14 +46,18 @@ #include #include -#include #include -#include -#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include #include +#include #include #include @@ -75,11 +81,15 @@ #include "crossfade_edit.h" #include "canvas_impl.h" #include "actions.h" +#include "sfdb_ui.h" #include "gui_thread.h" - -#ifdef FFT_ANALYSIS +#include "simpleline.h" +#include "rhythm_ferret.h" +#include "actions.h" +#include "tempo_lines.h" #include "analysis_window.h" -#endif +#include "bundle_manager.h" +#include "global_port_matrix.h" #include "i18n.h" @@ -104,7 +114,6 @@ 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"), @@ -119,7 +128,6 @@ static const gchar *_snap_type_strings[] = { N_("Beats"), N_("Bars"), N_("Marks"), - N_("Edit Cursor"), N_("Region starts"), N_("Region ends"), N_("Region syncs"), @@ -128,19 +136,40 @@ static const gchar *_snap_type_strings[] = { }; 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_("Play"), - N_("Edit"), + N_("Playhead"), + N_("Mouse"), + N_("Active Mark"), + 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 */ @@ -148,13 +177,18 @@ Gdk::Cursor* Editor::cross_hair_cursor = 0; Gdk::Cursor* Editor::selector_cursor = 0; Gdk::Cursor* Editor::trimmer_cursor = 0; Gdk::Cursor* Editor::grabber_cursor = 0; +Gdk::Cursor* Editor::grabber_edit_point_cursor = 0; Gdk::Cursor* Editor::zoom_cursor = 0; Gdk::Cursor* Editor::time_fx_cursor = 0; Gdk::Cursor* Editor::fader_cursor = 0; Gdk::Cursor* Editor::speaker_cursor = 0; -Gdk::Cursor* Editor::note_cursor = 0; +Gdk::Cursor* Editor::midi_pencil_cursor = 0; +Gdk::Cursor* Editor::midi_select_cursor = 0; +Gdk::Cursor* Editor::midi_resize_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) @@ -162,18 +196,13 @@ 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; - +void +DragInfo::clear_copied_locations () +{ + for (list::iterator i = copied_locations.begin(); i != copied_locations.end(); ++i) { + delete *i; + } + copied_locations.clear (); } Editor::Editor () @@ -183,14 +212,14 @@ Editor::Editor () 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")), - - edit_packer (3, 3, false), + cd_mark_label (_("CD Markers")), + edit_packer (3, 4, true), /* the values here don't matter: layout widgets reset them as needed. @@ -201,7 +230,7 @@ Editor::Editor () /* 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), @@ -209,13 +238,17 @@ Editor::Editor () automation_mode_button (_("mode")), global_automation_button (_("automation")), + midi_panic_button (_("Panic")), + midi_tools_tearoff (0), + #ifdef WITH_CMT image_socket_listener(0), #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; @@ -225,59 +258,59 @@ Editor::Editor () PublicEditor::_instance = this; session = 0; + _have_idled = false; - selection = new Selection; - cut_buffer = new Selection; - - 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 = new Selection (this); + cut_buffer = new Selection (this); clicked_regionview = 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); + tempo_lines = 0; + + 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; canvas_height = 0; + last_autoscroll_x = 0; + last_autoscroll_y = 0; autoscroll_active = false; autoscroll_timeout_tag = -1; interthread_progress_window = 0; + logo_item = 0; -#ifdef FFT_ANALYSIS analysis_window = 0; -#endif current_interthread_info = 0; _show_measures = true; _show_waveforms = true; _show_waveforms_recording = true; first_action_message = 0; - export_dialog = 0; show_gain_after_trim = false; - ignore_route_list_reorder = false; + route_redisplay_does_not_sync_order_keys = false; + route_redisplay_does_not_reset_order_keys = false; no_route_list_redisplay = false; verbose_cursor_on = true; route_removal = false; show_automatic_regions_in_region_list = true; - region_list_sort_type = (Editing::RegionListSortType) 0; + last_item_entered = 0; + last_item_entered_n = 0; + + region_list_sort_type = (Editing::RegionListSortType) 0; have_pending_keyboard_selection = false; _follow_playhead = true; _xfade_visibility = true; @@ -295,23 +328,44 @@ Editor::Editor () 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; 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; + rhythm_ferret = 0; + _bundle_manager = 0; + for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { + _global_port_matrix[*i] = 0; + } + allow_vertical_scroll = false; + no_save_visual = false; + need_resize_line = false; + resize_line_y = 0; + old_resize_line_y = -1; + no_region_list_redisplay = false; + resize_idle_id = -1; + + _scrubbing = false; + scrubbing_direction = 0; + + sfbrowser = 0; location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get(); location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get(); @@ -321,7 +375,8 @@ Editor::Editor () range_marker_drag_rect = 0; marker_drag_line = 0; - + set_midi_edit_mode (MidiEditPencil, true); + _edit_point = EditAtMouse; set_mouse_mode (MouseObject, true); frames_per_unit = 2048; /* too early to use reset_zoom () */ @@ -331,110 +386,131 @@ Editor::Editor () set_zoom_focus (ZoomFocusLeft); zoom_range_clock.ValueChanged.connect (mem_fun(*this, &Editor::zoom_adjustment_changed)); - initialize_rulers (); - 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)); - - track_canvas.set_hadjustment (horizontal_adjustment); - track_canvas.set_vadjustment (vertical_adjustment); - time_canvas.set_hadjustment (horizontal_adjustment); - - track_canvas.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler)); - time_canvas.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler)); - - controls_layout.add (edit_controls_vbox); - controls_layout.set_name ("EditControlsBase"); - controls_layout.add_events (Gdk::SCROLL_MASK); - controls_layout.signal_scroll_event().connect (mem_fun(*this, &Editor::control_layout_scroll), false); - - controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); - controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release)); - controls_layout.signal_size_request().connect (mem_fun (*this, &Editor::controls_layout_size_request)); - - 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), 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 (); - - edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed)); - - 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) + 2); - bbt_label.set_name ("EditorTimeButton"); bbt_label.set_size_request (-1, (int)timebar_height); bbt_label.set_alignment (1.0, 0.5); bbt_label.set_padding (5,0); + bbt_label.hide (); + bbt_label.set_no_show_all(); minsec_label.set_name ("EditorTimeButton"); minsec_label.set_size_request (-1, (int)timebar_height); minsec_label.set_alignment (1.0, 0.5); minsec_label.set_padding (5,0); + minsec_label.hide (); + minsec_label.set_no_show_all(); smpte_label.set_name ("EditorTimeButton"); smpte_label.set_size_request (-1, (int)timebar_height); smpte_label.set_alignment (1.0, 0.5); smpte_label.set_padding (5,0); + smpte_label.hide (); + smpte_label.set_no_show_all(); frame_label.set_name ("EditorTimeButton"); frame_label.set_size_request (-1, (int)timebar_height); frame_label.set_alignment (1.0, 0.5); frame_label.set_padding (5,0); + frame_label.hide (); + frame_label.set_no_show_all(); + tempo_label.set_name ("EditorTimeButton"); tempo_label.set_size_request (-1, (int)timebar_height); tempo_label.set_alignment (1.0, 0.5); tempo_label.set_padding (5,0); + tempo_label.hide(); + tempo_label.set_no_show_all(); meter_label.set_name ("EditorTimeButton"); meter_label.set_size_request (-1, (int)timebar_height); meter_label.set_alignment (1.0, 0.5); meter_label.set_padding (5,0); + meter_label.hide(); + meter_label.set_no_show_all(); mark_label.set_name ("EditorTimeButton"); mark_label.set_size_request (-1, (int)timebar_height); mark_label.set_alignment (1.0, 0.5); mark_label.set_padding (5,0); + mark_label.hide(); + mark_label.set_no_show_all(); + 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); + cd_mark_label.hide(); + cd_mark_label.set_no_show_all(); 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); range_mark_label.set_padding (5,0); + range_mark_label.hide(); + range_mark_label.set_no_show_all(); transport_mark_label.set_name ("EditorTimeButton"); transport_mark_label.set_size_request (-1, (int)timebar_height); transport_mark_label.set_alignment (1.0, 0.5); transport_mark_label.set_padding (5,0); + transport_mark_label.hide(); + transport_mark_label.set_no_show_all(); + + initialize_rulers (); + initialize_canvas (); + + selection->TimeChanged.connect (mem_fun(*this, &Editor::time_selection_changed)); + selection->TracksChanged.connect (mem_fun(*this, &Editor::track_selection_changed)); + editor_regions_selection_changed_connection = 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)); + + edit_controls_vbox.set_spacing (0); + horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::scroll_canvas_horizontally), false); + vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling), true); + track_canvas->signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler)); + + controls_layout.add (edit_controls_vbox); + controls_layout.set_name ("EditControlsBase"); + controls_layout.add_events (Gdk::SCROLL_MASK); + controls_layout.signal_scroll_event().connect (mem_fun(*this, &Editor::control_layout_scroll), false); - time_button_vbox.pack_start (minsec_label, false, false); - time_button_vbox.pack_start (smpte_label, false, false); - time_button_vbox.pack_start (frame_label, false, false); - time_button_vbox.pack_start (bbt_label, false, false); - time_button_vbox.pack_start (meter_label, false, false); - time_button_vbox.pack_start (tempo_label, false, false); - time_button_vbox.pack_start (mark_label, false, false); + controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); + controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release)); + controls_layout_size_request_connection = controls_layout.signal_size_request().connect (mem_fun (*this, &Editor::controls_layout_size_request)); - time_button_event_box.add (time_button_vbox); + 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), 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_point_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_point_clock_changed)); - time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + 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.set_size_request (-1, (int)(timebar_height * visible_timebars) + 2); + //time_canvas_vbox.set_size_request (-1, -1); + + ruler_label_event_box.add (ruler_label_vbox); + ruler_label_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + ruler_label_event_box.set_name ("TimebarLabelBase"); + ruler_label_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release)); + + time_button_event_box.add (time_button_vbox); time_button_event_box.set_name ("TimebarLabelBase"); + time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); 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.property_shadow_type() = Gtk::SHADOW_OUT; - /* these enable us to have a dedicated window (for cursor setting, etc.) for the canvas areas. */ - track_canvas_event_box.add (track_canvas); + track_canvas_event_box.add (*track_canvas); time_canvas_event_box.add (time_canvas_vbox); time_canvas_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); @@ -444,17 +520,36 @@ Editor::Editor () edit_packer.set_homogeneous (false); edit_packer.set_border_width (0); edit_packer.set_name ("EditorWindow"); + +#ifndef THE_OLD_WAY + + edit_packer.attach (ruler_label_event_box, 0, 1, 0, 1, FILL, SHRINK, 0, 0); + + edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, SHRINK, 0, 0); + edit_packer.attach (time_canvas_event_box, 1, 2, 0, 1, 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, 1, 3, FILL|EXPAND, FILL|EXPAND, 0, 0); + + edit_packer.attach (zoom_box, 0, 1, 3, 4, FILL, FILL, 0, 0); + edit_packer.attach (edit_hscrollbar, 1, 2, 3, 4, FILL|EXPAND, FILL, 0, 0); + + edit_packer.attach (edit_vscrollbar, 3, 4, 2, 3, FILL, FILL|EXPAND, 0, 0); + +#else - edit_packer.attach (edit_vscrollbar, 3, 4, 1, 2, FILL, FILL|EXPAND, 0, 0); + edit_packer.attach (edit_vscrollbar, 0, 1, 0, 4, FILL, FILL|EXPAND, 0, 0); - edit_packer.attach (time_button_frame, 0, 2, 0, 1, FILL, FILL, 0, 0); - edit_packer.attach (time_canvas_event_box, 2, 4, 0, 1, FILL|EXPAND, FILL, 0, 0); + edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0); + edit_packer.attach (time_button_event_box, 1, 2, 1, 2, FILL, SHRINK, 0, 0); + edit_packer.attach (time_canvas_event_box, 2, 3, 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); + edit_packer.attach (controls_layout, 1, 2, 2, 3, FILL, FILL|EXPAND, 0, 0); + edit_packer.attach (track_canvas_event_box, 2, 3, 1, 3, FILL|EXPAND, FILL|EXPAND, 0, 0); - edit_packer.attach (zoom_box, 1, 2, 2, 3, FILL, FILL, 0, 0); - edit_packer.attach (edit_hscrollbar, 2, 3, 2, 3, FILL|EXPAND, FILL, 0, 0); + edit_packer.attach (zoom_box, 1, 2, 3, 4, FILL, FILL, 0, 0); + edit_packer.attach (edit_hscrollbar, 2, 3, 3, 4, FILL|EXPAND, FILL, 0, 0); +#endif bottom_hbox.set_border_width (2); bottom_hbox.set_spacing (3); @@ -467,14 +562,15 @@ Editor::Editor () route_list_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); route_list_display.set_headers_visible (true); route_list_display.set_name ("TrackListDisplay"); - route_list_display.get_selection()->set_mode (SELECTION_NONE); + route_list_display.get_selection()->set_mode (SELECTION_SINGLE); route_list_display.set_reorderable (true); route_list_display.set_size_request (100,-1); + route_list_display.add_object_drag (route_display_columns.route.index(), "routes"); CellRendererToggle* route_list_visible_cell = dynamic_cast(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)); @@ -554,6 +650,10 @@ Editor::Editor () region_list_display.set_size_request (100, -1); region_list_display.set_name ("RegionListDisplay"); + /* Try to prevent single mouse presses from initiating edits. + This relies on a hack in gtktreeview.c:gtk_treeview_button_press() + */ + region_list_display.set_data ("mouse-edits-require-mod1", (gpointer) 0x1); region_list_model = TreeStore::create (region_list_columns); region_list_model->set_sort_func (0, mem_fun (*this, &Editor::region_list_sorter)); @@ -561,7 +661,24 @@ Editor::Editor () 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.append_column (_("Start"), region_list_columns.start); + region_list_display.append_column (_("End"), region_list_columns.end); + region_list_display.append_column (_("Length"), region_list_columns.length); + region_list_display.append_column (_("Sync"), region_list_columns.sync); + region_list_display.append_column (_("Fade In"), region_list_columns.fadein); + region_list_display.append_column (_("Fade Out"), region_list_columns.fadeout); + region_list_display.append_column (_("L"), region_list_columns.locked); + region_list_display.append_column (_("G"), region_list_columns.glued); + region_list_display.append_column (_("M"), region_list_columns.muted); + region_list_display.append_column (_("O"), region_list_columns.opaque); + region_list_display.append_column (_("Used"), region_list_columns.used); + region_list_display.append_column (_("Path"), region_list_columns.path); + region_list_display.set_headers_visible (true); + //region_list_display.set_grid_lines (TREE_VIEW_GRID_LINES_BOTH); + + CellRendererText* region_name_cell = dynamic_cast(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)); @@ -572,7 +689,7 @@ Editor::Editor () region_list_display.get_selection()->set_mode (SELECTION_MULTIPLE); region_list_display.add_object_drag (region_list_columns.region.index(), "regions"); - + /* setup DnD handling */ list region_list_target_table; @@ -585,15 +702,19 @@ Editor::Editor () region_list_display.signal_drag_data_received().connect (mem_fun(*this, &Editor::region_list_display_drag_data_received)); region_list_scroller.add (region_list_display); - region_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); - + region_list_scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); + region_list_display.signal_key_press_event().connect (mem_fun(*this, &Editor::region_list_display_key_press)); region_list_display.signal_key_release_event().connect (mem_fun(*this, &Editor::region_list_display_key_release)); region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press), false); region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release)); - region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed)); + region_list_change_connection = region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed)); // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0)); + //ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (mem_fun(*this, &Editor::redisplay_regions)); + ARDOUR_UI::instance()->secondary_clock.mode_changed.connect (mem_fun(*this, &Editor::update_all_region_rows)); + ARDOUR::Region::RegionPropertyChanged.connect (mem_fun(*this, &Editor::update_region_row)); + named_selection_scroller.add (named_selection_display); named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); @@ -639,14 +760,18 @@ Editor::Editor () 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); the_notebook.popup_enable (); the_notebook.set_tab_pos (Gtk::POS_RIGHT); + the_notebook.show_all (); post_maximal_editor_width = 0; post_maximal_pane_position = 0; @@ -655,7 +780,8 @@ Editor::Editor () edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast (&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); @@ -668,12 +794,21 @@ Editor::Editor () 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); + set_edit_point_preference (EditAtMouse, true); + XMLNode* node = ARDOUR_UI::instance()->editor_settings(); set_state (*node); @@ -734,8 +869,10 @@ Editor::Editor () 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)); + BasicUI::AccessAction.connect (mem_fun (*this, &Editor::access_action)); Config->ParameterChanged.connect (mem_fun (*this, &Editor::parameter_changed)); + Route::SyncOrderKeys.connect (mem_fun (*this, &Editor::sync_order_keys)); constructed = true; instant_save (); @@ -744,8 +881,7 @@ Editor::Editor () Editor::~Editor() { #ifdef WITH_CMT - if(image_socket_listener) - { + if(image_socket_listener) { if(image_socket_listener->is_connected()) { image_socket_listener->close_connection() ; @@ -755,6 +891,9 @@ Editor::~Editor() image_socket_listener = 0 ; } #endif + + delete track_canvas; + track_canvas = 0; } void @@ -811,31 +950,25 @@ Editor::set_entered_track (TimeAxisView* tav) void Editor::show_window () { - show_all (); - present (); - - /* re-hide editor list if necessary */ - editor_list_button_toggled (); + if (! is_visible ()) { + show_all (); - /* now reset all audio_time_axis heights, because widgets might need - to be re-hidden - */ - - TimeAxisView *tv; + /* 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 + */ + + TimeAxisView *tv; - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - tv = (static_cast(*i)); - tv->reset_height (); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + tv = (static_cast(*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 @@ -853,13 +986,25 @@ Editor::instant_save () } 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 () @@ -872,10 +1017,10 @@ Editor::zoom_adjustment_changed () if (fpu < 1.0) { fpu = 1.0; - zoom_range_clock.set ((nframes_t) floor (fpu * canvas_width)); + zoom_range_clock.set ((nframes64_t) floor (fpu * canvas_width)); } else if (fpu > session->current_end_frame() / canvas_width) { fpu = session->current_end_frame() / canvas_width; - zoom_range_clock.set ((nframes_t) floor (fpu * canvas_width)); + zoom_range_clock.set ((nframes64_t) floor (fpu * canvas_width)); } temporal_zoom (fpu); @@ -891,43 +1036,87 @@ Editor::control_scroll (float fraction) } 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 + + it acts like a pointer to an nframes64_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 < (nframes64_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 += (nframes64_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) +Editor::deferred_control_scroll (nframes64_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; } +void +Editor::access_action (std::string action_group, std::string action_item) +{ + if (!session) { + return; + } + + ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::access_action), action_group, action_item)); + + RefPtr act; + act = ActionManager::get_action( action_group.c_str(), action_item.c_str() ); + + if (act) { + act->activate(); + } + + +} + void Editor::on_realize () { @@ -940,6 +1129,7 @@ Editor::start_scrolling () { scroll_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Editor::update_current_screen)); + } void @@ -949,7 +1139,7 @@ Editor::stop_scrolling () } void -Editor::map_position_change (nframes_t frame) +Editor::map_position_change (nframes64_t frame) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame)); @@ -962,7 +1152,7 @@ Editor::map_position_change (nframes_t frame) } void -Editor::center_screen (nframes_t frame) +Editor::center_screen (nframes64_t frame) { double page = canvas_width * frames_per_unit; @@ -975,12 +1165,12 @@ Editor::center_screen (nframes_t frame) } void -Editor::center_screen_internal (nframes_t frame, float page) +Editor::center_screen_internal (nframes64_t frame, float page) { page /= 2; if (frame > page) { - frame -= (nframes_t) page; + frame -= (nframes64_t) page; } else { frame = 0; } @@ -991,17 +1181,20 @@ Editor::center_screen_internal (nframes_t frame, float page) void Editor::handle_new_duration () { + if (!session) { + return; + } + ENSURE_GUI_THREAD (mem_fun (*this, &Editor::handle_new_duration)); + nframes64_t new_end = session->current_end_frame() + (nframes64_t) floorf (current_page_frames() * 0.10f); - nframes_t new_end = session->get_maximum_extent() + (nframes_t) floorf (current_page_frames() * 0.10f); - - if (new_end > last_canvas_frame) { - last_canvas_frame = new_end; - horizontal_adjustment.set_upper (last_canvas_frame / frames_per_unit); - reset_scrolling_region (); - } + horizontal_adjustment.set_upper (new_end / frames_per_unit); + horizontal_adjustment.set_page_size (current_page_frames()/frames_per_unit); - horizontal_adjustment.set_value (leftmost_frame/frames_per_unit); + if (horizontal_adjustment.get_value() + canvas_width > horizontal_adjustment.get_upper()) { + horizontal_adjustment.set_value (horizontal_adjustment.get_upper() - canvas_width); + } + //cerr << "Editor::handle_new_duration () called ha v:l:u:ps:lcf = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << endl;//DEBUG } void @@ -1043,6 +1236,10 @@ Editor::connect_to_session (Session *t) { session = t; + /* there are never any selected regions at startup */ + + sensitize_the_right_region_actions (false); + XMLNode* node = ARDOUR_UI::instance()->editor_settings(); set_state (*node); @@ -1067,7 +1264,7 @@ Editor::connect_to_session (Session *t) 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->RegionAdded.connect (mem_fun(*this, &Editor::handle_new_region))); + session_connections.push_back (session->RegionsAdded.connect (mem_fun(*this, &Editor::handle_new_regions))); 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))); @@ -1085,15 +1282,32 @@ Editor::connect_to_session (Session *t) edit_groups_changed (); - edit_cursor_clock.set_session (session); + edit_point_clock.set_mode(AudioClock::BBT); + edit_point_clock.set_session (session); zoom_range_clock.set_session (session); _playlist_selector->set_session (session); nudge_clock.set_session (session); + if (Profile->get_sae()) { + BBT_Time bbt; + bbt.bars = 0; + bbt.beats = 0; + bbt.ticks = 120; + nframes_t pos = session->tempo_map().bbt_duration_at (0, bbt, 1); + nudge_clock.set_mode(AudioClock::BBT); + nudge_clock.set (pos, true, 0, AudioClock::BBT); + + } else { + nudge_clock.set (session->frame_rate() * 5, true, 0, AudioClock::SMPTE); // default of 5 seconds + } + + playhead_cursor->canvas_item.show (); + + if (rhythm_ferret) { + rhythm_ferret->set_session (session); + } -#ifdef FFT_ANALYSIS if (analysis_window != 0) analysis_window->set_session (session); -#endif Location* loc = session->locations()->auto_loop_location(); if (loc == 0) { @@ -1132,22 +1346,26 @@ Editor::connect_to_session (Session *t) 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 (); redisplay_named_selections (); redisplay_snapshots (); + restore_ruler_visibility (); + //tempo_map_changed (Change (0)); + session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); + initial_route_list_display (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (static_cast(*i))->set_samples_per_unit (frames_per_unit); } - restore_ruler_visibility (); - //tempo_map_changed (Change (0)); - session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); - start_scrolling (); /* don't show master bus in a new session */ @@ -1173,10 +1391,23 @@ Editor::connect_to_session (Session *t) no_route_list_redisplay = false; redisplay_route_list (); } + + switch (snap_type) { + case SnapToRegionStart: + case SnapToRegionEnd: + case SnapToRegionSync: + case SnapToRegionBoundary: + build_region_boundary_cache (); + break; + + default: + break; + } /* register for undo history */ - session->register_with_memento_command_factory(_id, this); + + start_updating (); } void @@ -1212,14 +1443,40 @@ Editor::build_cursors () speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot); } + { + RefPtr 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 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); + + { + Glib::RefPtr grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point")); + grabber_edit_point_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_edit_point_pixbuf, 5, 17); + } + cross_hair_cursor = new Gdk::Cursor (CROSSHAIR); trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW); selector_cursor = new Gdk::Cursor (XTERM); time_fx_cursor = new Gdk::Cursor (SIZING); wait_cursor = new Gdk::Cursor (WATCH); timebar_cursor = new Gdk::Cursor(LEFT_PTR); - note_cursor = new Gdk::Cursor (PENCIL); + midi_pencil_cursor = new Gdk::Cursor (PENCIL); + midi_select_cursor = new Gdk::Cursor (CENTER_PTR); + midi_resize_cursor = new Gdk::Cursor (SIZING); + 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 */ @@ -1248,12 +1505,18 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i } 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::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))); + + 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: @@ -1266,11 +1529,16 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i 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::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))); + 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; @@ -1284,38 +1552,205 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i fade_context_menu.popup (button, time); } -/* Pop up the general track context menu for when the user clicks pretty much anywhere in a track or bus */ void -Editor::popup_track_context_menu (int button, int32_t time, nframes_t frame) -{ - build_track_context_menu (frame)->popup (button, time); -} - -Menu* -Editor::build_track_context_menu (nframes_t frame) +Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes64_t frame) { using namespace Menu_Helpers; + Menu* (Editor::*build_menu_function)(nframes64_t); + Menu *menu; - Menu* menu = manage (new Menu); - MenuList& edit_items = menu->items(); - edit_items.clear(); - - /* Build the general `track' context menu, adding what is appropriate given - the current selection */ + switch (item_type) { + case RegionItem: + case RegionViewName: + case RegionViewNameHighlight: + if (with_selection) { + build_menu_function = &Editor::build_track_selection_context_menu; + } else { + build_menu_function = &Editor::build_track_region_context_menu; + } + break; - /* XXX: currently crossfades can't be selected, so we can't use the selection - to decide which crossfades to mention in the menu. I believe this will - change at some point. For now we have to use clicked_trackview to decide. */ - AudioTimeAxisView* atv = dynamic_cast (clicked_axisview); + case SelectionItem: + if (with_selection) { + build_menu_function = &Editor::build_track_selection_context_menu; + } else { + build_menu_function = &Editor::build_track_context_menu; + } + break; - if (atv) { - boost::shared_ptr ds; - boost::shared_ptr pl; - boost::shared_ptr apl; + case CrossfadeViewItem: + build_menu_function = &Editor::build_track_crossfade_context_menu; + break; + + case StreamItem: + if (clicked_routeview->get_diskstream()) { + build_menu_function = &Editor::build_track_context_menu; + } else { + build_menu_function = &Editor::build_track_bus_context_menu; + } + break; + + default: + /* probably shouldn't happen but if it does, we don't care */ + return; + } + + menu = (this->*build_menu_function)(frame); + menu->set_name ("ArdourContextMenu"); + + /* now handle specific situations */ + + switch (item_type) { + case RegionItem: + case RegionViewName: + case RegionViewNameHighlight: + if (!with_selection) { + if (region_edit_menu_split_item) { + if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) { + ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, true); + } else { + ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false); + } + } + /* + if (region_edit_menu_split_multichannel_item) { + if (clicked_regionview && clicked_regionview->region().n_channels() > 1) { + // GTK2FIX find the action, change its sensitivity + // region_edit_menu_split_multichannel_item->set_sensitive (true); + } else { + // GTK2FIX see above + // region_edit_menu_split_multichannel_item->set_sensitive (false); + } + }*/ + } + break; + + case SelectionItem: + break; + + case CrossfadeViewItem: + break; + + case StreamItem: + break; + + default: + /* probably shouldn't happen but if it does, we don't care */ + return; + } + + if (item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) { + + /* Bounce to disk */ + + using namespace Menu_Helpers; + MenuList& edit_items = menu->items(); + + edit_items.push_back (SeparatorElem()); + + switch (clicked_routeview->audio_track()->freeze_state()) { + case AudioTrack::NoFreeze: + edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route))); + break; + + case AudioTrack::Frozen: + edit_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_route))); + break; + + case AudioTrack::UnFrozen: + edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route))); + break; + } + + } + + if (item_type == StreamItem && clicked_routeview) { + clicked_routeview->build_underlay_menu(menu); + } + + menu->popup (button, time); +} + +Menu* +Editor::build_track_context_menu (nframes64_t ignored) +{ + using namespace Menu_Helpers; + + MenuList& edit_items = track_context_menu.items(); + edit_items.clear(); + + add_dstream_context_items (edit_items); + return &track_context_menu; +} + +Menu* +Editor::build_track_bus_context_menu (nframes64_t ignored) +{ + using namespace Menu_Helpers; + + MenuList& edit_items = track_context_menu.items(); + edit_items.clear(); + + add_bus_context_items (edit_items); + return &track_context_menu; +} + +Menu* +Editor::build_track_region_context_menu (nframes64_t frame) +{ + using namespace Menu_Helpers; + MenuList& edit_items = track_region_context_menu.items(); + edit_items.clear(); + + RouteTimeAxisView* rtv = dynamic_cast (clicked_axisview); + + if (rtv) { + boost::shared_ptr ds; + boost::shared_ptr pl; + + if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { + Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)frame * ds->speed())); + + if (selection->regions.size() > 1) { + // there's already a multiple selection: just add a + // single region context menu that will act on all + // selected regions + boost::shared_ptr dummy_region; // = NULL + add_region_context_items (rtv->view(), dummy_region, edit_items); + } else { + for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { + add_region_context_items (rtv->view(), (*i), edit_items); + } + } + + delete regions; + } + } + + add_dstream_context_items (edit_items); + + return &track_region_context_menu; +} + +Menu* +Editor::build_track_crossfade_context_menu (nframes64_t frame) +{ + using namespace Menu_Helpers; + MenuList& edit_items = track_crossfade_context_menu.items(); + edit_items.clear (); + + AudioTimeAxisView* atv = dynamic_cast (clicked_axisview); + + if (atv) { + boost::shared_ptr ds; + boost::shared_ptr pl; + boost::shared_ptr apl; if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast (pl)) != 0)) { + Playlist::RegionList* regions = pl->regions_at (frame); AudioPlaylist::Crossfades xfades; + apl->crossfades_at (frame, xfades); bool many = xfades.size() > 1; @@ -1323,27 +1758,27 @@ Editor::build_track_context_menu (nframes_t frame) for (AudioPlaylist::Crossfades::iterator i = xfades.begin(); i != xfades.end(); ++i) { add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many); } - } - } - - if (!selection->time.empty()) { - add_selection_context_items (edit_items); - } - if (!selection->regions.empty()) { - add_region_context_items (edit_items); + if (selection->regions.size() > 1) { + // there's already a multiple selection: just add a + // single region context menu that will act on all + // selected regions + boost::shared_ptr dummy_region; // = NULL + add_region_context_items (atv->audio_view(), dummy_region, edit_items); + } else { + for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { + add_region_context_items (atv->audio_view(), (*i), edit_items); + } + } + delete regions; + } } - if (!selection->tracks.empty()) { - add_bus_or_audio_track_context_items (edit_items); - } - - menu->set_name ("ArdourContextMenu"); + add_dstream_context_items (edit_items); - return menu; + return &track_crossfade_context_menu; } -#ifdef FFT_ANALYSIS void Editor::analyze_region_selection() { @@ -1379,8 +1814,20 @@ Editor::analyze_range_selection() analysis_window->present(); } -#endif /* FFT_ANALYSIS */ +Menu* +Editor::build_track_selection_context_menu (nframes64_t ignored) +{ + using namespace Menu_Helpers; + MenuList& edit_items = track_selection_context_menu.items(); + edit_items.clear (); + + add_selection_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. @@ -1456,98 +1903,160 @@ Editor::add_item_with_sensitivity (Menu_Helpers::MenuList& m, Menu_Helpers::Menu } } -/** Add context menu items relevant to regions. - * @param edit_items List to add the items to. - */ void -Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items) +Editor::add_region_context_items (StreamView* sv, boost::shared_ptr region, Menu_Helpers::MenuList& edit_items) { using namespace Menu_Helpers; - Menu *region_menu = manage (new Menu); - MenuList& items = region_menu->items(); + Gtk::MenuItem* foo_item; + Menu *region_menu = manage (new Menu); + MenuList& items = region_menu->items(); region_menu->set_name ("ArdourContextMenu"); - - items.push_back (MenuElem (_("Edit..."), 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))); - - Menu* sync_point_menu = manage (new Menu); - MenuList& sync_point_items = sync_point_menu->items(); - sync_point_menu->set_name("ArdourContextMenu"); - - sync_point_items.push_back (MenuElem (_("Define"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor))); - sync_point_items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region_sync))); - items.push_back (MenuElem (_("Sync points"), *sync_point_menu)); + boost::shared_ptr ar; + boost::shared_ptr mr; - add_item_with_sensitivity (items, MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)), selection->regions.size() == 1); - - add_item_with_sensitivity (items, MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)), selection->regions.size() == 1); + if (region) { + ar = boost::dynamic_pointer_cast (region); + mr = boost::dynamic_pointer_cast (region); - items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection))); + /* when this particular menu pops up, make the relevant region + become selected. + */ -#ifdef FFT_ANALYSIS - items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection))); -#endif + region_menu->signal_map_event().connect ( + bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr(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_point))); + items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Lock"), bind (mem_fun (*this, &Editor::set_region_lock), true))); - items.push_back (MenuElem (_("Unlock"), bind (mem_fun (*this, &Editor::set_region_lock), false))); - items.push_back (MenuElem (_("Lock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), true))); - items.push_back (MenuElem (_("Unlock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), false))); - items.push_back (MenuElem (_("Mute"), bind (mem_fun (*this, &Editor::set_region_mute), true))); - items.push_back (MenuElem (_("Unmute"), bind (mem_fun (*this, &Editor::set_region_mute), false))); - items.push_back (MenuElem (_("Opaque"), bind (mem_fun (*this, &Editor::set_region_opaque), true))); - items.push_back (MenuElem (_("Transparent"), bind (mem_fun (*this, &Editor::set_region_opaque), false))); - - /* We allow "Original position" if at least one region is not at its - natural position - */ - RegionSelection::iterator i = selection->regions.begin(); - while (i != selection->regions.end() && (*i)->region()->at_natural_position() == true) { - ++i; + 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))); + + if (ar) { + items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_region_selection))); } - add_item_with_sensitivity (items, MenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)), i != selection->regions.end()); - items.push_back (SeparatorElem()); - /* Find out if we have a selected audio region */ - i = selection->regions.begin(); - while (i != selection->regions.end() && boost::dynamic_pointer_cast((*i)->region()) == 0) { - ++i; + sigc::connection fooc; + boost::shared_ptr region_to_check; + + if (region) { + region_to_check = region; + } else { + region_to_check = selection->regions.front()->region(); } - bool const have_selected_audio_region = (i != selection->regions.end()); - if (have_selected_audio_region) { + items.push_back (CheckMenuElem (_("Lock"))); + CheckMenuItem* region_lock_item = static_cast(&items.back()); + if (region_to_check->locked()) { + region_lock_item->set_active(); + } + region_lock_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_lock)); + + items.push_back (CheckMenuElem (_("Glue to Bars&Beats"))); + CheckMenuItem* bbt_glue_item = static_cast(&items.back()); + + switch (region_to_check->positional_lock_style()) { + case Region::MusicTime: + bbt_glue_item->set_active (true); + break; + default: + bbt_glue_item->set_active (false); + break; + } + + bbt_glue_item->signal_activate().connect (bind (mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime)); + + items.push_back (CheckMenuElem (_("Mute"))); + CheckMenuItem* region_mute_item = static_cast(&items.back()); + fooc = region_mute_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_mute)); + if (region_to_check->muted()) { + fooc.block (true); + region_mute_item->set_active(); + fooc.block (false); + } + + if (!Profile->get_sae()) { + items.push_back (CheckMenuElem (_("Opaque"))); + CheckMenuItem* region_opaque_item = static_cast(&items.back()); + fooc = region_opaque_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_opaque)); + if (region_to_check->opaque()) { + fooc.block (true); + region_opaque_item->set_active(); + fooc.block (false); + } + } + + items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize))); + if (region_to_check->at_natural_position()) { + items.back().set_sensitive (false); + } + + items.push_back (SeparatorElem()); + + if (ar) { + + RegionView* rv = sv->find_view (ar); + AudioRegionView* arv = dynamic_cast(rv); + + if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes))); + + items.push_back (CheckMenuElem (_("Envelope Visible"))); + CheckMenuItem* region_envelope_visible_item = static_cast (&items.back()); + fooc = region_envelope_visible_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_visibility)); + if (arv->envelope_visible()) { + fooc.block (true); + region_envelope_visible_item->set_active (true); + fooc.block (false); + } + + items.push_back (CheckMenuElem (_("Envelope Active"))); + CheckMenuItem* region_envelope_active_item = static_cast (&items.back()); + fooc = region_envelope_active_item->signal_activate().connect (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); + } - Menu* envelopes_menu = manage (new Menu); - MenuList& envelopes_items = envelopes_menu->items(); - envelopes_menu->set_name ("ArdourContextMenu"); + items.push_back (SeparatorElem()); + } - envelopes_items.push_back (MenuElem (_("Reset"), mem_fun(*this, &Editor::reset_region_gain_envelopes))); - envelopes_items.push_back (MenuElem (_("Visible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), true))); - envelopes_items.push_back (MenuElem (_("Invisible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), false))); - envelopes_items.push_back (MenuElem (_("Active"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), true))); - envelopes_items.push_back (MenuElem (_("Inactive"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), false))); + 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))); + } - items.push_back (MenuElem (_("Envelopes"), *envelopes_menu)); - - items.push_back (MenuElem (_("Denormalize"), mem_fun (*this, &Editor::denormalize_regions))); - items.push_back (MenuElem (_("Normalize"), mem_fun (*this, &Editor::normalize_regions))); + } 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_regions))); - items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region))); + items.push_back (SeparatorElem()); /* range related stuff */ - - add_item_with_sensitivity (items, MenuElem (_("Add range markers"), mem_fun (*this, &Editor::add_location_from_audio_region)), selection->regions.size() == 1); - - add_item_with_sensitivity (items, MenuElem (_("Set range selection"), mem_fun (*this, &Editor::set_selection_from_audio_region)), selection->regions.size() == 1); - + + items.push_back (MenuElem (_("Add Single Range"), mem_fun (*this, &Editor::add_location_from_audio_region))); + items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_locations_from_audio_region))); + if (selection->regions.size() < 2) { + items.back().set_sensitive (false); + } + + items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_region))); items.push_back (SeparatorElem()); /* Nudge region */ @@ -1556,25 +2065,47 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items) MenuList& nudge_items = nudge_menu->items(); nudge_menu->set_name ("ArdourContextMenu"); - nudge_items.push_back (MenuElem (_("Nudge forward"), (bind (mem_fun(*this, &Editor::nudge_forward), false)))); - nudge_items.push_back (MenuElem (_("Nudge backward"), (bind (mem_fun(*this, &Editor::nudge_backward), false)))); - nudge_items.push_back (MenuElem (_("Nudge forward by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset)))); - nudge_items.push_back (MenuElem (_("Nudge backward by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset)))); + nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false, false)))); + nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset)))); + nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset)))); items.push_back (MenuElem (_("Nudge"), *nudge_menu)); + items.push_back (SeparatorElem()); Menu *trim_menu = manage (new Menu); MenuList& trim_items = trim_menu->items(); trim_menu->set_name ("ArdourContextMenu"); - trim_items.push_back (MenuElem (_("Start to edit 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))); + foo_item = &trim_items.back(); + if (_edit_point == EditAtMouse) { + foo_item->set_sensitive (false); + } + trim_items.push_back (MenuElem (_("Edit point to end"), mem_fun(*this, &Editor::trim_region_to_edit_point))); + foo_item = &trim_items.back(); + if (_edit_point == EditAtMouse) { + foo_item->set_sensitive (false); + } + trim_items.push_back (MenuElem (_("Trim To Loop"), 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 (_("Split"), (mem_fun(*this, &Editor::split_region)))); + region_edit_menu_split_item = &items.back(); + + if (_edit_point == EditAtMouse) { + region_edit_menu_split_item->set_sensitive (false); + } + items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region)))); - items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true)))); - items.push_back (MenuElem (_("Fill track"), (mem_fun(*this, &Editor::region_fill_track)))); + region_edit_menu_split_multichannel_item = &items.back(); + + 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_selected_regions))); @@ -1582,8 +2113,20 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items) the standard items. */ - string const menu_item_name = selection->regions.size() > 1 ? _("Regions") : _("Region"); + /* we have to hack up the region name because "_" has a special + meaning for menu titles. + */ + + string::size_type pos = 0; + string menu_item_name = (region) ? region->name() : _("Selected regions"); + + while ((pos = menu_item_name.find ("_", pos)) != string::npos) { + menu_item_name.replace (pos, 1, "__"); + pos += 2; + } + edit_items.push_back (MenuElem (menu_item_name, *region_menu)); + edit_items.push_back (SeparatorElem()); } /** Add context menu items relevant to selection ranges. @@ -1598,74 +2141,56 @@ 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()); - items.push_back (MenuElem (_("Analyze range"), mem_fun(*this, &Editor::analyze_range_selection))); -#endif + items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_range_selection))); 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 (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection))); 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 (MenuElem (_("Duplicate range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false))); items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::create_named_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()); + items.push_back (MenuElem (_("Consolidate range"), bind (mem_fun(*this, &Editor::bounce_range_selection), true))); + items.push_back (MenuElem (_("Bounce range to region list"), bind (mem_fun(*this, &Editor::bounce_range_selection), false))); + items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_range))); } -/** Add context menu items relevant to busses or audio tracks. - * @param edit_items List to add the items to. - */ + void -Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items) +Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items) { using namespace Menu_Helpers; - /* We add every possible action here, and de-sensitize things - that aren't allowed. The sensitivity logic is a bit spread out; - on the one hand I'm using things like can_cut_copy (), which is - reasonably complicated and so perhaps better near the function that - it expresses sensitivity for, and on the other hand checks - in this function as well. You can't really have can_* for everything - or the number of methods would get silly. */ - - bool const one_selected_region = selection->regions.size() == 1; - - /* Count the number of selected audio tracks */ - int n_audio_tracks = 0; - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - RouteTimeAxisView const * r = dynamic_cast(*i); - if (r && r->is_audio_track()) { - n_audio_tracks++; - } - } - /* Playback */ Menu *play_menu = manage (new 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))); - add_item_with_sensitivity (play_items, MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)), one_selected_region); - - add_item_with_sensitivity (play_items, MenuElem (_("Loop region"), mem_fun(*this, &Editor::loop_selected_region)), one_selected_region); + play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region))); + play_items.push_back (SeparatorElem()); + play_items.push_back (MenuElem (_("Loop Region"), mem_fun(*this, &Editor::loop_selected_region))); edit_items.push_back (MenuElem (_("Play"), *play_menu)); @@ -1674,33 +2199,24 @@ Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items Menu *select_menu = manage (new Menu); MenuList& select_items = select_menu->items(); select_menu->set_name ("ArdourContextMenu"); - - string str = selection->tracks.size() == 1 ? _("Select all in track") : _("Select all in tracks"); - - select_items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::select_all_in_selected_tracks), Selection::Set))); - - select_items.push_back (MenuElem (_("Select all"), bind (mem_fun(*this, &Editor::select_all), Selection::Set))); - - str = selection->tracks.size() == 1 ? _("Invert selection in track") : _("Invert selection in tracks"); - - select_items.push_back (MenuElem (str, mem_fun(*this, &Editor::invert_selection_in_selected_tracks))); + select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); + select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set))); + 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 (_("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 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))); - if (n_audio_tracks) { - 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 (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))); - - if (n_audio_tracks) { - 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)); @@ -1709,91 +2225,136 @@ Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items Menu *cutnpaste_menu = manage (new Menu); MenuList& cutnpaste_items = cutnpaste_menu->items(); cutnpaste_menu->set_name ("ArdourContextMenu"); - - add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)), can_cut_copy ()); - - add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)), can_cut_copy ()); - if (n_audio_tracks) { - 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 (SeparatorElem()); - - cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint))); - cutnpaste_items.push_back (MenuElem (_("Align relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint))); - cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f))); - } else { - cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f))); - } + 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"), bind (mem_fun(*this, &Editor::paste), 1.0f))); - edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu)); - - if (n_audio_tracks) { + cutnpaste_items.push_back (SeparatorElem()); - Menu *track_menu = manage (new Menu); - MenuList& track_items = track_menu->items(); - track_menu->set_name ("ArdourContextMenu"); - - /* Adding new material */ - - add_item_with_sensitivity (track_items, MenuElem (_("Insert selected region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)), n_audio_tracks == 1); - - add_item_with_sensitivity (track_items, MenuElem (_("Insert existing audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)), n_audio_tracks == 1); - - /* Nudge */ + cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint))); + cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint))); - Menu *nudge_menu = manage (new Menu()); - MenuList& nudge_items = nudge_menu->items(); - nudge_menu->set_name ("ArdourContextMenu"); + cutnpaste_items.push_back (SeparatorElem()); - str = selection->tracks.size() == 1 ? _("Nudge track forward") : _("Nude tracks forward"); - nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, true)))); + cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f))); - str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor forward") : _("Nudge tracks after edit cursor forward"); - - nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, true)))); + edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu)); - str = selection->tracks.size() == 1 ? _("Nudge track backward") : _("Nudge tracks backward"); - - nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, false)))); + /* Adding new material */ + + 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 Media"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack))); - str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor backward") : _("Nudge tracks after edit cursor backward"); - - nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, false)))); - - track_items.push_back (MenuElem (_("Nudge"), *nudge_menu)); + /* Nudge track */ - /* Freeze */ - track_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_routes))); - track_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_routes))); + Menu *nudge_menu = manage (new Menu()); + MenuList& nudge_items = nudge_menu->items(); + nudge_menu->set_name ("ArdourContextMenu"); + + 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 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 point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false)))); - str = selection->tracks.size() == 1 ? _("Track") : _("Tracks"); - edit_items.push_back (MenuElem (str, *track_menu)); - } + edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu)); } -/* CURSOR SETTING AND MARKS AND STUFF */ - void -Editor::set_snap_to (SnapType st) -{ - snap_type = st; - string str = snap_type_strings[(int) st]; +Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items) +{ + using namespace Menu_Helpers; - if (str != snap_type_selector.get_active_text()) { - snap_type_selector.set_active_text (str); - } + /* Playback */ - instant_save (); + Menu *play_menu = manage (new Menu); + MenuList& play_items = play_menu->items(); + play_menu->set_name ("ArdourContextMenu"); + + 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)); + + /* Selection */ + + Menu *select_menu = manage (new Menu); + MenuList& select_items = select_menu->items(); + select_menu->set_name ("ArdourContextMenu"); + + select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set))); + select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set))); + 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 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 (MenuElem (_("Select"), *select_menu)); + + /* Cut-n-Paste */ + + Menu *cutnpaste_menu = manage (new Menu); + MenuList& cutnpaste_items = cutnpaste_menu->items(); + cutnpaste_menu->set_name ("ArdourContextMenu"); + + 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"), bind (mem_fun(*this, &Editor::paste), 1.0f))); + + Menu *nudge_menu = manage (new Menu()); + MenuList& nudge_items = nudge_menu->items(); + nudge_menu->set_name ("ArdourContextMenu"); + + 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 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 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; + + 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); + } + + instant_save (); + + switch (snap_type) { + case SnapToAThirtysecondBeat: + case SnapToASixteenthBeat: + case SnapToAEighthBeat: + case SnapToAQuarterBeat: + case SnapToAThirdBeat: + compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); + update_tempo_based_rulers (); + break; + + case SnapToRegionStart: + case SnapToRegionEnd: + case SnapToRegionSync: + case SnapToRegionBoundary: + build_region_boundary_cache (); + break; - switch (snap_type) { - case SnapToAThirtysecondBeat: - case SnapToASixteenthBeat: - case SnapToAEighthBeat: - case SnapToAQuarterBeat: - case SnapToAThirdBeat: - update_tempo_based_rulers (); default: /* relax */ break; @@ -1812,6 +2373,74 @@ Editor::set_snap_mode (SnapMode mode) instant_save (); } +void +Editor::set_edit_point_preference (EditPoint ep, bool force) +{ + 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); + } + + set_canvas_cursor (); + + if (!force && !changed) { + return; + } + + 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; + } + + const char* action=NULL; + + switch (_edit_point) { + case EditAtPlayhead: + action = "edit-at-playhead"; + break; + case EditAtSelectedMarker: + action = "edit-at-marker"; + break; + case EditAtMouse: + action = "edit-at-mouse"; + break; + } + + Glib::RefPtr act = ActionManager::get_action ("Editor", action); + if (act) { + Glib::RefPtr::cast_dynamic(act)->set_active (true); + } + + nframes64_t foo; + bool in_track_canvas; + + if (!mouse_frame (foo, in_track_canvas)) { + in_track_canvas = false; + } + + reset_canvas_action_sensitivity (in_track_canvas); + + instant_save (); +} int Editor::set_state (const XMLNode& node) @@ -1825,30 +2454,63 @@ Editor::set_state (const XMLNode& node) _id = prop->value (); } - if ((geometry = find_named_node (node, "geometry")) == 0) { + g.base_width = default_width; + g.base_height = default_height; + x = 1; + y = 1; + xoff = 0; + yoff = 21; - g.base_width = default_width; - g.base_height = default_height; - x = 1; - y = 1; - xoff = 0; - yoff = 21; + if ((geometry = find_named_node (node, "geometry")) != 0) { - } else { + XMLProperty* prop; + + if ((prop = geometry->property("x_size")) == 0) { + prop = geometry->property ("x-size"); + } + if (prop) { + g.base_width = atoi(prop->value()); + } + if ((prop = geometry->property("y_size")) == 0) { + prop = geometry->property ("y-size"); + } + if (prop) { + g.base_height = atoi(prop->value()); + } + + if ((prop = geometry->property ("x_pos")) == 0) { + prop = geometry->property ("x-pos"); + } + if (prop) { + x = atoi (prop->value()); - g.base_width = atoi(geometry->property("x_size")->value()); - g.base_height = atoi(geometry->property("y_size")->value()); - x = atoi(geometry->property("x_pos")->value()); - y = atoi(geometry->property("y_pos")->value()); - xoff = atoi(geometry->property("x_off")->value()); - yoff = atoi(geometry->property("y_off")->value()); + } + if ((prop = geometry->property ("y_pos")) == 0) { + prop = geometry->property ("y-pos"); + } + if (prop) { + y = atoi (prop->value()); + } + + if ((prop = geometry->property ("x_off")) == 0) { + prop = geometry->property ("x-off"); + } + if (prop) { + xoff = atoi (prop->value()); + } + if ((prop = geometry->property ("y_off")) == 0) { + prop = geometry->property ("y-off"); + } + if (prop) { + yoff = atoi (prop->value()); + } } set_default_size (g.base_width, g.base_height); move (x, y); if (session && (prop = node.property ("playhead"))) { - nframes_t pos = atol (prop->value().c_str()); + nframes64_t pos = atol (prop->value().c_str()); playhead_cursor->set_position (pos); } else { playhead_cursor->set_position (0); @@ -1862,13 +2524,6 @@ 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)); } @@ -1889,6 +2544,10 @@ Editor::set_state (const XMLNode& node) 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), true); + } + if ((prop = node.property ("mouse-mode"))) { MouseMode m = str2mousemode(prop->value()); mouse_mode = MouseMode ((int) m + 1); /* lie, force mode switch */ @@ -1901,7 +2560,7 @@ Editor::set_state (const XMLNode& node) if ((prop = node.property ("show-waveforms"))) { bool yn = (prop->value() == "yes"); _show_waveforms = !yn; - RefPtr act = ActionManager::get_action (X_("Editor"), X_("ToggleWaveformVisibility")); + RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-waveform-visible")); if (act) { RefPtr tact = RefPtr::cast_dynamic(act); /* do it twice to force the change */ @@ -2012,17 +2671,17 @@ Editor::get_state () XMLNode* geometry = new XMLNode ("geometry"); snprintf(buf, sizeof(buf), "%d", width); - geometry->add_property("x_size", string(buf)); + geometry->add_property("x-size", string(buf)); snprintf(buf, sizeof(buf), "%d", height); - geometry->add_property("y_size", string(buf)); + geometry->add_property("y-size", string(buf)); snprintf(buf, sizeof(buf), "%d", x); - geometry->add_property("x_pos", string(buf)); + geometry->add_property("x-pos", string(buf)); snprintf(buf, sizeof(buf), "%d", y); - geometry->add_property("y_pos", string(buf)); + geometry->add_property("y-pos", string(buf)); snprintf(buf, sizeof(buf), "%d", xoff); - geometry->add_property("x_off", string(buf)); + geometry->add_property("x-off", string(buf)); snprintf(buf, sizeof(buf), "%d", yoff); - geometry->add_property("y_off", string(buf)); + geometry->add_property("y-off", string(buf)); snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&edit_pane)->gobj())); geometry->add_property("edit_pane_pos", string(buf)); @@ -2040,10 +2699,10 @@ Editor::get_state () snprintf (buf, sizeof(buf), "%d", (int) snap_mode); node->add_property ("snap-mode", buf); - snprintf (buf, sizeof (buf), "%" PRIu32, playhead_cursor->current_frame); + node->add_property ("edit-point", enum_2_string (_edit_point)); + + snprintf (buf, sizeof (buf), "%" PRIi64, 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"); @@ -2070,31 +2729,41 @@ Editor::get_state () -TimeAxisView * +/** @param y y offset from the top of all trackviews. + * @return pair: TimeAxisView that y is over, layer index. + * TimeAxisView may be 0. Layer index is the layer number if the TimeAxisView is valid and is + * in stacked region display mode, otherwise 0. + */ +std::pair Editor::trackview_by_y_position (double y) { for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { - TimeAxisView *tv; - - if ((tv = (*iter)->covers_y_position (y)) != 0) { - return tv; + std::pair const r = (*iter)->covers_y_position (y); + if (r.first) { + return r; } } - return 0; + return std::make_pair ( (TimeAxisView *) 0, 0); } void 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; } + snap_to_internal (start, direction, for_mark); +} + +void +Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark) +{ + Location* before = 0; + Location* after = 0; + 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()); @@ -2102,22 +2771,19 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) 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); + if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) { + start = (nframes64_t) ceil ((double) start / (one_second / 75)) * (one_second / 75); } else { - start = (nframes_t) floor ((double) start / (one_second / 75)) * (one_second / 75); + start = (nframes64_t) floor ((double) start / (one_second / 75)) * (one_second / 75); } break; case SnapToSMPTEFrame: - if (fmod((double)start, (double)session->frames_per_smpte_frame()) > (session->frames_per_smpte_frame() / 2)) { - start = (nframes_t) (ceil ((double) start / session->frames_per_smpte_frame()) * session->frames_per_smpte_frame()); + if (((direction == 0) && (fmod((double)start, (double)session->frames_per_smpte_frame()) > (session->frames_per_smpte_frame() / 2))) || (direction > 0)) { + start = (nframes64_t) (ceil ((double) start / session->frames_per_smpte_frame()) * session->frames_per_smpte_frame()); } else { - start = (nframes_t) (floor ((double) start / session->frames_per_smpte_frame()) * session->frames_per_smpte_frame()); + start = (nframes64_t) (floor ((double) start / session->frames_per_smpte_frame()) * session->frames_per_smpte_frame()); } break; @@ -2128,10 +2794,10 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) } else { start -= session->smpte_offset (); } - if (start % one_smpte_second > one_smpte_second / 2) { - start = (nframes_t) ceil ((double) start / one_smpte_second) * one_smpte_second; + if (((direction == 0) && (start % one_smpte_second > one_smpte_second / 2)) || direction > 0) { + start = (nframes64_t) ceil ((double) start / one_smpte_second) * one_smpte_second; } else { - start = (nframes_t) floor ((double) start / one_smpte_second) * one_smpte_second; + start = (nframes64_t) floor ((double) start / one_smpte_second) * one_smpte_second; } if (session->smpte_offset_negative()) @@ -2149,10 +2815,10 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) } else { start -= session->smpte_offset (); } - if (start % one_smpte_minute > one_smpte_minute / 2) { - start = (nframes_t) ceil ((double) start / one_smpte_minute) * one_smpte_minute; + if (((direction == 0) && (start % one_smpte_minute > one_smpte_minute / 2)) || direction > 0) { + start = (nframes64_t) ceil ((double) start / one_smpte_minute) * one_smpte_minute; } else { - start = (nframes_t) floor ((double) start / one_smpte_minute) * one_smpte_minute; + start = (nframes64_t) floor ((double) start / one_smpte_minute) * one_smpte_minute; } if (session->smpte_offset_negative()) { @@ -2163,18 +2829,18 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) break; case SnapToSeconds: - if (start % one_second > one_second / 2) { - start = (nframes_t) ceil ((double) start / one_second) * one_second; + if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) { + start = (nframes64_t) ceil ((double) start / one_second) * one_second; } else { - start = (nframes_t) floor ((double) start / one_second) * one_second; + start = (nframes64_t) floor ((double) start / one_second) * one_second; } break; case SnapToMinutes: - if (start % one_minute > one_minute / 2) { - start = (nframes_t) ceil ((double) start / one_minute) * one_minute; + if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) { + start = (nframes64_t) ceil ((double) start / one_minute) * one_minute; } else { - start = (nframes_t) floor ((double) start / one_minute) * one_minute; + start = (nframes64_t) floor ((double) start / one_minute) * one_minute; } break; @@ -2187,27 +2853,23 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) 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: @@ -2255,7 +2917,7 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) case SnapToRegionSync: case SnapToRegionBoundary: if (!region_boundary_cache.empty()) { - vector::iterator i; + vector::iterator i; if (direction > 0) { i = std::upper_bound (region_boundary_cache.begin(), region_boundary_cache.end(), start); @@ -2264,11 +2926,19 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) } if (i != region_boundary_cache.end()) { + + /* lower bound doesn't quite to the right thing for our purposes */ + + if (direction < 0 && i != region_boundary_cache.begin()) { + --i; + } + start = *i; + } else { start = region_boundary_cache.back(); } - } + } break; } @@ -2290,18 +2960,62 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark) } default: + /* handled at entry */ return; } } +double +Editor::snap_length_beats (nframes64_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; - const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button - +#ifdef GTKOSX + const guint32 FUDGE = 38; // Combo's are stupid - they steal space from the entry for the button +#else + const guint32 FUDGE = 24; // Combo's are stupid - they steal space from the entry for the button +#endif /* Mode Buttons (tool selection) */ @@ -2310,12 +3024,17 @@ Editor::setup_toolbar () 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); @@ -2336,17 +3055,24 @@ Editor::setup_toolbar () 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 edit_mode_strings; - edit_mode_strings.push_back (edit_mode_to_string (Splice)); edit_mode_strings.push_back (edit_mode_to_string (Slide)); + if (!Profile->get_sae()) { + edit_mode_strings.push_back (edit_mode_to_string (Splice)); + } + edit_mode_strings.push_back (edit_mode_to_string (Lock)); edit_mode_selector.set_name ("EditModeSelector"); Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, longest (edit_mode_strings).c_str(), 2+FUDGE, 10); @@ -2359,6 +3085,10 @@ Editor::setup_toolbar () mouse_mode_tearoff = manage (new TearOff (*mode_box)); mouse_mode_tearoff->set_name ("MouseModeBase"); + if (Profile->get_sae()) { + mouse_mode_tearoff->set_can_be_torn_off (false); + } + mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), &mouse_mode_tearoff->tearoff_window())); mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), @@ -2408,7 +3138,7 @@ Editor::setup_toolbar () /* 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); @@ -2429,7 +3159,7 @@ Editor::setup_toolbar () 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, "Center", 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")); @@ -2439,26 +3169,31 @@ Editor::setup_toolbar () 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 */ @@ -2466,8 +3201,8 @@ Editor::setup_toolbar () nudge_box->set_spacing(1); nudge_box->set_border_width (2); - 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)); + nudge_forward_button.signal_button_release_event().connect (mem_fun(*this, &Editor::nudge_forward_release), false); + nudge_backward_button.signal_button_release_event().connect (mem_fun(*this, &Editor::nudge_backward_release), false); nudge_box->pack_start (nudge_backward_button, false, false); nudge_box->pack_start (nudge_forward_button, false, false); @@ -2476,12 +3211,16 @@ Editor::setup_toolbar () /* 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"); + if (Profile->get_sae()) { + tools_tearoff->set_can_be_torn_off (false); + } + tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), &tools_tearoff->tearoff_window())); tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), @@ -2512,6 +3251,123 @@ Editor::setup_toolbar () toolbar_frame.add (toolbar_base); } +void +Editor::midi_panic_button_pressed () +{ + if (session) { + session->midi_panic(); + } +} + +void +Editor::setup_midi_toolbar () +{ + string pixmap_path; + + /* Mode Buttons (tool selection) */ + + vector 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_resize_button.add (*(manage (new Image (::get_icon("strip_width"))))); + midi_tool_resize_button.set_relief(Gtk::RELIEF_NONE); + midi_tool_buttons.push_back (&midi_tool_resize_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(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_resize_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_resize_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_resize_button, _("Resize 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_resize_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_resize_button.signal_toggled().connect (bind (mem_fun(*this, + &Editor::midi_edit_mode_toggled), Editing::MidiEditResize)); + midi_tool_erase_button.signal_toggled().connect (bind (mem_fun(*this, + &Editor::midi_edit_mode_toggled), Editing::MidiEditErase)); + + + /* Midi sound notes */ + midi_sound_notes.add (*(manage (new Image (::get_icon("midi_sound_notes"))))); + midi_sound_notes.set_relief(Gtk::RELIEF_NONE); + ARDOUR_UI::instance()->tooltips().set_tip (midi_sound_notes, _("Sound Notes")); + midi_sound_notes.unset_flags (CAN_FOCUS); + + /* Panic */ + + HBox* panic_box = manage (new HBox); + midi_panic_button.set_name("MidiPanicButton"); + midi_panic_button.signal_pressed().connect ( + mem_fun(this, &Editor::midi_panic_button_pressed)); + panic_box->pack_start (midi_sound_notes , true, true); + panic_box->pack_start (midi_panic_button, true, true); + + /* 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(&midi_toolbar_hbox), + &midi_tools_tearoff->tearoff_window())); + midi_tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&midi_toolbar_hbox), + &midi_tools_tearoff->tearoff_window(), 0)); + midi_tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&midi_toolbar_hbox), + &midi_tools_tearoff->tearoff_window())); + midi_tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&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_toolbar_hbox.pack_start(*panic_box, false, true, 4); + + 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& paths, const RefPtr& context, @@ -2529,7 +3385,7 @@ Editor::convert_drop_to_paths (vector& paths, vector 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. */ @@ -2539,12 +3395,19 @@ Editor::convert_drop_to_paths (vector& paths, } /* Parse the "uri-list" format that Nautilus provides, - where each pathname is delimited by \r\n + where each pathname is delimited by \r\n. + + THERE MAY BE NO NULL TERMINATING CHAR!!! */ - - const char* p = data.get_text().c_str(); + + ustring txt = data.get_text(); + const char* p; const char* q; + p = (const char *) malloc (txt.length() + 1); + txt.copy ((char *) p, txt.length(), 0); + ((char*)p)[txt.length()] = '\0'; + while (p) { if (*p != '#') @@ -2553,8 +3416,9 @@ Editor::convert_drop_to_paths (vector& paths, p++; q = p; - while (*q && (*q != '\n') && (*q != '\r')) + while (*q && (*q != '\n') && (*q != '\r')) { q++; + } if (q > p) { @@ -2573,16 +3437,42 @@ Editor::convert_drop_to_paths (vector& paths, p++; } + free ((void*)p); + if (uris.empty()) { return -1; } } for (vector::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)); } } @@ -2609,9 +3499,9 @@ Editor::map_transport_state () /* UNDO/REDO */ -Editor::State::State () +Editor::State::State (PublicEditor const * e) { - selection = new Selection; + selection = new Selection (e); } Editor::State::~State () @@ -2622,7 +3512,7 @@ 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(this)), &Editor::restore_state), state); @@ -2643,7 +3533,7 @@ Editor::restore_state (State *state) *selection = *state->selection; time_selection_changed (); - region_selection_changed (); + region_selection_changed (); /* XXX other selection change handlers? */ } @@ -2714,50 +3604,73 @@ Editor::history_changed () } void -Editor::duplicate_dialog (bool dup_region) +Editor::duplicate_dialog (bool with_dialog) { - if (selection->regions.empty() && (selection->time.length() == 0)) { - return; - } - - 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); + float times = 1.0f; - 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. - */ + if (mouse_mode == MouseRange) { + if (selection->time.length() == 0) { + return; + } + } - win.get_vbox()->pack_start (spinner); - spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT)); + RegionSelection rs; + get_regions_for_action (rs); + + if (mouse_mode != MouseRange) { - label.show (); - spinner.show (); + if (rs.empty()) { + return; + } + } - win.add_button (Stock::OK, RESPONSE_ACCEPT); - win.add_button (Stock::CANCEL, RESPONSE_CANCEL); + if (with_dialog) { - win.set_position (WIN_POS_MOUSE); + ArdourDialog win ("Duplication Dialog"); + Label label (_("Number of Duplications:")); + Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0); + SpinButton spinner (adjustment, 0.0, 1); + HBox hbox; + + win.get_vbox()->set_spacing (12); + win.get_vbox()->pack_start (hbox); + hbox.set_border_width (6); + hbox.pack_start (label, PACK_EXPAND_PADDING, 12); + + /* dialogs have ::add_action_widget() but that puts the spinner in the wrong + place, visually. so do this by hand. + */ + + hbox.pack_start (spinner, PACK_EXPAND_PADDING, 12); + spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT)); + spinner.grab_focus(); - spinner.grab_focus (); + hbox.show (); + label.show (); + spinner.show (); + + win.add_button (Stock::CANCEL, RESPONSE_CANCEL); + win.add_button (_("Duplicate"), RESPONSE_ACCEPT); + win.set_default_response (RESPONSE_ACCEPT); + + win.set_position (WIN_POS_MOUSE); + + spinner.grab_focus (); + + switch (win.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; + } + + times = adjustment.get_value(); + } - switch (win.run ()) { - case RESPONSE_ACCEPT: - break; - default: - return; - } - - float times = adjustment.get_value(); - - if (!selection->regions.empty()) { - duplicate_some_regions (selection->regions, times); - } else { + if (mouse_mode == MouseRange) { duplicate_selection (times); + } else { + duplicate_some_regions (rs, times); } } @@ -2776,15 +3689,35 @@ Editor::hide_verbose_canvas_cursor () verbose_cursor_visible = false; } +double +Editor::clamp_verbose_cursor_x (double x) +{ + if (x < 0) { + x = 0; + } else { + x = min (canvas_width - 200.0, x); + } + return x; +} + +double +Editor::clamp_verbose_cursor_y (double y) +{ + if (y < canvas_timebars_vsize) { + y = canvas_timebars_vsize; + } else { + y = min (canvas_height - 50, y); + } + return y; +} + void Editor::set_verbose_canvas_cursor (const string & txt, double x, double y) { - /* XXX get origin of canvas relative to root window, - add x and y and check compared to gdk_screen_{width,height} - */ verbose_canvas_cursor->property_text() = txt.c_str(); - verbose_canvas_cursor->property_x() = x; - verbose_canvas_cursor->property_y() = y; + /* don't get too close to the edge */ + verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (x); + verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (y); } void @@ -2793,6 +3726,32 @@ Editor::set_verbose_canvas_cursor_text (const string & txt) 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: + if (Profile->get_sae()) { + Config->set_edit_mode (Lock); + } else { + Config->set_edit_mode (Splice); + } + break; + case Splice: + Config->set_edit_mode (Lock); + break; + case Lock: + Config->set_edit_mode (Slide); + break; + } +} + void Editor::edit_mode_selection_done () { @@ -2807,6 +3766,8 @@ Editor::edit_mode_selection_done () mode = Splice; } else if (choice == _("Slide Edit")) { mode = Slide; + } else if (choice == _("Lock Edit")) { + mode = Lock; } Config->set_edit_mode (mode); @@ -2816,7 +3777,7 @@ void 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; @@ -2834,8 +3795,6 @@ Editor::snap_type_selection_done () 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")) { @@ -2856,8 +3815,6 @@ Editor::snap_type_selection_done () snaptype = SnapToSeconds; } else if (choice == _("Minutes")) { snaptype = SnapToMinutes; - } else if (choice == _("None")) { - snaptype = SnapToFrame; } RefPtr ract = snap_type_action (snaptype); @@ -2872,7 +3829,9 @@ Editor::snap_mode_selection_done () 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; @@ -2885,6 +3844,47 @@ Editor::snap_mode_selection_done () } } +void +Editor::cycle_edit_point (bool with_marker) +{ + 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; + } +} + +void +Editor::edit_point_selection_done () +{ + string choice = edit_point_selector.get_active_text(); + EditPoint ep = EditAtSelectedMarker; + + if (choice == _("Marker")) { + set_edit_point_preference (EditAtSelectedMarker); + } else if (choice == _("Playhead")) { + set_edit_point_preference (EditAtPlayhead); + } else { + set_edit_point_preference (EditAtMouse); + } + + RefPtr ract = edit_point_action (ep); + + if (ract) { + ract->set_active (true); + } +} + void Editor::zoom_focus_selection_done () { @@ -2901,6 +3901,12 @@ Editor::zoom_focus_selection_done () focus_type = ZoomFocusPlayhead; } else if (choice == _("Edit")) { focus_type = ZoomFocusEdit; + } else if (choice == _("Active Mark")) { + focus_type = ZoomFocusEdit; + } else if (choice == _("Active Mark")) { + focus_type = ZoomFocusEdit; + } else { + focus_type = ZoomFocusMouse; } RefPtr ract = zoom_focus_action (focus_type); @@ -2947,7 +3953,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group) v->push_back (*i); } - } else if (track != 0 && group == 0 || (track != 0 && group != 0 && !group->is_active())) { + } else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) { /* just the view for this track */ @@ -3008,12 +4014,23 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) static int32_t done; XMLNode* geometry; - if ((geometry = find_named_node (*node, "geometry")) == 0) { - width = default_width; - height = default_height; - } else { - width = atoi(geometry->property("x_size")->value()); - height = atoi(geometry->property("y_size")->value()); + width = default_width; + height = default_height; + + if ((geometry = find_named_node (*node, "geometry")) != 0) { + + if ((prop = geometry->property ("x_size")) == 0) { + prop = geometry->property ("x-size"); + } + if (prop) { + width = atoi (prop->value()); + } + if ((prop = geometry->property ("y_size")) == 0) { + prop = geometry->property ("y-size"); + } + if (prop) { + height = atoi (prop->value()); + } } if (which == static_cast (&edit_pane)) { @@ -3022,14 +4039,14 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) return; } - if (!geometry || (prop = geometry->property ("edit_pane_pos")) == 0) { + if (!geometry || (prop = geometry->property ("edit-pane-pos")) == 0) { /* initial allocation is 90% to canvas, 10% to notebook */ pos = (int) floor (alloc.get_width() * 0.90f); snprintf (buf, sizeof(buf), "%d", pos); } else { pos = atoi (prop->value()); } - + if ((done = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) { edit_pane.set_position (pos); pre_maximal_pane_position = pos; @@ -3061,6 +4078,8 @@ Editor::set_show_measures (bool yn) hide_measures (); if ((_show_measures = yn) == true) { + if (tempo_lines) + tempo_lines->show(); draw_measures (); } instant_save (); @@ -3137,10 +4156,10 @@ Editor::playlist_selector () const return *_playlist_selector; } -nframes_t -Editor::get_nudge_distance (nframes_t pos, nframes_t& next) +nframes64_t +Editor::get_nudge_distance (nframes64_t pos, nframes64_t& next) { - nframes_t ret; + nframes64_t ret; ret = nudge_clock.current_duration (pos); next = ret + 1; /* XXXX fix me */ @@ -3152,7 +4171,9 @@ void Editor::end_location_changed (Location* location) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location)); - reset_scrolling_region (); + //reset_scrolling_region (); + nframes64_t session_span = location->start() + (nframes64_t) floorf (current_page_frames() * 0.10f); + horizontal_adjustment.set_upper (session_span / frames_per_unit); } int @@ -3192,7 +4213,7 @@ Editor::playlist_deletion_dialog (boost::shared_ptr pl) } bool -Editor::audio_region_selection_covers (nframes_t where) +Editor::audio_region_selection_covers (nframes64_t where) { for (RegionSelection::iterator a = selection->regions.begin(); a != selection->regions.end(); ++a) { if ((*a)->region()->covers (where)) { @@ -3211,6 +4232,15 @@ Editor::prepare_for_cleanup () selection->clear_regions (); selection->clear_playlists (); + + no_region_list_redisplay = true; +} + +void +Editor::finish_cleanup () +{ + no_region_list_redisplay = false; + redisplay_regions (); } Location* @@ -3371,16 +4401,21 @@ Editor::redisplay_snapshots () return; } - vector* states; + vector 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 state_file_names(get_file_names_no_extension(state_file_paths)); snapshot_display_model->clear (); - for (vector::iterator i = states->begin(); i != states->end(); ++i) { - string statename = *(*i); + for (vector::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 @@ -3397,8 +4432,6 @@ Editor::redisplay_snapshots () row[snapshot_display_columns.visible_name] = display_name; row[snapshot_display_columns.real_name] = statename; } - - delete states; } void @@ -3411,8 +4444,6 @@ Editor::session_state_saved (string snap_name) void Editor::maximise_editing_space () { - initial_ruler_update_required = true; - mouse_mode_tearoff->set_visible (false); tools_tearoff->set_visible (false); @@ -3423,8 +4454,8 @@ Editor::maximise_editing_space () post_maximal_pane_position = edit_pane.get_width(); } - fullscreen(); + if(post_maximal_editor_width) { edit_pane.set_position (post_maximal_pane_position - abs(post_maximal_editor_width - pre_maximal_editor_width)); @@ -3436,9 +4467,8 @@ Editor::maximise_editing_space () void Editor::restore_editing_space () { - initial_ruler_update_required = true; - // user changed width of pane during fullscreen + if(post_maximal_pane_position != edit_pane.get_position()) { post_maximal_pane_position = edit_pane.get_position(); } @@ -3449,46 +4479,67 @@ Editor::restore_editing_space () tools_tearoff->set_visible (true); post_maximal_editor_width = this->get_width(); - - edit_pane.set_position ( - pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width) - ); + edit_pane.set_position (pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width)); } +/** + * 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_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist)); + vector > playlists; + session->get_playlists(playlists); + mapover_tracks ( bind(mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), 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_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist)); + vector > playlists; + session->get_playlists(playlists); + mapover_tracks ( bind(mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), 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_tracks (mem_fun (*this, &Editor::mapped_clear_playlist)); + vector > playlists; + session->get_playlists(playlists); + mapover_tracks ( mem_fun (*this, &Editor::mapped_clear_playlist), v ); commit_reversible_command (); } void -Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz) +Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz, vector > const & playlists) { - atv.use_new_playlist (sz > 1 ? false : true); + atv.use_new_playlist (sz > 1 ? false : true, playlists); } void -Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz) +Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz, vector > const & playlists) { - atv.use_copy_playlist (sz > 1 ? false : true); + atv.use_copy_playlist (sz > 1 ? false : true, playlists); } void @@ -3503,9 +4554,17 @@ Editor::on_key_press_event (GdkEventKey* ev) 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) +Editor::reset_x_origin (nframes64_t frame) { + //cerr << "resetting x origin" << endl; queue_visual_change (frame); } @@ -3516,17 +4575,108 @@ Editor::reset_zoom (double fpu) } void -Editor::reposition_and_zoom (nframes_t frame, double fpu) +Editor::reposition_and_zoom (nframes64_t frame, double fpu) { + //cerr << "Editor::reposition_and_zoom () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG reset_x_origin (frame); reset_zoom (fpu); + + if (!no_save_visual) { + undo_visual_stack.push_back (current_visual_state(false)); + } +} + +Editor::VisualState* +Editor::current_visual_state (bool with_tracks) +{ + VisualState* vs = new VisualState; + vs->y_position = vertical_adjustment.get_value(); + vs->frames_per_unit = frames_per_unit; + vs->leftmost_frame = leftmost_frame; + vs->zoom_focus = zoom_focus; + vs->zoomed_to_region = zoomed_to_region; + + if (with_tracks) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + vs->track_states.push_back (TAVState ((*i), &(*i)->get_state())); + } + } + + return vs; } void -Editor::set_frames_per_unit (double fpu) +Editor::undo_visual_state () { - nframes_t frames; + if (undo_visual_stack.empty()) { + return; + } + + VisualState* vs = undo_visual_stack.back(); + undo_visual_stack.pop_back(); + use_visual_state (*vs); + redo_visual_stack.push_back (vs); +} + +void +Editor::redo_visual_state () +{ + if (redo_visual_stack.empty()) { + return; + } + + VisualState* vs = redo_visual_stack.back(); + redo_visual_stack.pop_back(); + use_visual_state (*vs); + undo_visual_stack.push_back (vs); +} + +void +Editor::swap_visual_state () +{ + if (undo_visual_stack.empty()) { + redo_visual_state (); + } else { + undo_visual_state (); + } +} + +void +Editor::use_visual_state (VisualState& vs) +{ + no_save_visual = true; + no_route_list_redisplay = true; + + vertical_adjustment.set_value (vs.y_position); + + set_zoom_focus (vs.zoom_focus); + reposition_and_zoom (vs.leftmost_frame, vs.frames_per_unit); + zoomed_to_region = vs.zoomed_to_region; + + for (list::iterator i = vs.track_states.begin(); i != vs.track_states.end(); ++i) { + TrackViewList::iterator t; + + /* check if the track still exists - it could have been deleted */ + + if ((t = find (track_views.begin(), track_views.end(), i->first)) != track_views.end()) { + (*t)->set_state (*(i->second)); + } + } + + if (!vs.track_states.empty()) { + update_route_visibility (); + } + + no_route_list_redisplay = false; + redisplay_route_list (); + + no_save_visual = 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. */ @@ -3539,9 +4689,6 @@ Editor::set_frames_per_unit (double fpu) 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. @@ -3550,14 +4697,24 @@ Editor::set_frames_per_unit (double fpu) if (max_frames / fpu < 800.0) { return; } - - if (fpu == frames_per_unit) { - return; - } + + if (tempo_lines) + tempo_lines->tempo_map_changed(); frames_per_unit = fpu; + post_zoom (); +} + +void +Editor::post_zoom () +{ + nframes64_t cef = 0; - if (frames != zoom_range_clock.current_duration()) { + // convert fpu to frame count + + nframes64_t frames = (nframes64_t) floor (frames_per_unit * canvas_width); + + if (frames_per_unit != zoom_range_clock.current_duration()) { zoom_range_clock.set (frames); } @@ -3573,24 +4730,34 @@ Editor::set_frames_per_unit (double fpu) } } + 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) { + cef = session->current_end_frame() + (current_page_frames() / 10);// Add a little extra so we can see the end marker + } + horizontal_adjustment.set_upper (cef / frames_per_unit); + + //reset_scrolling_region (); + + if (playhead_cursor) { + playhead_cursor->set_position (playhead_cursor->current_frame); + } instant_save (); } void -Editor::queue_visual_change (nframes_t where) +Editor::queue_visual_change (nframes64_t where) { - pending_visual_change.pending = VisualChange::Type (pending_visual_change.pending | VisualChange::TimeOrigin); - pending_visual_change.time_origin = 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.pending = VisualChange::Type (pending_visual_change.pending | VisualChange::TimeOrigin); + pending_visual_change.time_origin = where; pending_visual_change.idle_handler_id = g_idle_add (_idle_visual_changer, this); } } @@ -3602,8 +4769,9 @@ Editor::queue_visual_change (double fpu) 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 @@ -3616,47 +4784,569 @@ int Editor::idle_visual_changer () { VisualChange::Type p = pending_visual_change.pending; - pending_visual_change.pending = (VisualChange::Type) 0; - pending_visual_change.idle_handler_id = -1; - + +#ifdef FIX_THIS_FOR_V3 + double last_time_origin = horizontal_adjustment.get_value(); +#endif + 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 + current_page_frames()); + compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + current_page_frames()); + update_tempo_based_rulers (); + } if (p & VisualChange::TimeOrigin) { - if (pending_visual_change.time_origin != leftmost_frame) { - horizontal_adjustment.set_value (pending_visual_change.time_origin/frames_per_unit); - /* the signal handler will do the rest */ - } else { - update_fixed_rulers(); - redisplay_tempo (true); - } + horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit); } + nframes64_t csf=0, cef=0; + nframes64_t current_time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); + + if (session) { + csf = session->current_start_frame(); + cef = session->current_end_frame(); + } + + /* if we seek beyond the current end of the canvas, move the end */ + +#ifdef FIX_THIS_FOR_V3 + if (last_time_origin == horizontal_adjustment.get_value() ) { + /* changed signal not emitted */ + update_fixed_rulers (); + redisplay_tempo (true); + } +#endif + + if (current_time_origin != pending_visual_change.time_origin) { + cef += current_page_frames() / 10; // Add a little extra so we can see the end marker + horizontal_adjustment.set_upper (cef / frames_per_unit); + horizontal_adjustment.set_value (pending_visual_change.time_origin / frames_per_unit); + } else { + update_fixed_rulers(); + redisplay_tempo (true); + } + //cerr << "Editor::idle_visual_changer () called ha v:l:u:ps:fpu = " << horizontal_adjustment.get_value() << ":" << horizontal_adjustment.get_lower() << ":" << horizontal_adjustment.get_upper() << ":" << horizontal_adjustment.get_page_size() << ":" << frames_per_unit << endl;//DEBUG + pending_visual_change.idle_handler_id = -1; return 0; /* this is always a one-shot call */ } struct EditorOrderTimeAxisSorter { bool operator() (const TimeAxisView* a, const TimeAxisView* b) const { - return a->order < b->order; + return a->order () < b->order (); } }; 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); + } } -nframes_t -Editor::edit_cursor_position(bool sync) +nframes64_t +Editor::get_preferred_edit_position (bool ignore_playhead) { - if (sync && edit_cursor->current_frame != edit_cursor_clock.current_time()) { - edit_cursor_clock.set(edit_cursor->current_frame, true); + 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 edit_cursor->current_frame; + return where; } +void +Editor::set_loop_range (nframes64_t start, nframes64_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(*(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(*tll, &before, &after)); + } + + commit_reversible_command (); +} + +void +Editor::set_punch_range (nframes64_t start, nframes64_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(*(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(*tpl, &before, &after)); + } + + commit_reversible_command (); +} + +void +Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackSelection& ts) const +{ + 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(*t); + + if (atv) { + boost::shared_ptr ds; + boost::shared_ptr pl; + + if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) { + + Playlist::RegionList* regions = pl->regions_at ((nframes64_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.add (rv); + } + } + + delete regions; + } + } + } +} + +void +Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackSelection& ts) const +{ + 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(*t); + + if (atv) { + boost::shared_ptr ds; + boost::shared_ptr pl; + + if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) { + + Playlist::RegionList* regions = pl->regions_touched ((nframes64_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; + } + } + } +} + +void +Editor::get_regions_for_action (RegionSelection& rs, bool allow_entered) +{ + if (selection->regions.empty()) { + + if (selection->tracks.empty()) { + + /* no regions or tracks selected + */ + + if (entered_regionview && mouse_mode == Editing::MouseObject) { + + /* entered regionview is valid and we're in object mode - + just use entered regionview + */ + + rs.add (entered_regionview); + } + + return; + + } else { + + /* no regions selected, so get all regions at the edit point across + all selected tracks. + */ + + nframes64_t where = get_preferred_edit_position(); + get_regions_at (rs, where, selection->tracks); + + /* if the entered regionview wasn't selected and neither was its track + then add it. + */ + + if (entered_regionview != 0 && + !selection->selected (entered_regionview) && + !selection->selected (&entered_regionview->get_time_axis_view())) { + rs.add (entered_regionview); + } + } + + } else { + + /* just use the selected regions */ + + rs = selection->regions; + + /* if the entered regionview wasn't selected and we allow this sort of thing, + then add it. + */ + + if (allow_entered && entered_regionview && !selection->selected (entered_regionview)) { + rs.add (entered_regionview); + } + + } +} + +void +Editor::get_regions_corresponding_to (boost::shared_ptr region, vector& regions) +{ + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + + RouteTimeAxisView* tatv; + + if ((tatv = dynamic_cast (*i)) != 0) { + + boost::shared_ptr pl; + vector > results; + RegionView* marv; + boost::shared_ptr ds; + + if ((ds = tatv->get_diskstream()) == 0) { + /* bus */ + continue; + } + + if ((pl = (ds->playlist())) != 0) { + pl->get_region_list_equivalent_regions (region, results); + } + + for (vector >::iterator ir = results.begin(); ir != results.end(); ++ir) { + if ((marv = tatv->view()->find_view (*ir)) != 0) { + regions.push_back (marv); + } + } + + } + } +} + +void +Editor::show_rhythm_ferret () +{ + if (rhythm_ferret == 0) { + rhythm_ferret = new RhythmFerret(*this); + } + + rhythm_ferret->set_session (session); + rhythm_ferret->show (); + rhythm_ferret->present (); +} + +void +Editor::show_bundle_manager () +{ + if (_bundle_manager == 0) { + _bundle_manager = new BundleManager (*session); + } + + _bundle_manager->show (); +} + +void +Editor::show_global_port_matrix (ARDOUR::DataType t) +{ + if (_global_port_matrix[t] == 0) { + _global_port_matrix[t] = new GlobalPortMatrixWindow (*session, t); + } + + _global_port_matrix[t]->show (); +} + +void +Editor::first_idle () +{ + MessageDialog* dialog = 0; + + if (track_views.size() > 1) { + dialog = new MessageDialog (*this, + _("Please wait while Ardour loads visual data"), + true, + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_NONE); + dialog->present (); + ARDOUR_UI::instance()->flush_pending (); + } + + for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { + (*t)->first_idle(); + } + + // first idle adds route children (automation tracks), so we need to redisplay here + redisplay_route_list(); + + delete dialog; + + _have_idled = true; +} + +void +Editor::start_resize_line_ops () +{ +#if 0 + old_resize_line_y = -1; + resize_line_y = -1; + need_resize_line = true; +#endif +} + +void +Editor::end_resize_line_ops () +{ +#if 0 + need_resize_line = false; + + if (old_resize_line_y >= 0) { + Gdk::Rectangle r (0, old_resize_line_y, (int) canvas_width, 3); + Glib::RefPtr win = get_window(); + cerr << "Final invalidation at " << old_resize_line_y << endl; + win->invalidate_rect (r, false); + } +#endif +} + +void +Editor::queue_draw_resize_line (int at) +{ +#if 0 + Glib::RefPtr win = get_window(); + + resize_line_y = at; + + if (win && canvas_width) { + + int controls_width = controls_layout.get_width(); + int xroot, discard; + + controls_layout.get_window()->get_origin (xroot, discard); + + if (old_resize_line_y >= 0) { + + /* redraw where it used to be */ + + + Gdk::Rectangle r (0, old_resize_line_y - 1, controls_width + (int) canvas_width, 3); + win->invalidate_rect (r, true); + cerr << "invalidate " << xroot << "," << old_resize_line_y - 1 << ' ' + << controls_width + canvas_width << " x 3\n"; + } + + /* draw where it is */ + + Gdk::Rectangle r (0, at - 1, controls_width + (int) canvas_width, 3); + win->invalidate_rect (r, true); + } +#endif +} + +bool +Editor::on_expose_event (GdkEventExpose* ev) +{ + /* cerr << "+++ editor expose " + << ev->area.x << ',' << ev->area.y + << ' ' + << ev->area.width << " x " << ev->area.height + << " need reize ? " << need_resize_line + << endl; + */ + bool ret = Window::on_expose_event (ev); + +#if 0 + if (need_resize_line) { + + int xroot, yroot, discard; + int controls_width; + + /* Our root coordinates for drawing the line will be the left edge + of the track controls, and the upper left edge of our own window. + */ + + get_window()->get_origin (discard, yroot); + controls_layout.get_window()->get_origin (xroot, discard); + controls_width = controls_layout.get_width(); + + GdkRectangle lr; + GdkRectangle intersection; + + lr.x = 0; + lr.y = resize_line_y; + lr.width = controls_width + (int) canvas_width; + lr.height = 3; + + if (gdk_rectangle_intersect (&lr, &ev->area, &intersection)) { + + Glib::RefPtr style (get_style()); + Glib::RefPtr black_gc (style->get_black_gc ()); + Glib::RefPtr gc = wrap (black_gc->gobj_copy(), false); + + /* draw on root window */ + + GdkWindow* win = gdk_get_default_root_window(); + + gc->set_subwindow (Gdk::INCLUDE_INFERIORS); + gc->set_line_attributes (3, Gdk::LINE_SOLID, + Gdk::CAP_NOT_LAST, + Gdk::JOIN_MITER); + + gdk_draw_line (win, gc->gobj(), + 0, + resize_line_y, + (int) canvas_width + controls_width, + resize_line_y); +#if 0 + cerr << "drew line @ " << xroot << ", " << yroot + resize_line_y + << " to " << xroot + (int) canvas_width + controls_width + << ", " << yroot + resize_line_y + << endl; +#endif + old_resize_line_y = resize_line_y; + cerr << "NEXT EXPOSE SHOULD BE AT " << old_resize_line_y << endl; + } else { + cerr << "no intersect with " + << lr.x << ',' << lr.y + << ' ' + << lr.width << " x " << lr.height + << endl; + } + } + + //cerr << "--- editor expose\n"; +#endif + + return ret; +} + +static gboolean +_idle_resizer (gpointer arg) +{ + return ((Editor*)arg)->idle_resize (); +} + +void +Editor::add_to_idle_resize (TimeAxisView* view, uint32_t h) +{ + if (resize_idle_id < 0) { + resize_idle_id = g_idle_add (_idle_resizer, this); + } + + resize_idle_target = h; + + pending_resizes.push_back (view); + + if (selection->selected (view) && !selection->tracks.empty()) { + pending_resizes.insert (pending_resizes.end(), selection->tracks.begin(), selection->tracks.end()); + } +} + +bool +Editor::idle_resize () +{ + for (vector::iterator i = pending_resizes.begin(); i != pending_resizes.end(); ++i) { + (*i)->idle_resize (resize_idle_target); + } + pending_resizes.clear(); + flush_canvas (); + resize_idle_id = -1; + return false; +}