X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=3f2a278f0983013eba0ef973bb5abcaa26c1bcc8;hb=d752986314eb37151983393c1d62efefe503e47c;hp=ecf9da747d14fb4b64f53cc30d98c2ce24574f79;hpb=1dee60510a3e7e1db3e9339ca4e5b6f0798b50d7;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ecf9da747d..3f2a278f09 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -40,12 +40,11 @@ #include #include -#include +#include #include #include #include #include -#include #include "audio_clock.h" #include "gtk-custom-ruler.h" @@ -53,6 +52,7 @@ #include "public_editor.h" #include "editing.h" #include "enums.h" +#include "editor_items.h" #include "region_selection.h" #include "canvas.h" #include "draginfo.h" @@ -66,10 +66,10 @@ namespace LinuxAudioSystems { } namespace ARDOUR { - class DiskStream; + class AudioDiskstream; class RouteGroup; - class Source; class Playlist; + class AudioPlaylist; class Region; class Location; class TempoSection; @@ -77,6 +77,7 @@ namespace ARDOUR { class Session; class AudioFilter; class Crossfade; + class ChanCount; } namespace LADSPA { @@ -101,6 +102,7 @@ class TrackSelection; class AutomationSelection; class MixerStrip; class StreamView; +class AudioStreamView; class ControlPoint; #ifdef FFT_ANALYSIS class AnalysisWindow; @@ -141,6 +143,8 @@ class Editor : public PublicEditor XMLNode& get_state (); int set_state (const XMLNode& ); + PBD::ID id() { return _id; } + void set_mouse_mode (Editing::MouseMode, bool force=true); void step_mouse_mode (bool next); Editing::MouseMode current_mouse_mode () { return mouse_mode; } @@ -150,7 +154,6 @@ class Editor : public PublicEditor void connect_to_image_compositor() ; void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ; TimeAxisView* get_named_time_axis(const string & name) ; - /* */ void consider_auditioning (ARDOUR::Region&); void hide_a_region (ARDOUR::Region&); @@ -168,6 +171,7 @@ class Editor : public PublicEditor void new_region_from_selection (); void separate_region_from_selection (); + void separate_regions_using_location (ARDOUR::Location&); void toggle_playback (bool with_abort); /* undo related */ @@ -295,15 +299,22 @@ class Editor : public PublicEditor void toggle_waveforms_while_recording (); void toggle_measure_visibility (); - void set_meter_falloff (float); + void set_meter_falloff (int); void set_meter_hold (int32_t); /* xfades */ - void toggle_xfades_active(); + void toggle_auto_xfade (); + void toggle_xfades_active (); void toggle_xfade_visibility (); - void set_xfade_visibility (bool yn); bool xfade_visibility() const { return _xfade_visibility; } + void update_crossfade_model (); + void set_crossfade_model (ARDOUR::CrossfadeModel); + + /* layers */ + + void set_layer_model (ARDOUR::Session::LayerModel); + void update_layering_model (); /* redirect shared ops menu. caller must free returned menu */ @@ -314,7 +325,7 @@ class Editor : public PublicEditor void ensure_float (Gtk::Window&); void show_window (); - + void scroll_tracks_down_line (); void scroll_tracks_up_line (); @@ -338,57 +349,9 @@ class Editor : public PublicEditor ARDOUR::AudioEngine& engine; bool constructed; - PlaylistSelector* _playlist_selector; + PBD::ID _id; - enum ItemType { - RegionItem, - StreamItem, - PlayheadCursorItem, - EditCursorItem, - MarkerItem, - MarkerBarItem, - RangeMarkerBarItem, - TransportMarkerBarItem, - SelectionItem, - GainControlPointItem, - GainLineItem, - GainAutomationControlPointItem, - GainAutomationLineItem, - PanAutomationControlPointItem, - PanAutomationLineItem, - RedirectAutomationControlPointItem, - RedirectAutomationLineItem, - MeterMarkerItem, - TempoMarkerItem, - MeterBarItem, - TempoBarItem, - AudioRegionViewNameHighlight, - AudioRegionViewName, - StartSelectionTrimItem, - EndSelectionTrimItem, - AutomationTrackItem, - FadeInItem, - FadeInHandleItem, - FadeOutItem, - FadeOutHandleItem, - - /* */ - MarkerViewItem, - MarkerTimeAxisItem, - MarkerViewHandleStartItem, - MarkerViewHandleEndItem, - ImageFrameItem, - ImageFrameTimeAxisItem, - ImageFrameHandleStartItem, - ImageFrameHandleEndItem, - /* */ - - CrossfadeViewItem, - - /* don't remove this */ - - NoItem - }; + PlaylistSelector* _playlist_selector; void set_frames_per_unit (double); void frames_per_unit_modified (); @@ -449,30 +412,36 @@ class Editor : public PublicEditor TimeAxisView* clicked_trackview; AudioTimeAxisView* clicked_audio_trackview; - AudioRegionView* clicked_regionview; - AudioRegionView* latest_regionview; + RegionView* clicked_regionview; + RegionView* latest_regionview; uint32_t clicked_selection; CrossfadeView* clicked_crossfadeview; ControlPoint* clicked_control_point; + void get_relevant_audio_tracks (AudioTimeAxisView& base, std::set& relevant_tracks); void mapover_audio_tracks (sigc::slot sl); /* functions to be passed to mapover_audio_tracks(), possibly with sigc::bind()-supplied arguments */ - void mapped_set_selected_regionview_from_click (AudioTimeAxisView&, uint32_t, AudioRegionView*, vector*); + void mapped_set_selected_regionview_from_click (RouteTimeAxisView&, uint32_t, RegionView*, vector*); void mapped_use_new_playlist (AudioTimeAxisView&, uint32_t); void mapped_use_copy_playlist (AudioTimeAxisView&, uint32_t); void mapped_clear_playlist (AudioTimeAxisView&, uint32_t); /* end */ - void catch_vanishing_audio_regionview (AudioRegionView *); - void set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false); - void set_selected_track_from_click (Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false); - void set_selected_regionview_from_click (Selection::Operation op = Selection::Set, bool no_track_remove=false); + void button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type); + bool button_release_can_deselect; + + void catch_vanishing_regionview (RegionView *); + + bool set_selected_control_point_from_click (bool press, Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false); + bool set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool with_undo = true, bool no_remove=false); + bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set, bool no_track_remove=false); + void set_selected_regionview_from_region_list (ARDOUR::Region& region, Selection::Operation op = Selection::Set); bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, ARDOUR::Region*); - void collect_new_region_view (AudioRegionView *); + void collect_new_region_view (RegionView *); Gtk::Menu track_context_menu; Gtk::Menu track_region_context_menu; @@ -493,12 +462,11 @@ class Editor : public PublicEditor Gtk::Menu* build_track_selection_context_menu (jack_nframes_t); void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&); void add_bus_context_items (Gtk::Menu_Helpers::MenuList&); - void add_region_context_items (StreamView*, ARDOUR::Region*, Gtk::Menu_Helpers::MenuList&); - void add_crossfade_context_items (StreamView*, ARDOUR::Crossfade*, Gtk::Menu_Helpers::MenuList&, bool many); + void add_region_context_items (AudioStreamView*, ARDOUR::Region*, Gtk::Menu_Helpers::MenuList&); + void add_crossfade_context_items (AudioStreamView*, ARDOUR::Crossfade*, Gtk::Menu_Helpers::MenuList&, bool many); void add_selection_context_items (Gtk::Menu_Helpers::MenuList&); - void handle_new_route (ARDOUR::Route&); - void handle_new_route_p (ARDOUR::Route*); + void handle_new_route (boost::shared_ptr); void remove_route (TimeAxisView *); bool route_removal; @@ -660,6 +628,7 @@ class Editor : public PublicEditor void cursor_to_selection_start (Cursor *); void cursor_to_selection_end (Cursor *); void select_all_selectables_using_cursor (Cursor *, bool); + void select_all_selectables_between_cursors (Cursor *, Cursor *); ARDOUR::Region* find_next_region (jack_nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0); @@ -672,7 +641,6 @@ class Editor : public PublicEditor Gtk::HBox bottom_hbox; Gtk::Table edit_packer; - Gtk::Frame edit_frame; Gtk::VScrollbar edit_vscrollbar; Gtk::Adjustment vertical_adjustment; @@ -684,6 +652,8 @@ class Editor : public PublicEditor Gtk::HScrollbar edit_hscrollbar; bool edit_hscroll_dragging; + + void reset_hscrollbar_stepping (); bool hscrollbar_button_press (GdkEventButton*); bool hscrollbar_button_release (GdkEventButton*); @@ -691,6 +661,7 @@ class Editor : public PublicEditor double canvas_width; double canvas_height; + jack_nframes_t last_canvas_frame; bool track_canvas_map_handler (GdkEventAny*); bool time_canvas_map_handler (GdkEventAny*); @@ -707,6 +678,10 @@ class Editor : public PublicEditor Gtk::VBox edit_controls_vbox; Gtk::HBox edit_controls_hbox; + void control_scroll (float); + bool deferred_control_scroll (jack_nframes_t); + sigc::connection control_scroll_connection; + void tie_vertical_scrolling (); void canvas_horizontally_scrolled (); void reposition_and_zoom (jack_nframes_t sample, double fpu); @@ -847,7 +822,7 @@ class Editor : public PublicEditor bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType); bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); bool button_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); - bool motion_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); + bool motion_handler (ArdourCanvas::Item*, GdkEvent*, ItemType, bool from_autoscroll = false); bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); bool leave_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); @@ -857,16 +832,14 @@ class Editor : public PublicEditor int ensure_cursor (jack_nframes_t* pos); - void fake_handle_new_audio_region (ARDOUR::AudioRegion *); - void handle_new_audio_region (ARDOUR::AudioRegion *); - void fake_handle_audio_region_removed (ARDOUR::AudioRegion *); - void handle_audio_region_removed (ARDOUR::AudioRegion *); - void add_audio_region_to_region_display (ARDOUR::AudioRegion *); + void handle_new_region (ARDOUR::Region *); + void handle_region_removed (ARDOUR::Region *); + void add_region_to_region_display (ARDOUR::Region *); void region_hidden (ARDOUR::Region*); void redisplay_regions (); - void insert_into_tmp_audio_regionlist(ARDOUR::AudioRegion *); + void insert_into_tmp_regionlist(ARDOUR::Region *); - list tmp_audio_region_list; + list tmp_region_list; void cut_copy (Editing::CutCopyOp); void cut_copy_points (Editing::CutCopyOp); @@ -878,6 +851,7 @@ class Editor : public PublicEditor /* EDITING OPERATIONS */ + void reset_point_selection (); void toggle_region_mute (); void toggle_region_opaque (); void raise_region (); @@ -886,7 +860,7 @@ class Editor : public PublicEditor void lower_region_to_bottom (); void split_region (); void split_region_at (jack_nframes_t); - void split_regions_at (jack_nframes_t, AudioRegionSelection&); + void split_regions_at (jack_nframes_t, RegionSelection&); void crop_region_to_selection (); void set_a_regions_sync_position (ARDOUR::Region&, jack_nframes_t); void set_region_sync_from_edit_cursor (); @@ -899,13 +873,13 @@ class Editor : public PublicEditor void remove_clicked_region (); void destroy_clicked_region (); void edit_region (); - void duplicate_some_regions (AudioRegionSelection&, float times); + void duplicate_some_regions (RegionSelection&, float times); void duplicate_selection (float times); void region_fill_selection (); void region_fill_track (); - void audition_playlist_region_standalone (ARDOUR::AudioRegion&); - void audition_playlist_region_via_route (ARDOUR::AudioRegion&, ARDOUR::Route&); + void audition_playlist_region_standalone (ARDOUR::Region&); + void audition_playlist_region_via_route (ARDOUR::Region&, ARDOUR::Route&); void split_multichannel_region(); void reverse_region (); void normalize_region (); @@ -961,18 +935,15 @@ class Editor : public PublicEditor void insert_region_list_drag (ARDOUR::AudioRegion&, int x, int y); void insert_region_list_selection (float times); - void insert_sndfile (bool as_tracks); - void embed_audio (); // inserts into region list - int reject_because_rate_differs (const string & path, ARDOUR::SoundFileInfo& finfo, const string & action, bool multiple_pending); - - void do_embed_sndfiles (vector paths, bool split); - void embed_sndfile (string path, bool split, bool multiple_files, bool& check_sr); + void add_external_audio_action (Editing::ImportMode); - void do_insert_sndfile (vector path, bool multi, jack_nframes_t frame); - void insert_paths_as_new_tracks (std::vector paths, bool multi); // inserts files as new tracks - void insert_sndfile_into (const string & path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true); - static void* _insert_sndfile_thread (void*); - void* insert_sndfile_thread (void*); + void bring_in_external_audio (Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t& pos, bool prompt); + void do_import (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t&, bool); + void do_embed (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, jack_nframes_t&, bool); + int import_sndfile (Glib::ustring path, Editing::ImportMode mode, ARDOUR::AudioTrack* track, jack_nframes_t& pos); + int embed_sndfile (Glib::ustring path, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + ARDOUR::AudioTrack* track, jack_nframes_t& pos, bool prompt); + int finish_bringing_in_audio (ARDOUR::AudioRegion& region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, jack_nframes_t& pos, Editing::ImportMode mode); /* generic interthread progress window */ @@ -997,8 +968,6 @@ class Editor : public PublicEditor gint import_progress_timeout (void *); static void *_import_thread (void *); void* import_thread (); - void catch_new_audio_region (ARDOUR::AudioRegion*); - ARDOUR::AudioRegion* last_audio_region; /* to support this ... */ @@ -1038,7 +1007,9 @@ class Editor : public PublicEditor void set_selection_from_range (ARDOUR::Location&); void set_selection_from_punch (); void set_selection_from_loop (); + void set_selection_from_audio_region (); + void add_location_from_audio_region (); void add_location_from_selection (); void set_route_loop_selection (); @@ -1055,7 +1026,7 @@ class Editor : public PublicEditor bool have_pending_keyboard_selection; jack_nframes_t pending_keyboard_selection_start; - ARDOUR::AudioRegion* select_region_for_operation (int dir, TimeAxisView **tv); + ARDOUR::Region* select_region_for_operation (int dir, TimeAxisView **tv); void extend_selection_to_end_of_region (bool next); void extend_selection_to_start_of_region (bool previous); @@ -1076,6 +1047,7 @@ class Editor : public PublicEditor void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0); bool end_grab (ArdourCanvas::Item*, GdkEvent*); + void swap_grab (ArdourCanvas::Item*, Gdk::Cursor* cursor, uint32_t time); Gtk::Menu fade_context_menu; void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType); @@ -1128,7 +1100,7 @@ class Editor : public PublicEditor void remove_gain_control_point (ArdourCanvas::Item*, GdkEvent*); void remove_control_point (ArdourCanvas::Item*, GdkEvent*); - void mouse_brush_insert_region (AudioRegionView*, jack_nframes_t pos); + void mouse_brush_insert_region (RegionView*, jack_nframes_t pos); void brush (jack_nframes_t); void show_verbose_time_cursor (jack_nframes_t frame, double offset = 0, double xpos=-1, double ypos=-1); @@ -1146,10 +1118,10 @@ class Editor : public PublicEditor bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, AudioTimeAxisView*); + bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); + bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); + bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); + bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, RouteTimeAxisView*); bool canvas_marker_event (GdkEvent* event,ArdourCanvas::Item*, Marker*); bool canvas_zoom_rect_event (GdkEvent* event,ArdourCanvas::Item*); bool canvas_tempo_marker_event (GdkEvent* event,ArdourCanvas::Item*, TempoMarker*); @@ -1205,7 +1177,6 @@ class Editor : public PublicEditor void kbd_do_brush (GdkEvent*); void kbd_do_audition (GdkEvent*); - void fake_handle_new_duration (); void handle_new_duration (); void initialize_canvas (); void reset_scrolling_region (Gtk::Allocation* alloc = 0); @@ -1253,6 +1224,7 @@ class Editor : public PublicEditor void marker_menu_hide (); void marker_menu_loop_range (); void marker_menu_select_all_selectables_using_range (); + void marker_menu_separate_regions_using_location (); void marker_menu_play_from (); void marker_menu_set_playhead (); void marker_menu_set_from_playhead (); @@ -1274,6 +1246,7 @@ class Editor : public PublicEditor Gtk::Menu* tm_marker_menu; Gtk::Menu* marker_menu; + Gtk::Menu* range_marker_menu; Gtk::Menu* transport_marker_menu; Gtk::Menu* new_transport_marker_menu; ArdourCanvas::Item* marker_menu_item; @@ -1296,12 +1269,7 @@ class Editor : public PublicEditor void editor_mixer_button_toggled (); - AudioClock selection_start_clock; - Gtk::Label selection_start_clock_label; - AudioClock selection_end_clock; - Gtk::Label selection_end_clock_label; AudioClock edit_cursor_clock; - Gtk::Label edit_cursor_clock_label; AudioClock zoom_range_clock; Gtk::Button zoom_in_button; Gtk::Button zoom_out_button; @@ -1313,8 +1281,8 @@ class Editor : public PublicEditor Gtk::Table toolbar_selection_clock_table; Gtk::Label toolbar_selection_cursor_label; - Gtk::Table mouse_mode_button_table; - Gtkmm2ext::TearOff* mouse_mode_tearoff; + Gtk::HBox mouse_mode_button_box; + Gtkmm2ext::TearOff* mouse_mode_tearoff; Gtk::ToggleButton mouse_select_button; Gtk::ToggleButton mouse_move_button; Gtk::ToggleButton mouse_gain_button; @@ -1332,32 +1300,23 @@ class Editor : public PublicEditor Gtk::ToggleButton global_automation_button; Gtk::ComboBoxText edit_mode_selector; - Gtk::Label edit_mode_label; - Gtk::VBox edit_mode_box; + Gtk::VBox edit_mode_box; void edit_mode_selection_done (); Gtk::ComboBoxText snap_type_selector; - Gtk::Label snap_type_label; - Gtk::VBox snap_type_box; + Gtk::ComboBoxText snap_mode_selector; + Gtk::HBox snap_box; void snap_type_selection_done (); - - Gtk::ComboBoxText snap_mode_selector; - Gtk::Label snap_mode_label; - Gtk::VBox snap_mode_box; - void snap_mode_selection_done (); Gtk::ComboBoxText zoom_focus_selector; - Gtk::Label zoom_focus_label; Gtk::VBox zoom_focus_box; void zoom_focus_selection_done (); - Gtk::Label zoom_indicator_label; - Gtk::HBox zoom_indicator_box; - Gtk::VBox zoom_indicator_vbox; + Gtk::HBox zoom_box; void update_zoom_indicator (); void zoom_adjustment_changed(); @@ -1566,12 +1525,12 @@ class Editor : public PublicEditor void start_trim (ArdourCanvas::Item*, GdkEvent*); void point_trim (GdkEvent*); void trim_motion_callback (ArdourCanvas::Item*, GdkEvent*); - void single_contents_trim (AudioRegionView&, jack_nframes_t, bool, bool, bool); - void single_start_trim (AudioRegionView&, jack_nframes_t, bool, bool); - void single_end_trim (AudioRegionView&, jack_nframes_t, bool, bool); + void single_contents_trim (RegionView&, jack_nframes_t, bool, bool, bool); + void single_start_trim (RegionView&, jack_nframes_t, bool, bool); + void single_end_trim (RegionView&, jack_nframes_t, bool, bool); void trim_finished_callback (ArdourCanvas::Item*, GdkEvent*); - void thaw_region_after_trim (AudioRegionView& rv); + void thaw_region_after_trim (RegionView& rv); void trim_region_to_edit_cursor (); void trim_region_from_edit_cursor (); @@ -1580,7 +1539,7 @@ class Editor : public PublicEditor /* Drag-n-Drop */ - int convert_drop_to_paths (std::vector& paths, + int convert_drop_to_paths (std::vector& paths, const Glib::RefPtr& context, gint x, gint y, @@ -1625,7 +1584,7 @@ class Editor : public PublicEditor void export_range (jack_nframes_t start, jack_nframes_t end); void export_range_markers (); - int write_region_selection(AudioRegionSelection&); + int write_region_selection(RegionSelection&); bool write_region (string path, ARDOUR::AudioRegion&); void export_region (); void bounce_region_selection (); @@ -1633,7 +1592,7 @@ class Editor : public PublicEditor void external_edit_region (); int write_audio_selection (TimeSelection&); - bool write_audio_range (ARDOUR::Playlist&, uint32_t channels, list&); + bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list&); void write_selection (); @@ -1641,13 +1600,15 @@ class Editor : public PublicEditor UndoAction get_memento() const; + XMLNode *before; /* used in *_reversible_command */ + void begin_reversible_command (string cmd_name); void commit_reversible_command (); /* visual history */ UndoHistory visual_history; - UndoCommand current_visual_command; + UndoTransaction current_visual_command; void begin_reversible_visual_command (const string & cmd_name); void commit_reversible_visual_command (); @@ -1703,13 +1664,12 @@ class Editor : public PublicEditor struct TimeStretchDialog : public ArdourDialog { ARDOUR::Session::TimeStretchRequest request; Editor& editor; - AudioRegionSelection regions; + RegionSelection regions; Gtk::ProgressBar progress_bar; Gtk::ToggleButton quick_button; Gtk::ToggleButton antialias_button; - Gtk::Button cancel_button; - Gtk::Button action_button; - Gtk::HBox lower_button_box; + Gtk::Button* cancel_button; + Gtk::Button* action_button; Gtk::HBox upper_button_box; Gtk::VBox packer; int status; @@ -1730,7 +1690,7 @@ class Editor : public PublicEditor TimeStretchDialog* current_timestretch; static void* timestretch_thread (void *arg); - int run_timestretch (AudioRegionSelection&, float fraction); + int run_timestretch (RegionSelection&, float fraction); void do_timestretch (TimeStretchDialog&); /* editor-mixer strip */ @@ -1809,7 +1769,6 @@ class Editor : public PublicEditor Gtk::Button nudge_backward_button; Gtk::HBox nudge_hbox; Gtk::VBox nudge_vbox; - Gtk::Label nudge_label; AudioClock nudge_clock; jack_nframes_t get_nudge_distance (jack_nframes_t pos, jack_nframes_t& next); @@ -1832,11 +1791,11 @@ class Editor : public PublicEditor sigc::connection step_timeout; TimeAxisView* entered_track; - AudioRegionView* entered_regionview; + RegionView* entered_regionview; bool clear_entered_track; gint left_track_canvas (GdkEventCrossing*); void set_entered_track (TimeAxisView*); - void set_entered_regionview (AudioRegionView*); + void set_entered_regionview (RegionView*); gint left_automation_track (); bool _new_regionviews_show_envelope;