X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=ccf45bf80d10f953fed9ec22beb08b0d59b972e4;hb=185be4e841e182bbe7cb7820f9cb6371ebebe15d;hp=3602e4348c2d7d67a020a6a196ed2ce140198e52;hpb=ab91bcfdace8f4c3e76de3a9ffbfff93102997fb;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3602e4348c..ccf45bf80d 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_editor_h__ @@ -27,51 +26,45 @@ #include #include -#include +#include +#include +#include -#include +#include #include #include -#include -#include -#include -#include -#include - #include #include +#include -#include +#include #include #include #include -#include +#include -#include "keyboard_target.h" #include "audio_clock.h" #include "gtk-custom-ruler.h" #include "ardour_dialog.h" #include "public_editor.h" #include "editing.h" #include "enums.h" +#include "editor_items.h" #include "region_selection.h" -#include "simplerect.h" +#include "canvas.h" +#include "draginfo.h" namespace Gtkmm2ext { class TearOff; } -namespace LinuxAudioSystems { - class AudioEngine; -} - namespace ARDOUR { - class DiskStream; + class AudioDiskstream; class RouteGroup; - class Source; class Playlist; + class AudioPlaylist; class Region; class Location; class TempoSection; @@ -79,6 +72,7 @@ namespace ARDOUR { class Session; class AudioFilter; class Crossfade; + class ChanCount; } namespace LADSPA { @@ -103,7 +97,11 @@ class TrackSelection; class AutomationSelection; class MixerStrip; class StreamView; +class AudioStreamView; class ControlPoint; +#ifdef FFT_ANALYSIS +class AnalysisWindow; +#endif /* */ class ImageFrameView; @@ -119,15 +117,15 @@ class TimeAxisViewItem ; class Editor : public PublicEditor { public: - Editor (ARDOUR::AudioEngine&); + Editor (); ~Editor (); void connect_to_session (ARDOUR::Session *); ARDOUR::Session* current_session() const { return session; } - jack_nframes_t leftmost_position() const { return leftmost_frame; } - jack_nframes_t current_page_frames() const { - return (jack_nframes_t) floor (canvas_width * frames_per_unit); + nframes_t leftmost_position() const { return leftmost_frame; } + nframes_t current_page_frames() const { + return (nframes_t) floor (canvas_width * frames_per_unit); } void set_snap_to (Editing::SnapType); @@ -144,16 +142,15 @@ class Editor : public PublicEditor void step_mouse_mode (bool next); Editing::MouseMode current_mouse_mode () { return mouse_mode; } - void add_imageframe_time_axis(std::string track_name, void*) ; - void add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void*) ; + void add_imageframe_time_axis(const std::string & track_name, void*) ; + void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) ; void connect_to_image_compositor() ; void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ; - TimeAxisView* get_named_time_axis(std::string name) ; - /* */ + TimeAxisView* get_named_time_axis(const std::string & name) ; - void consider_auditioning (ARDOUR::Region&); - void hide_a_region (ARDOUR::Region&); - void remove_a_region (ARDOUR::Region&); + void consider_auditioning (boost::shared_ptr); + void hide_a_region (boost::shared_ptr); + void remove_a_region (boost::shared_ptr); /* option editor-access */ @@ -167,17 +164,17 @@ 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); + void transition_to_rolling (bool forward); /* undo related */ - void set_edit_menu (Gtk::Menu&); - - jack_nframes_t unit_to_frame (double unit) { - return (jack_nframes_t) rint (unit * frames_per_unit); + nframes_t unit_to_frame (double unit) { + return (nframes_t) rint (unit * frames_per_unit); } - double frame_to_unit (jack_nframes_t frame) { + double frame_to_unit (nframes_t frame) { return rint ((double) frame / (double) frames_per_unit); } @@ -192,7 +189,7 @@ class Editor : public PublicEditor xscroll_adjustment. */ - jack_nframes_t pixel_to_frame (double pixel) { + nframes_t pixel_to_frame (double pixel) { /* pixel can be less than zero when motion events are processed. since we've already run the world->canvas @@ -201,13 +198,13 @@ class Editor : public PublicEditor */ if (pixel >= 0) { - return (jack_nframes_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit); + return (nframes_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit); } else { return 0; } } - gulong frame_to_pixel (jack_nframes_t frame) { + gulong frame_to_pixel (nframes_t frame) { return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit))); } @@ -216,9 +213,11 @@ class Editor : public PublicEditor Selection& get_selection() const { return *selection; } Selection& get_cut_buffer() const { return *cut_buffer; } + bool extend_selection_to_track (TimeAxisView&); + void play_selection (); - void select_all_in_track (bool add); - void select_all (bool add); + void select_all_in_track (Selection::Operation op); + void select_all (Selection::Operation op); void invert_selection_in_track (); void invert_selection (); @@ -226,6 +225,13 @@ class Editor : public PublicEditor void set_show_measures (bool yn); bool show_measures () const { return _show_measures; } + bool initial_ruler_update_required; + +#ifdef FFT_ANALYSIS + /* analysis window */ + void analyze_region_selection(); + void analyze_range_selection(); +#endif /* export */ @@ -234,11 +240,6 @@ class Editor : public PublicEditor void export_session(); void export_selection(); - /* this is what actually does it */ - - void export_audiofile (ARDOUR::AudioExportSpecification&); - - /* */ void add_toplevel_controls (Gtk::Container&); @@ -253,16 +254,21 @@ class Editor : public PublicEditor PlaylistSelector& playlist_selector() const; void route_name_changed (TimeAxisView *); gdouble frames_per_unit; - jack_nframes_t leftmost_frame; - void clear_playlist (ARDOUR::Playlist&); + nframes_t leftmost_frame; + void clear_playlist (boost::shared_ptr); + + void new_playlists (); + void copy_playlists (); + void clear_playlists (); TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0); Width editor_mixer_strip_width; + void maybe_add_mixer_strip_width (XMLNode&); void show_editor_mixer (bool yn); void set_selected_mixer_strip (TimeAxisView&); - void unselect_strip_in_display (TimeAxisView& tv); - void select_strip_in_display (TimeAxisView* tv); + void hide_track_in_display (TimeAxisView& tv); + void show_track_in_display (TimeAxisView& tv); /* nudge is initiated by transport controls owned by ARDOUR_UI */ @@ -279,13 +285,34 @@ class Editor : public PublicEditor void set_follow_playhead (bool yn); void toggle_follow_playhead (); bool follow_playhead() const { return _follow_playhead; } + bool dragging_playhead () const { return _dragging_playhead; } + + void toggle_waveform_visibility (); + void toggle_waveforms_while_recording (); + void toggle_measure_visibility (); + + /* SMPTE timecode & video sync */ + void smpte_fps_chosen (ARDOUR::SmpteFormat format); + void video_pullup_chosen (ARDOUR::Session::PullupFormat pullup); + void subframes_per_frame_chosen (uint32_t); + + void update_smpte_mode(); + void update_video_pullup(); + void update_subframes_per_frame (); /* 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_xfade_visibility (); + void update_crossfade_model (); + void set_crossfade_model (ARDOUR::CrossfadeModel); + + /* layers */ + void set_layer_model (ARDOUR::LayerModel); + void update_layering_model (); /* redirect shared ops menu. caller must free returned menu */ @@ -296,90 +323,47 @@ class Editor : public PublicEditor void ensure_float (Gtk::Window&); void show_window (); - + void scroll_tracks_down_line (); void scroll_tracks_up_line (); bool new_regionviews_display_gain () { return _new_regionviews_show_envelope; } void prepare_for_cleanup (); - void reposition_x_origin (jack_nframes_t sample); + void maximise_editing_space(); + void restore_editing_space(); + + void reset_x_origin (nframes_t); + void reset_zoom (double); + void reposition_and_zoom (nframes_t, double); + + nframes_t edit_cursor_position(bool); protected: void map_transport_state (); - void map_position_change (jack_nframes_t); + void map_position_change (nframes_t); void on_realize(); - void on_map (); private: ARDOUR::Session *session; - ARDOUR::AudioEngine& engine; bool constructed; PlaylistSelector* _playlist_selector; - 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 - }; - void set_frames_per_unit (double); - void frames_per_unit_modified (); Editing::MouseMode mouse_mode; - void mouse_insert (GdkEventButton *); + int post_maximal_editor_width; + int post_maximal_pane_position; + int pre_maximal_pane_position; + int pre_maximal_editor_width; void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); - Gtk::HPaned canvas_region_list_pane; - Gtk::HPaned track_list_canvas_pane; + Gtk::Notebook the_notebook; + Gtk::HPaned edit_pane; Gtk::EventBox meter_base; Gtk::HBox meter_box; @@ -394,7 +378,7 @@ class Editor : public PublicEditor void refresh_location_display_internal (ARDOUR::Locations::LocationList&); void add_new_location (ARDOUR::Location *); void location_gone (ARDOUR::Location *); - void remove_marker (Gnome::Canvas::Item&, GdkEvent*); + void remove_marker (ArdourCanvas::Item&, GdkEvent*); gint really_remove_marker (ARDOUR::Location* loc); uint32_t location_marker_color; @@ -412,7 +396,7 @@ class Editor : public PublicEditor void hide(); void show (); void set_name (const string&); - void set_position (jack_nframes_t start, jack_nframes_t end = 0); + void set_position (nframes_t start, nframes_t end = 0); void set_color_rgba (uint32_t); }; @@ -422,25 +406,48 @@ class Editor : public PublicEditor typedef std::map LocationMarkerMap; LocationMarkerMap location_markers; - void hide_marker (Gnome::Canvas::Item*, GdkEvent*); + void hide_marker (ArdourCanvas::Item*, GdkEvent*); void clear_marker_display (); - void mouse_add_new_marker (jack_nframes_t where); + void mouse_add_new_marker (nframes_t where); - TimeAxisView* clicked_trackview; - AudioTimeAxisView* clicked_audio_trackview; - AudioRegionView* clicked_regionview; - AudioRegionView* latest_regionview; + TimeAxisView* clicked_axisview; + RouteTimeAxisView* clicked_routeview; + RegionView* clicked_regionview; + RegionView* latest_regionview; uint32_t clicked_selection; CrossfadeView* clicked_crossfadeview; ControlPoint* clicked_control_point; - void catch_vanishing_audio_regionview (AudioRegionView *); - void set_selected_control_point_from_click (bool add = false, bool with_undo = true, bool no_remove=false); - void set_selected_track_from_click (bool add = false, bool with_undo = true, bool no_remove=false); - void set_selected_regionview_from_click (bool add = false, bool no_track_remove=false); - void set_selected_regionview_from_region_list (ARDOUR::Region& region, bool add = false); - gint set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, ARDOUR::Region*); - void collect_new_region_view (AudioRegionView *); + void sort_track_selection (); + + void get_relevant_tracks (std::set& relevant_tracks); + void get_equivalent_regions (RegionView* rv, std::vector&); + void mapover_tracks (sigc::slot sl); + + /* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */ + + void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, vector*); + void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t); + void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t); + void mapped_clear_playlist (RouteTimeAxisView&, uint32_t); + + /* end */ + + void button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type); + bool button_release_can_deselect; + + void catch_vanishing_regionview (RegionView *); + + bool set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false); + void select_all_tracks (); + + bool set_selected_control_point_from_click (Selection::Operation op = Selection::Set, bool no_remove=false); + bool set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, 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 (boost::shared_ptr region, Selection::Operation op = Selection::Set); + bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr); + void collect_new_region_view (RegionView *); Gtk::Menu track_context_menu; Gtk::Menu track_region_context_menu; @@ -453,20 +460,19 @@ class Editor : public PublicEditor Gtk::Menu * track_edit_playlist_submenu; Gtk::Menu * track_selection_edit_playlist_submenu; - void popup_track_context_menu (int, int, ItemType, bool, jack_nframes_t); - Gtk::Menu* build_track_context_menu (jack_nframes_t); - Gtk::Menu* build_track_bus_context_menu (jack_nframes_t); - Gtk::Menu* build_track_region_context_menu (jack_nframes_t frame); - Gtk::Menu* build_track_crossfade_context_menu (jack_nframes_t); - Gtk::Menu* build_track_selection_context_menu (jack_nframes_t); + void popup_track_context_menu (int, int, ItemType, bool, nframes_t); + Gtk::Menu* build_track_context_menu (nframes_t); + Gtk::Menu* build_track_bus_context_menu (nframes_t); + Gtk::Menu* build_track_region_context_menu (nframes_t frame); + Gtk::Menu* build_track_crossfade_context_menu (nframes_t); + Gtk::Menu* build_track_selection_context_menu (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*, boost::shared_ptr, Gtk::Menu_Helpers::MenuList&); + void add_crossfade_context_items (AudioStreamView*, boost::shared_ptr, 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 (ARDOUR::Session::RouteList&); void remove_route (TimeAxisView *); bool route_removal; @@ -476,41 +482,38 @@ class Editor : public PublicEditor Gdk::Cursor* current_canvas_cursor; - Gnome::Canvas::CanvasAA track_canvas; - Gnome::Canvas::CanvasAA time_canvas; + ArdourCanvas::CanvasAA track_canvas; + ArdourCanvas::CanvasAA time_canvas; - Gnome::Canvas::Text* first_action_message; - Gnome::Canvas::Text* verbose_canvas_cursor; + ArdourCanvas::Text* first_action_message; + ArdourCanvas::Text* verbose_canvas_cursor; bool verbose_cursor_visible; - void session_control_changed (ARDOUR::Session::ControlType); - void queue_session_control_changed (ARDOUR::Session::ControlType); - + void parameter_changed (const char *); - gint track_canvas_motion (GdkEvent*); - void set_verbose_canvas_cursor (string, double x, double y); - void set_verbose_canvas_cursor_text (string); + bool track_canvas_motion (GdkEvent*); + + void set_verbose_canvas_cursor (const string &, double x, double y); + void set_verbose_canvas_cursor_text (const string &); void show_verbose_canvas_cursor(); void hide_verbose_canvas_cursor(); bool verbose_cursor_on; // so far unused - void flush_track_canvas (); - void flush_time_canvas (); - Gtk::EventBox time_canvas_event_box; Gtk::EventBox track_canvas_event_box; Gtk::EventBox time_button_event_box; - - Gnome::Canvas::Group *minsec_group; - Gnome::Canvas::Group *bbt_group; - Gnome::Canvas::Group *smpte_group; - Gnome::Canvas::Group *frame_group; - Gnome::Canvas::Group *tempo_group; - Gnome::Canvas::Group *meter_group; - Gnome::Canvas::Group *marker_group; - Gnome::Canvas::Group *range_marker_group; - Gnome::Canvas::Group *transport_marker_group; + Gtk::Frame time_button_frame; + + ArdourCanvas::Group *minsec_group; + ArdourCanvas::Group *bbt_group; + ArdourCanvas::Group *smpte_group; + ArdourCanvas::Group *frame_group; + ArdourCanvas::Group *tempo_group; + ArdourCanvas::Group *meter_group; + ArdourCanvas::Group *marker_group; + ArdourCanvas::Group *range_marker_group; + ArdourCanvas::Group *transport_marker_group; enum { ruler_metric_smpte = 0, @@ -540,23 +543,24 @@ class Editor : public PublicEditor void update_just_smpte (); void update_fixed_rulers (); void update_tempo_based_rulers (); - void popup_ruler_menu (jack_nframes_t where = 0, ItemType type = RegionItem); + void popup_ruler_menu (nframes_t where = 0, ItemType type = RegionItem); void update_ruler_visibility (); void ruler_toggled (int); gint ruler_label_button_release (GdkEventButton*); void store_ruler_visibility (); void restore_ruler_visibility (); - static gint _metric_get_smpte (GtkCustomRulerMark **, gulong, gulong, gint); - static gint _metric_get_bbt (GtkCustomRulerMark **, gulong, gulong, gint); - static gint _metric_get_frames (GtkCustomRulerMark **, gulong, gulong, gint); - static gint _metric_get_minsec (GtkCustomRulerMark **, gulong, gulong, gint); + static gint _metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint); + static gint _metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); + static gint _metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); + static gint _metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); - gint metric_get_smpte (GtkCustomRulerMark **, gulong, gulong, gint); - gint metric_get_bbt (GtkCustomRulerMark **, gulong, gulong, gint); - gint metric_get_frames (GtkCustomRulerMark **, gulong, gulong, gint); - gint metric_get_minsec (GtkCustomRulerMark **, gulong, gulong, gint); + gint metric_get_smpte (GtkCustomRulerMark **, gdouble, gdouble, gint); + gint metric_get_bbt (GtkCustomRulerMark **, gdouble, gdouble, gint); + gint metric_get_frames (GtkCustomRulerMark **, gdouble, gdouble, gint); + gint metric_get_minsec (GtkCustomRulerMark **, gdouble, gdouble, gint); + Gtk::Widget *_ruler_separator; GtkWidget *_smpte_ruler; GtkWidget *_bbt_ruler; GtkWidget *_frames_ruler; @@ -571,24 +575,18 @@ class Editor : public PublicEditor guint32 visible_timebars; Gtk::Menu *editor_ruler_menu; - Gnome::Canvas::SimpleRect* tempo_bar; - Gnome::Canvas::SimpleRect* meter_bar; - Gnome::Canvas::SimpleRect* marker_bar; - Gnome::Canvas::SimpleRect* range_marker_bar; - Gnome::Canvas::SimpleRect* transport_marker_bar; + ArdourCanvas::SimpleRect* tempo_bar; + ArdourCanvas::SimpleRect* meter_bar; + ArdourCanvas::SimpleRect* marker_bar; + ArdourCanvas::SimpleRect* range_marker_bar; + ArdourCanvas::SimpleRect* transport_marker_bar; - Gnome::Canvas::Line* tempo_line; - Gnome::Canvas::Line* meter_line; - Gnome::Canvas::Line* marker_line; - Gnome::Canvas::Line* range_marker_line; - Gnome::Canvas::Line* transport_marker_line; - - Gnome::Canvas::Points tempo_line_points; - Gnome::Canvas::Points meter_line_points; - Gnome::Canvas::Points marker_line_points; - Gnome::Canvas::Points range_marker_line_points; - Gnome::Canvas::Points transport_marker_line_points; + ArdourCanvas::SimpleLine* tempo_line; + ArdourCanvas::SimpleLine* meter_line; + ArdourCanvas::SimpleLine* marker_line; + ArdourCanvas::SimpleLine* range_marker_line; + ArdourCanvas::SimpleLine* transport_marker_line; Gtk::Label minsec_label; Gtk::Label bbt_label; @@ -606,15 +604,15 @@ class Editor : public PublicEditor struct Cursor { Editor& editor; - Gnome::Canvas::Points* points; - Gnome::Canvas::Item* canvas_item; - jack_nframes_t current_frame; + ArdourCanvas::Points points; + ArdourCanvas::Line canvas_item; + nframes_t current_frame; double length; - Cursor (Editor&, const string& color, bool (Editor::*)(GdkEvent*)); + Cursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*)); ~Cursor (); - void set_position (jack_nframes_t); + void set_position (nframes_t); void set_length (double units); void set_y_axis (double position); }; @@ -625,17 +623,19 @@ class Editor : public PublicEditor Cursor* playhead_cursor; Cursor* edit_cursor; - Gnome::Canvas::Group* cursor_group; + ArdourCanvas::Group* cursor_group; void cursor_to_next_region_point (Cursor*, ARDOUR::RegionPoint); void cursor_to_previous_region_point (Cursor*, ARDOUR::RegionPoint); void cursor_to_region_point (Cursor*, ARDOUR::RegionPoint, int32_t dir); 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); + boost::shared_ptr find_next_region (nframes_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0); - vector region_boundary_cache; + vector region_boundary_cache; void build_region_boundary_cache (); Gtk::VBox trackview_vpacker; @@ -644,89 +644,94 @@ class Editor : public PublicEditor Gtk::HBox bottom_hbox; Gtk::Table edit_packer; - Gtk::Frame edit_frame; Gtk::VScrollbar edit_vscrollbar; - /* the horizontal scroller works in a rather different way - than a regular scrollbar, since its used for - zoom control/indication as well. But more importantly, - its different components (slider, left arrow, right arrow) - have to be packed separately into the edit_packer. - */ + Gtk::Adjustment vertical_adjustment; + Gtk::Adjustment horizontal_adjustment; + + Gtk::Layout controls_layout; + bool control_layout_scroll (GdkEventScroll* ev); + void controls_layout_size_request (Gtk::Requisition*); Gtk::HScrollbar edit_hscrollbar; - Gtk::DrawingArea edit_hscroll_slider; - Gtk::Arrow edit_hscroll_left_arrow; - Gtk::Arrow edit_hscroll_right_arrow; - Gtk::EventBox edit_hscroll_left_arrow_event; - Gtk::EventBox edit_hscroll_right_arrow_event; - gint edit_hscroll_slider_width; - gint edit_hscroll_slider_height; - static const gint edit_hscroll_edge_width = 3; - bool edit_hscroll_dragging; - double edit_hscroll_drag_last; - - void hscroll_slider_allocate (Gtk::Allocation &); - gint hscroll_slider_expose (GdkEventExpose*); - gint hscroll_slider_button_press (GdkEventButton*); - gint hscroll_slider_button_release (GdkEventButton*); - gint hscroll_slider_motion (GdkEventMotion*); - - gint hscroll_trough_expose (GdkEventExpose*); - gint hscroll_trough_button_press (GdkEventButton*); - gint hscroll_trough_button_release (GdkEventButton*); - - void update_hscroller (); - - gint hscroll_left_arrow_button_press (GdkEventButton *); - gint hscroll_left_arrow_button_release (GdkEventButton *); - gint hscroll_right_arrow_button_press (GdkEventButton *); - gint hscroll_right_arrow_button_release (GdkEventButton *); + bool _dragging_hscrollbar; + + void reset_hscrollbar_stepping (); - guint32 canvas_width; - guint32 canvas_height; + bool hscrollbar_button_press (GdkEventButton*); + bool hscrollbar_button_release (GdkEventButton*); + void hscrollbar_allocate (Gtk::Allocation &alloc); + + double canvas_width; + double canvas_height; + double full_canvas_height; + nframes_t last_canvas_frame; - Gtk::ScrolledWindow track_canvas_scroller; - Gtk::ScrolledWindow time_canvas_scroller; - Gtk::ScrolledWindow edit_controls_scroller; + bool track_canvas_map_handler (GdkEventAny*); + bool time_canvas_map_handler (GdkEventAny*); gint edit_controls_button_release (GdkEventButton*); Gtk::Menu *edit_controls_left_menu; Gtk::Menu *edit_controls_right_menu; - void track_canvas_scroller_realized (); - void time_canvas_scroller_realized (); - Gtk::VBox track_canvas_vbox; Gtk::VBox time_canvas_vbox; Gtk::VBox edit_controls_vbox; Gtk::HBox edit_controls_hbox; + void control_scroll (float); + bool deferred_control_scroll (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); - gint deferred_reposition_and_zoom (jack_nframes_t sample, double fpu); + + struct VisualChange { + enum Type { + TimeOrigin = 0x1, + ZoomLevel = 0x2 + }; + + Type pending; + nframes_t time_origin; + double frames_per_unit; + + int idle_handler_id; + + VisualChange() : pending ((VisualChange::Type) 0), time_origin (0), frames_per_unit (0), idle_handler_id (-1) {} + }; + + + VisualChange pending_visual_change; + + static int _idle_visual_changer (void *arg); + int idle_visual_changer (); + + void queue_visual_change (nframes_t); + void queue_visual_change (double); + void end_location_changed (ARDOUR::Location*); - bool repos_zoom_queued; - bool no_zoom_repos_update; - bool no_tempo_map_update; struct RegionListDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { RegionListDisplayModelColumns() { add (name); add (region); + add (color_); } Gtk::TreeModelColumn name; - Gtk::TreeModelColumn region; + Gtk::TreeModelColumn > region; + Gtk::TreeModelColumn color_; }; - RegionListDisplayModelColumns region_list_columns; - Gtk::TreeView region_list_display; - Glib::RefPtr region_list_model; - Glib::RefPtr region_list_sort_model; - Glib::RefPtr toggle_full_region_list_action; + RegionListDisplayModelColumns region_list_columns; + Gtkmm2ext::DnDTreeView > region_list_display; + + Glib::RefPtr region_list_model; + Glib::RefPtr toggle_full_region_list_action; + Glib::RefPtr toggle_show_auto_regions_action; void region_list_selection_changed (); + bool region_list_selection_filter (const Glib::RefPtr& model, const Gtk::TreeModel::Path& path, bool yn); Gtk::Menu *region_list_menu; Gtk::ScrolledWindow region_list_scroller; @@ -736,17 +741,10 @@ class Editor : public PublicEditor bool region_list_display_key_release (GdkEventKey *); bool region_list_display_button_press (GdkEventButton *); bool region_list_display_button_release (GdkEventButton *); - bool region_list_display_enter_notify (GdkEventCrossing *); - bool region_list_display_leave_notify (GdkEventCrossing *); void region_list_clear (); - void region_list_selection_mapover (sigc::slot); + void region_list_selection_mapover (sigc::slot >); void build_region_list_menu (); - - Gtk::CheckMenuItem* toggle_auto_regions_item; - Gtk::CheckMenuItem* toggle_full_region_list_item; - - Gtk::MenuItem* import_audio_item; - Gtk::MenuItem* embed_audio_item; + void show_region_list_display_context_menu (int button, int time); bool show_automatic_regions_in_region_list; Editing::RegionListSortType region_list_sort_type; @@ -759,6 +757,28 @@ class Editor : public PublicEditor int region_list_sorter (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator); + /* snapshots */ + + Gtk::ScrolledWindow snapshot_display_scroller; + struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { + SnapshotDisplayModelColumns() { + add (visible_name); + add (real_name); + } + Gtk::TreeModelColumn visible_name; + Gtk::TreeModelColumn real_name; + }; + + SnapshotDisplayModelColumns snapshot_display_columns; + Glib::RefPtr snapshot_display_model; + Gtk::TreeView snapshot_display; + Gtk::Menu snapshot_context_menu; + + bool snapshot_display_button_press (GdkEventButton*); + void snapshot_display_selection_changed (); + void redisplay_snapshots(); + void popup_snapshot_context_menu (int, int32_t, Glib::ustring); + /* named selections */ struct NamedSelectionDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { @@ -773,24 +793,24 @@ class Editor : public PublicEditor NamedSelectionDisplayModelColumns named_selection_columns; Glib::RefPtr named_selection_model; - Gtk::VPaned region_selection_vpane; - Gtk::TreeView named_selection_display; - Gtk::ScrolledWindow named_selection_scroller; + Gtkmm2ext::DnDTreeView named_selection_display; + Gtk::ScrolledWindow named_selection_scroller; - void name_selection(); - void named_selection_name_chosen (); - void create_named_selection (string); + void create_named_selection (); void paste_named_selection (float times); + void remove_selected_named_selections (); + void remove_snapshot (Glib::ustring); + void rename_snapshot (Glib::ustring); void handle_new_named_selection (); void add_named_selection_to_named_selection_display (ARDOUR::NamedSelection&); void redisplay_named_selections (); - gint named_selection_display_button_press (GdkEventButton *ev); + bool named_selection_display_button_release (GdkEventButton *ev); + bool named_selection_display_key_release (GdkEventKey *ev); void named_selection_display_selection_changed (); /* track views */ - int track_spacing; TrackViewList track_views; TimeAxisView *trackview_by_y_position (double ypos); @@ -802,53 +822,44 @@ class Editor : public PublicEditor static Gdk::Cursor* time_fx_cursor; static Gdk::Cursor* fader_cursor; static Gdk::Cursor* speaker_cursor; - static Gdk::Cursor* null_cursor; static Gdk::Cursor* wait_cursor; static Gdk::Cursor* timebar_cursor; static void build_cursors (); sigc::connection scroll_connection; - jack_nframes_t last_update_frame; - void center_screen (jack_nframes_t); - void center_screen_internal (jack_nframes_t, float); + nframes_t last_update_frame; + void center_screen (nframes_t); + void center_screen_internal (nframes_t, float); void update_current_screen (); - sigc::connection slower_update_connection; - void update_slower (); - gint show_track_context_menu (GdkEventButton *); - void hide_track_context_menu (); - void session_going_away (); - jack_nframes_t cut_buffer_start; - jack_nframes_t cut_buffer_length; + nframes_t cut_buffer_start; + nframes_t cut_buffer_length; - gint typed_event (GnomeCanvasItem*, GdkEvent*, ItemType); - gint button_press_handler (Gnome::Canvas::Item*, GdkEvent*, ItemType); - gint button_release_handler (Gnome::Canvas::Item*, GdkEvent*, ItemType); - gint motion_handler (Gnome::Canvas::Item*, GdkEvent*, ItemType); - gint enter_handler (Gnome::Canvas::Item*, GdkEvent*, ItemType); - gint leave_handler (Gnome::Canvas::Item*, GdkEvent*, ItemType); + 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 from_autoscroll = false); + bool enter_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); + bool leave_handler (ArdourCanvas::Item*, GdkEvent*, ItemType); /* KEYMAP HANDLING */ void register_actions (); - void install_keybindings (); - int ensure_cursor (jack_nframes_t* pos); + int ensure_cursor (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 region_hidden (ARDOUR::Region*); + void handle_new_region (boost::weak_ptr); + void handle_region_removed (boost::weak_ptr); + void add_region_to_region_display (boost::shared_ptr); + void region_hidden (boost::shared_ptr); void redisplay_regions (); - void insert_into_tmp_audio_regionlist(ARDOUR::AudioRegion *); + void insert_into_tmp_regionlist(boost::shared_ptr); - list tmp_audio_region_list; + list > tmp_region_list; void cut_copy (Editing::CutCopyOp); void cut_copy_points (Editing::CutCopyOp); @@ -856,37 +867,39 @@ class Editor : public PublicEditor void cut_copy_ranges (Editing::CutCopyOp); void mouse_paste (); - void paste_internal (jack_nframes_t position, float times); + void paste_internal (nframes_t position, float times); /* EDITING OPERATIONS */ + void reset_point_selection (); void toggle_region_mute (); + void toggle_region_lock (); void toggle_region_opaque (); void raise_region (); void raise_region_to_top (); void lower_region (); 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_region_at (nframes_t); + void split_regions_at (nframes_t, RegionSelection&); void crop_region_to_selection (); + void set_a_regions_sync_position (boost::shared_ptr, nframes_t); void set_region_sync_from_edit_cursor (); void remove_region_sync(); - void align_selection (ARDOUR::RegionPoint, jack_nframes_t position); - void align_selection_relative (ARDOUR::RegionPoint point, jack_nframes_t position); - void align_region (ARDOUR::Region&, ARDOUR::RegionPoint point, jack_nframes_t position); - void align_region_internal (ARDOUR::Region&, ARDOUR::RegionPoint point, jack_nframes_t position); - void remove_some_regions (); + void align_selection (ARDOUR::RegionPoint, nframes_t position); + void align_selection_relative (ARDOUR::RegionPoint point, nframes_t position); + void align_region (boost::shared_ptr, ARDOUR::RegionPoint point, nframes_t position); + void align_region_internal (boost::shared_ptr, ARDOUR::RegionPoint point, nframes_t position); 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 (boost::shared_ptr); + void audition_playlist_region_via_route (boost::shared_ptr, ARDOUR::Route&); void split_multichannel_region(); void reverse_region (); void normalize_region (); @@ -900,6 +913,8 @@ class Editor : public PublicEditor void align_relative (ARDOUR::RegionPoint); void naturalize (); + void reset_focus (); + void cut (); void copy (); void paste (float times); @@ -909,11 +924,10 @@ class Editor : public PublicEditor void keyboard_paste (); void keyboard_duplicate_region (); void keyboard_duplicate_selection (); - void keyboard_nudge (); void keyboard_insert_region_list_selection (); void region_from_selection (); - void create_region_from_selection (std::vector&); + void create_region_from_selection (std::vector >&); bool region_renamed; void rename_region (); @@ -923,7 +937,6 @@ class Editor : public PublicEditor void play_from_edit_cursor (); void play_selected_region (); void audition_selected_region (); - void toggle_loop_playback (); void loop_selected_region (); void play_location (ARDOUR::Location&); void loop_location (ARDOUR::Location&); @@ -933,27 +946,24 @@ class Editor : public PublicEditor void temporal_zoom_selection (); void temporal_zoom_session (); void temporal_zoom (gdouble scale); - void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string op); - void temporal_zoom_to_frame (bool coarser, jack_nframes_t frame); + void temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op); + void temporal_zoom_to_frame (bool coarser, nframes_t frame); void amplitude_zoom (gdouble scale); void amplitude_zoom_step (bool in); - void insert_region_list_drag (ARDOUR::AudioRegion&); + void insert_region_list_drag (boost::shared_ptr, 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 (string path, SF_INFO& finfo, string action, bool multiple_pending); + void add_external_audio_action (Editing::ImportMode); - void do_embed_sndfiles (vector paths, bool split); - void embed_sndfile (string path, bool split, bool multiple_files, bool& check_sr); - - 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 (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*, nframes_t& pos, bool prompt); + void do_import (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); + void do_embed (vector paths, bool split, Editing::ImportMode mode, ARDOUR::AudioTrack*, nframes_t&, bool); + int import_sndfile (vector paths, Editing::ImportMode mode, ARDOUR::AudioTrack* track, nframes_t& pos); + int embed_sndfile (vector paths, bool split, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + ARDOUR::AudioTrack* track, nframes_t& pos, bool prompt); + int finish_bringing_in_audio (boost::shared_ptr region, uint32_t, uint32_t, ARDOUR::AudioTrack* track, nframes_t& pos, Editing::ImportMode mode); /* generic interthread progress window */ @@ -968,19 +978,21 @@ class Editor : public PublicEditor void build_interthread_progress_window (); ARDOUR::InterThreadInfo* current_interthread_info; +#ifdef FFT_ANALYSIS + AnalysisWindow* analysis_window; +#endif + /* import specific info */ ARDOUR::Session::import_status import_status; 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 ... */ void import_audio (bool as_tracks); - void do_import (vector paths, bool split, bool as_tracks); + void do_import (vector paths, bool split, bool as_tracks); void move_to_start (); void move_to_end (); @@ -991,6 +1003,7 @@ class Editor : public PublicEditor void edit_cursor_forward (); void playhead_backward (); void playhead_forward (); + void scroll_playhead (bool forward); void scroll_backward (float pages=0.8f); void scroll_forward (float pages=0.8f); void scroll_tracks_down (); @@ -1004,16 +1017,22 @@ class Editor : public PublicEditor void clear_markers (); void clear_ranges (); void clear_locations (); + void unhide_markers (); + void unhide_ranges (); void jump_forward_to_mark (); void jump_backward_to_mark (); void cursor_align (bool playhead_to_edit); void remove_last_capture (); - + void select_all_selectables_using_time_selection (); + void select_all_selectables_using_loop(); + void select_all_selectables_using_punch(); 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 (); @@ -1028,9 +1047,9 @@ class Editor : public PublicEditor void keyboard_selection_begin (); void keyboard_selection_finish (bool add); bool have_pending_keyboard_selection; - jack_nframes_t pending_keyboard_selection_start; + nframes_t pending_keyboard_selection_start; - ARDOUR::AudioRegion* select_region_for_operation (int dir, TimeAxisView **tv); + boost::shared_ptr 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); @@ -1038,162 +1057,133 @@ class Editor : public PublicEditor Editing::SnapMode snap_mode; double snap_threshold; - void soundfile_chosen_for_insert (string selection, bool split_channels); - void soundfile_chosen_for_embed (string selection, bool split_channels); - void soundfile_chosen_for_import (string selection, bool split_channels); - - void handle_gui_changes (string, void *); + void handle_gui_changes (const string &, void *); void hide_all_tracks (bool with_select); - void route_display_selection_changed (); - void redisplay_route_list(); - gint route_list_reordered (); - bool ignore_route_list_reorder; - void queue_route_list_reordered (); - - struct DragInfo { - Gnome::Canvas::Item* item; - void* data; - jack_nframes_t last_frame_position; - int32_t pointer_frame_offset; - jack_nframes_t grab_frame; - jack_nframes_t last_pointer_frame; - jack_nframes_t current_pointer_frame; - double grab_x, grab_y; - double cumulative_x_drag; - double cumulative_y_drag; - double current_pointer_x; - double current_pointer_y; - void (Editor::*motion_callback)(Gnome::Canvas::Item*, GdkEvent*); - void (Editor::*finished_callback)(Gnome::Canvas::Item*, GdkEvent*); - TimeAxisView* last_trackview; - bool x_constrained; - bool copy; - bool was_rolling; - bool first_move; - bool move_threshold_passsed; - bool want_move_threshold; - bool brushing; - ARDOUR::Location* copied_location; - } drag_info; - - struct LineDragInfo { - uint32_t before; - uint32_t after; - }; - + DragInfo drag_info; LineDragInfo current_line_drag_info; void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0); - bool end_grab (Gnome::Canvas::Item*, GdkEvent*); + 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, Gnome::Canvas::Item*, ItemType); - - void start_fade_in_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_fade_out_grab (Gnome::Canvas::Item*, GdkEvent*); - void fade_in_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void fade_out_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void fade_in_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void fade_out_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); + void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType); + + void start_fade_in_grab (ArdourCanvas::Item*, GdkEvent*); + void start_fade_out_grab (ArdourCanvas::Item*, GdkEvent*); + void fade_in_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void fade_out_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void fade_in_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void fade_out_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + + void set_fade_in_shape (ARDOUR::AudioRegion::FadeShape); + void set_fade_out_shape (ARDOUR::AudioRegion::FadeShape); + + void set_fade_in_active (bool); + void set_fade_out_active (bool); - std::set motion_frozen_playlists; - void region_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void region_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void region_copy_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - - void cursor_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void cursor_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void marker_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void marker_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void control_point_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void control_point_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void line_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void line_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - - void tempo_marker_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void tempo_marker_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void meter_marker_drag_motion_callback (Gnome::Canvas::Item*, GdkEvent*); - void meter_marker_drag_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - - gint mouse_rename_region (Gnome::Canvas::Item*, GdkEvent*); - - void start_region_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_region_copy_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_region_brush_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_selection_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_cursor_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_marker_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_control_point_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_line_grab_from_regionview (Gnome::Canvas::Item*, GdkEvent*); - void start_line_grab_from_line (Gnome::Canvas::Item*, GdkEvent*); + std::set > motion_frozen_playlists; + void region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + + bool _dragging_playhead; + + void cursor_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void cursor_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void control_point_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void control_point_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void line_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void line_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + + void tempo_marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void tempo_marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void meter_marker_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void meter_marker_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*); + + gint mouse_rename_region (ArdourCanvas::Item*, GdkEvent*); + + void start_region_grab (ArdourCanvas::Item*, GdkEvent*); + void start_region_copy_grab (ArdourCanvas::Item*, GdkEvent*); + void start_region_brush_grab (ArdourCanvas::Item*, GdkEvent*); + void start_selection_grab (ArdourCanvas::Item*, GdkEvent*); + void start_cursor_grab (ArdourCanvas::Item*, GdkEvent*); + void start_marker_grab (ArdourCanvas::Item*, GdkEvent*); + void start_control_point_grab (ArdourCanvas::Item*, GdkEvent*); + void start_line_grab_from_regionview (ArdourCanvas::Item*, GdkEvent*); + void start_line_grab_from_line (ArdourCanvas::Item*, GdkEvent*); void start_line_grab (AutomationLine *, GdkEvent*); - void start_tempo_marker_grab (Gnome::Canvas::Item*, GdkEvent*); - void start_meter_marker_grab (Gnome::Canvas::Item*, GdkEvent*); + void start_tempo_marker_grab (ArdourCanvas::Item*, GdkEvent*); + void start_tempo_marker_copy_grab (ArdourCanvas::Item*, GdkEvent*); + void start_meter_marker_grab (ArdourCanvas::Item*, GdkEvent*); + void start_meter_marker_copy_grab (ArdourCanvas::Item*, GdkEvent*); void region_view_item_click (AudioRegionView&, GdkEventButton*); - void remove_gain_control_point (Gnome::Canvas::Item*, GdkEvent*); - void remove_control_point (Gnome::Canvas::Item*, GdkEvent*); + 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 brush (jack_nframes_t); + void mouse_brush_insert_region (RegionView*, nframes_t pos); + void brush (nframes_t); - void show_verbose_time_cursor (jack_nframes_t frame, double offset = 0, double xpos=-1, double ypos=-1); - void show_verbose_duration_cursor (jack_nframes_t start, jack_nframes_t end, double offset = 0, double xpos=-1, double ypos=-1); + void show_verbose_time_cursor (nframes_t frame, double offset = 0, double xpos=-1, double ypos=-1); + void show_verbose_duration_cursor (nframes_t start, nframes_t end, double offset = 0, double xpos=-1, double ypos=-1); /* Canvas event handlers */ - // FIXED FOR GTK2 - - bool canvas_control_point_event (GdkEvent* event,ControlPoint*); - bool canvas_line_event (GdkEvent* event,AutomationLine*); - bool canvas_selection_rect_event (GdkEvent* event,SelectionRect*); - bool canvas_selection_start_trim_event (GdkEvent* event,SelectionRect*); - bool canvas_selection_end_trim_event (GdkEvent* event,SelectionRect*); - - // PENDING - - gint canvas_crossfade_view_event (GdkEvent* event); - gint canvas_fade_in_event (GdkEvent* event); - gint canvas_fade_in_handle_event (GdkEvent* event); - gint canvas_fade_out_event (GdkEvent* event); - gint canvas_fade_out_handle_event (GdkEvent* event); - gint canvas_region_view_event (GdkEvent* event); - gint canvas_region_view_name_highlight_event (GdkEvent* event); - gint canvas_region_view_name_event (GdkEvent* event); - gint canvas_stream_view_event (GdkEvent* event); - gint canvas_marker_event (GdkEvent* event); - gint canvas_zoom_rect_event (GdkEvent* event); - gint canvas_tempo_marker_event (GdkEvent* event); - gint canvas_meter_marker_event (GdkEvent* event); - gint canvas_tempo_bar_event (GdkEvent* event); - gint canvas_meter_bar_event (GdkEvent* event); - gint canvas_marker_bar_event (GdkEvent* event); - gint canvas_range_marker_bar_event (GdkEvent* event); - gint canvas_transport_marker_bar_event (GdkEvent* event); - gint canvas_imageframe_item_view_event(GdkEvent* event) ; - gint canvas_imageframe_view_event(GdkEvent* event) ; - gint canvas_imageframe_start_handle_event(GdkEvent* event) ; - gint canvas_imageframe_end_handle_event(GdkEvent* event) ; - gint canvas_marker_time_axis_view_event(GdkEvent* event) ; - gint canvas_markerview_item_view_event(GdkEvent* event) ; - gint canvas_markerview_start_handle_event(GdkEvent* event) ; - gint canvas_markerview_end_handle_event(GdkEvent* event) ; - gint canvas_automation_track_event(GdkEvent* event) ; - - - gint canvas_copy_region_event (GdkEvent* event); - gint canvas_playhead_cursor_event (GdkEvent* event); - gint canvas_edit_cursor_event (GdkEvent* event); - gint track_canvas_event (GdkEvent* event); - - gint track_canvas_button_press_event (GdkEventButton *); - gint track_canvas_button_release_event (GdkEventButton *); - - void track_canvas_allocate (GtkAllocation* alloc); - void time_canvas_allocate (GtkAllocation* alloc); + bool canvas_control_point_event (GdkEvent* event,ArdourCanvas::Item*, ControlPoint*); + bool canvas_line_event (GdkEvent* event,ArdourCanvas::Item*, AutomationLine*); + bool canvas_selection_rect_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*); + bool canvas_selection_start_trim_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*); + bool canvas_selection_end_trim_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*); + bool canvas_crossfade_view_event (GdkEvent* event,ArdourCanvas::Item*, CrossfadeView*); + bool canvas_fade_in_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); + 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*, 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*); + bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*); + bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) ; + + bool canvas_tempo_bar_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_meter_bar_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*); + + bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); + bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*); + bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); + bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*); + bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerTimeAxis*); + bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*); + bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*); + bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*); + + /* non-public event handlers */ + + bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*); + bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*); + bool track_canvas_scroll (GdkEventScroll* event); + + bool track_canvas_scroll_event (GdkEventScroll* event); + bool track_canvas_button_press_event (GdkEventButton* event); + bool track_canvas_button_release_event (GdkEventButton* event); + bool track_canvas_motion_notify_event (GdkEventMotion* event); + + Gtk::Allocation canvas_allocation; + bool canvas_idle_queued; + void track_canvas_allocate (Gtk::Allocation alloc); + bool track_canvas_size_allocated (); void set_edit_cursor (GdkEvent* event); void set_playhead_cursor (GdkEvent* event); @@ -1201,31 +1191,25 @@ class Editor : public PublicEditor void kbd_driver (sigc::slot, bool use_track_canvas = true, bool use_time_canvas = true, bool can_select = true); void kbd_set_playhead_cursor (); void kbd_set_edit_cursor (); + void kbd_mute_unmute_region (); void kbd_split (); + void kbd_set_sync_position (); void kbd_align (ARDOUR::RegionPoint); void kbd_align_relative (ARDOUR::RegionPoint); void kbd_brush (); void kbd_audition (); void kbd_do_split (GdkEvent*); + void kbd_do_set_sync_position (GdkEvent* ev); void kbd_do_align (GdkEvent*, ARDOUR::RegionPoint); void kbd_do_align_relative (GdkEvent*, ARDOUR::RegionPoint); 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 (GtkAllocation* alloc = 0); - void scroll_canvas (); + void reset_scrolling_region (Gtk::Allocation* alloc = 0); - /* sub-event loop handling */ - - int32_t sub_event_loop_status; - void run_sub_event_loop (); - void finish_sub_event_loop (int status); - gint finish_sub_event_loop_on_delete (GdkEventAny*, int32_t status); - /* display control */ bool _show_measures; @@ -1233,41 +1217,43 @@ class Editor : public PublicEditor bool _follow_playhead; bool _show_waveforms_recording; - void add_bbt_marks (ARDOUR::TempoMap::BBTPointList&); - ARDOUR::TempoMap::BBTPointList *current_bbt_points; - typedef vector TimeLineList; + typedef vector TimeLineList; TimeLineList free_measure_lines; TimeLineList used_measure_lines; - Gnome::Canvas::Group* time_line_group; - Gnome::Canvas::Line* get_time_line (); + ArdourCanvas::Group* time_line_group; + ArdourCanvas::SimpleLine* get_time_line (); void hide_measures (); void draw_measures (); - void draw_time_bars (); + bool lazy_hide_and_draw_measures (); void new_tempo_section (); - void mouse_add_new_tempo_event (jack_nframes_t where); - void mouse_add_new_meter_event (jack_nframes_t where); + void mouse_add_new_tempo_event (nframes_t where); + void mouse_add_new_meter_event (nframes_t where); - void remove_tempo_marker (Gnome::Canvas::Item*); - void remove_meter_marker (Gnome::Canvas::Item*); + void remove_tempo_marker (ArdourCanvas::Item*); + void remove_meter_marker (ArdourCanvas::Item*); gint real_remove_tempo_marker (ARDOUR::TempoSection*); gint real_remove_meter_marker (ARDOUR::MeterSection*); void edit_tempo_section (ARDOUR::TempoSection*); void edit_meter_section (ARDOUR::MeterSection*); - void edit_tempo_marker (Gnome::Canvas::Item*); - void edit_meter_marker (Gnome::Canvas::Item*); + void edit_tempo_marker (ArdourCanvas::Item*); + void edit_meter_marker (ArdourCanvas::Item*); void marker_menu_edit (); void marker_menu_remove (); void marker_menu_rename (); void marker_menu_hide (); void marker_menu_loop_range (); + void marker_menu_select_all_selectables_using_range (); + void marker_menu_select_using_range (); + void marker_menu_separate_regions_using_location (); void marker_menu_play_from (); + void marker_menu_play_range (); void marker_menu_set_playhead (); void marker_menu_set_from_playhead (); void marker_menu_set_from_selection (); @@ -1276,20 +1262,22 @@ class Editor : public PublicEditor void update_loop_range_view (bool visibility=false); void update_punch_range_view (bool visibility=false); gint new_transport_marker_menu_popdown (GdkEventAny*); - void marker_context_menu (GdkEventButton*, Gnome::Canvas::Item*); - void tm_marker_context_menu (GdkEventButton*, Gnome::Canvas::Item*); - void transport_marker_context_menu (GdkEventButton*, Gnome::Canvas::Item*); - void new_transport_marker_context_menu (GdkEventButton*, Gnome::Canvas::Item*); - void build_marker_menu (); + void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); + void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); + void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); + void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); + void build_range_marker_menu (bool loop_or_punch); + void build_marker_menu (bool start_or_end); void build_tm_marker_menu (); - void build_transport_marker_menu (); void build_new_transport_marker_menu (); Gtk::Menu* tm_marker_menu; Gtk::Menu* marker_menu; + Gtk::Menu* start_end_marker_menu; + Gtk::Menu* range_marker_menu; Gtk::Menu* transport_marker_menu; Gtk::Menu* new_transport_marker_menu; - Gnome::Canvas::Item* marker_menu_item; + ArdourCanvas::Item* marker_menu_item; typedef list Marks; Marks metric_marks; @@ -1298,9 +1286,9 @@ class Editor : public PublicEditor void draw_metric_marks (const ARDOUR::Metrics& metrics); void tempo_map_changed (ARDOUR::Change); - void redisplay_tempo (); + void redisplay_tempo (bool immediate_redraw); - void snap_to (jack_nframes_t& first, int32_t direction = 0, bool for_mark = false); + void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false); uint32_t bbt_beat_subdivision; /* toolbar */ @@ -1309,12 +1297,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; @@ -1326,8 +1309,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; @@ -1345,34 +1328,37 @@ 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; - gint edit_mode_selection_done (GdkEventAny*); + 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; - gint snap_type_selection_done (GdkEventAny*); + std::vector snap_type_strings; + std::vector snap_mode_strings; - Gtk::ComboBoxText snap_mode_selector; - Gtk::Label snap_mode_label; - Gtk::VBox snap_mode_box; + void snap_type_selection_done (); + void snap_mode_selection_done (); + void snap_mode_chosen (Editing::SnapMode); + void snap_type_chosen (Editing::SnapType); - gint snap_mode_selection_done (GdkEventAny*); + Glib::RefPtr snap_type_action (Editing::SnapType); + Glib::RefPtr snap_mode_action (Editing::SnapMode); Gtk::ComboBoxText zoom_focus_selector; - Gtk::Label zoom_focus_label; - Gtk::VBox zoom_focus_box; + Gtk::VBox zoom_focus_box; + + std::vector zoom_focus_strings; - gint zoom_focus_selection_done (GdkEventAny*); + void zoom_focus_selection_done (); + void zoom_focus_chosen (Editing::ZoomFocus); - Gtk::Label zoom_indicator_label; - Gtk::HBox zoom_indicator_box; - Gtk::VBox zoom_indicator_vbox; + Glib::RefPtr zoom_focus_action (Editing::ZoomFocus); + + Gtk::HBox zoom_box; - void update_zoom_indicator (); void zoom_adjustment_changed(); void edit_cursor_clock_changed(); @@ -1393,8 +1379,6 @@ class Editor : public PublicEditor void track_selection_changed (); void region_selection_changed (); void point_selection_changed (); - void audio_track_selection_changed (); - void line_selection_changed (); enum SelectionOp { CreateSelection, @@ -1403,20 +1387,16 @@ class Editor : public PublicEditor SelectionMove } selection_op; - void start_selection_op (Gnome::Canvas::Item* item, GdkEvent* event, SelectionOp); - void drag_selection (Gnome::Canvas::Item* item, GdkEvent* event); - void end_selection_op (Gnome::Canvas::Item* item, GdkEvent* event); + void start_selection_op (ArdourCanvas::Item* item, GdkEvent* event, SelectionOp); + void drag_selection (ArdourCanvas::Item* item, GdkEvent* event); + void end_selection_op (ArdourCanvas::Item* item, GdkEvent* event); void cancel_selection (); void region_selection_op (void (ARDOUR::Region::*pmf)(void)); void region_selection_op (void (ARDOUR::Region::*pmf)(void*), void*); void region_selection_op (void (ARDOUR::Region::*pmf)(bool), bool); - bool audio_region_selection_covers (jack_nframes_t where); - - Gtk::VPaned route_group_vpane; - Gtk::Frame route_list_frame; - Gtk::Frame edit_group_list_frame; + bool audio_region_selection_covers (nframes_t where); /* transport range select process */ enum RangeMarkerOp { @@ -1424,27 +1404,27 @@ class Editor : public PublicEditor CreateTransportMarker } range_marker_op; - void start_range_markerbar_op (Gnome::Canvas::Item* item, GdkEvent* event, RangeMarkerOp); - void drag_range_markerbar_op (Gnome::Canvas::Item* item, GdkEvent* event); - void end_range_markerbar_op (Gnome::Canvas::Item* item, GdkEvent* event); + void start_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event, RangeMarkerOp); + void drag_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event); + void end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event); - Gnome::Canvas::SimpleRect* range_bar_drag_rect; - Gnome::Canvas::SimpleRect* transport_bar_drag_rect; - Gnome::Canvas::Line* marker_drag_line; - Gnome::Canvas::Points* marker_drag_line_points; - Gnome::Canvas::SimpleRect* range_marker_drag_rect; + ArdourCanvas::SimpleRect* range_bar_drag_rect; + ArdourCanvas::SimpleRect* transport_bar_drag_rect; + ArdourCanvas::Line* marker_drag_line; + ArdourCanvas::Points marker_drag_line_points; + ArdourCanvas::SimpleRect* range_marker_drag_rect; void update_marker_drag_item (ARDOUR::Location *); - Gnome::Canvas::SimpleRect *transport_bar_range_rect; - Gnome::Canvas::SimpleRect *transport_bar_preroll_rect; - Gnome::Canvas::SimpleRect *transport_bar_postroll_rect; - Gnome::Canvas::SimpleRect *transport_loop_range_rect; - Gnome::Canvas::SimpleRect *transport_punch_range_rect; - Gnome::Canvas::Line *transport_punchin_line; - Gnome::Canvas::Line *transport_punchout_line; - Gnome::Canvas::SimpleRect *transport_preroll_rect; - Gnome::Canvas::SimpleRect *transport_postroll_rect; + ArdourCanvas::SimpleRect *transport_bar_range_rect; + ArdourCanvas::SimpleRect *transport_bar_preroll_rect; + ArdourCanvas::SimpleRect *transport_bar_postroll_rect; + ArdourCanvas::SimpleRect *transport_loop_range_rect; + ArdourCanvas::SimpleRect *transport_punch_range_rect; + ArdourCanvas::SimpleLine *transport_punchin_line; + ArdourCanvas::SimpleLine *transport_punchout_line; + ArdourCanvas::SimpleRect *transport_preroll_rect; + ArdourCanvas::SimpleRect *transport_postroll_rect; ARDOUR::Location* transport_loop_location(); ARDOUR::Location* transport_punch_location(); @@ -1453,61 +1433,79 @@ class Editor : public PublicEditor /* object rubberband select process */ - void start_rubberband_select (Gnome::Canvas::Item* item, GdkEvent* event); - void drag_rubberband_select (Gnome::Canvas::Item* item, GdkEvent* event); - void end_rubberband_select (Gnome::Canvas::Item* item, GdkEvent* event); + void start_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event); + void drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event); + void end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event); - bool select_all_within (jack_nframes_t start, jack_nframes_t end, gdouble topy, gdouble boty, bool add); + bool select_all_within (nframes_t start, nframes_t end, gdouble topy, gdouble boty, const TrackViewList&, Selection::Operation op); - Gnome::Canvas::Item *rubberband_rect; + ArdourCanvas::SimpleRect *rubberband_rect; /* mouse zoom process */ - void start_mouse_zoom (Gnome::Canvas::Item* item, GdkEvent* event); - void drag_mouse_zoom (Gnome::Canvas::Item* item, GdkEvent* event); - void end_mouse_zoom (Gnome::Canvas::Item* item, GdkEvent* event); + void start_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event); + void drag_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event); + void end_mouse_zoom (ArdourCanvas::Item* item, GdkEvent* event); - Gnome::Canvas::Item *zoom_rect; - void reposition_zoom_rect (jack_nframes_t start, jack_nframes_t end); + ArdourCanvas::SimpleRect *zoom_rect; + void reposition_zoom_rect (nframes_t start, nframes_t end); /* diskstream/route display management */ struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { RouteDisplayModelColumns() { add (text); + add (visible); add (tv); } Gtk::TreeModelColumn text; - Gtk::TreeModelColumn tv; + Gtk::TreeModelColumn visible; + Gtk::TreeModelColumn tv; }; - RouteDisplayModelColumns route_display_columns; - Glib::RefPtr route_display_model; + RouteDisplayModelColumns route_display_columns; + Glib::RefPtr route_display_model; Glib::RefPtr route_display_selection; - gint route_list_compare_func (Gtk::TreeModel::iterator, Gtk::TreeModel::iterator); - Gtk::TreeView route_list; //GTK2FIX rename to route_display - Gtk::ScrolledWindow route_list_scroller; - Gtk::Menu *route_list_menu; + Gtkmm2ext::DnDTreeView > route_list_display; + Gtk::ScrolledWindow route_list_scroller; + Gtk::Menu* route_list_menu; + + bool route_list_display_button_press (GdkEventButton*); + bool route_list_selection_filter (const Glib::RefPtr& model, const Gtk::TreeModel::Path& path, bool yn); + + void route_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); + void route_list_delete (const Gtk::TreeModel::Path&); + void initial_route_list_display (); + void redisplay_route_list(); + void route_list_reordered (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* what); + bool ignore_route_list_reorder; + bool no_route_list_redisplay; - void route_list_column_click (); void build_route_list_menu (); - void select_all_routes (); - void unselect_all_routes (); - void select_all_audiotracks (); - void unselect_all_audiotracks (); - void select_all_audiobus (); - void unselect_all_audiobus (); + void show_route_list_menu (); + + void show_all_routes (); + void hide_all_routes (); + void show_all_audiotracks (); + void hide_all_audiotracks (); + void show_all_audiobus (); + void hide_all_audiobus (); + + void set_all_tracks_visibility (bool yn); + void set_all_audio_visibility (int type, bool yn); /* edit group management */ struct GroupListModelColumns : public Gtk::TreeModel::ColumnRecord { GroupListModelColumns () { add (is_active); + add (is_visible); add (text); add (routegroup); } Gtk::TreeModelColumn is_active; + Gtk::TreeModelColumn is_visible; Gtk::TreeModelColumn text; Gtk::TreeModelColumn routegroup; }; @@ -1516,41 +1514,37 @@ class Editor : public PublicEditor Glib::RefPtr group_model; Glib::RefPtr group_selection; - Gtk::Button edit_group_list_button; - Gtk::Label edit_group_list_button_label; - Gtk::TreeView edit_group_list; - Gtk::ScrolledWindow edit_group_list_scroller; - Gtk::Menu *edit_group_list_menu; - Gtk::VBox edit_group_vbox; + Gtk::TreeView edit_group_display; + Gtk::ScrolledWindow edit_group_display_scroller; + Gtk::Menu* edit_group_list_menu; - void edit_group_list_column_click (gint); void build_edit_group_list_menu (); - void select_all_edit_groups (); - void unselect_all_edit_groups (); + void activate_all_edit_groups (); + void disable_all_edit_groups (); + + bool in_edit_group_row_change; + void edit_group_row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&); + void edit_group_name_edit (const Glib::ustring&, const Glib::ustring&); void new_edit_group (); void edit_group_list_button_clicked (); gint edit_group_list_button_press_event (GdkEventButton* ev); - void edit_group_selection_changed (); - void fake_add_edit_group (ARDOUR::RouteGroup* group); void add_edit_group (ARDOUR::RouteGroup* group); + void remove_selected_edit_group (); + void edit_groups_changed (); void group_flags_changed (void*, ARDOUR::RouteGroup*); Gtk::VBox list_vpacker; - static GdkPixmap* check_pixmap; - static GdkBitmap* check_mask; - static GdkPixmap* empty_pixmap; - static GdkBitmap* empty_mask; - /* autoscrolling */ + bool autoscroll_active; int autoscroll_timeout_tag; int autoscroll_direction; uint32_t autoscroll_cnt; - jack_nframes_t autoscroll_distance; + nframes_t autoscroll_distance; static gint _autoscroll_canvas (void *); - gint autoscroll_canvas (); + bool autoscroll_canvas (); void start_canvas_autoscroll (int direction); void stop_canvas_autoscroll (); void maybe_autoscroll (GdkEvent*); @@ -1562,15 +1556,15 @@ class Editor : public PublicEditor ContentsTrim, } trim_op; - void start_trim (Gnome::Canvas::Item*, GdkEvent*); + void start_trim (ArdourCanvas::Item*, GdkEvent*); void point_trim (GdkEvent*); - void trim_motion_callback (Gnome::Canvas::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 trim_motion_callback (ArdourCanvas::Item*, GdkEvent*); + void single_contents_trim (RegionView&, nframes_t, bool, bool, bool); + void single_start_trim (RegionView&, nframes_t, bool, bool); + void single_end_trim (RegionView&, nframes_t, bool, bool); - void trim_finished_callback (Gnome::Canvas::Item*, GdkEvent*); - void thaw_region_after_trim (AudioRegionView& rv); + void trim_finished_callback (ArdourCanvas::Item*, GdkEvent*); + void thaw_region_after_trim (RegionView& rv); void trim_region_to_edit_cursor (); void trim_region_from_edit_cursor (); @@ -1579,43 +1573,60 @@ class Editor : public PublicEditor /* Drag-n-Drop */ - int convert_drop_to_paths (std::vector& paths, - GdkDragContext *context, + int convert_drop_to_paths (std::vector& paths, + const Glib::RefPtr& context, gint x, gint y, - GtkSelectionData *data, + const Gtk::SelectionData& data, guint info, guint time); - void track_canvas_drag_data_received (GdkDragContext *context, + void track_canvas_drag_data_received (const Glib::RefPtr& context, gint x, gint y, - GtkSelectionData *data, + const Gtk::SelectionData& data, guint info, guint time); - - void region_list_display_drag_data_received (GdkDragContext *context, + + void region_list_display_drag_data_received (const Glib::RefPtr& context, gint x, gint y, - GtkSelectionData *data, + const Gtk::SelectionData& data, guint info, guint time); - + + + void drop_paths (const Glib::RefPtr& context, + gint x, + gint y, + const Gtk::SelectionData& data, + guint info, + guint time); + + void drop_regions (const Glib::RefPtr& context, + gint x, + gint y, + const Gtk::SelectionData& data, + guint info, + guint time); + /* audio export */ ExportDialog *export_dialog; - void export_range (jack_nframes_t start, jack_nframes_t end); + ExportDialog *export_range_markers_dialog; + + void export_range (nframes_t start, nframes_t end); + void export_range_markers (); - int write_region_selection(AudioRegionSelection&); - bool write_region (string path, ARDOUR::AudioRegion&); + int write_region_selection(RegionSelection&); + bool write_region (string path, boost::shared_ptr); void export_region (); - void write_a_region (); void bounce_region_selection (); void bounce_range_selection (); 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 (); @@ -1623,19 +1634,19 @@ 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 (string cmd_name); - void commit_reversible_visual_command (); void update_title (); - void update_title_s (string snapshot_name); + void update_title_s (const string & snapshot_name); struct State { Selection* selection; @@ -1650,7 +1661,7 @@ class Editor : public PublicEditor void instant_save (); - ARDOUR::AudioRegion* last_audition_region; + boost::shared_ptr last_audition_region; /* freeze operations */ @@ -1671,27 +1682,21 @@ class Editor : public PublicEditor void duplicate_dialog (bool for_region); - /* edit menu */ - - Gtk::Menu* edit_menu; - void edit_menu_map_handler (); + nframes_t event_frame (GdkEvent*, double* px = 0, double* py = 0); - jack_nframes_t event_frame (GdkEvent*, double* px = 0, double* py = 0); - - void time_fx_motion (Gnome::Canvas::Item*, GdkEvent*); - void start_time_fx (Gnome::Canvas::Item*, GdkEvent*); - void end_time_fx (Gnome::Canvas::Item*, GdkEvent*); + void time_fx_motion (ArdourCanvas::Item*, GdkEvent*); + void start_time_fx (ArdourCanvas::Item*, GdkEvent*); + void end_time_fx (ArdourCanvas::Item*, GdkEvent*); 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; @@ -1712,12 +1717,13 @@ 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 */ MixerStrip *current_mixer_strip; + bool show_editor_mixer_when_tracks_arrive; Gtk::VBox current_mixer_strip_vbox; void cms_deleted (); void current_mixer_strip_hidden (); @@ -1735,50 +1741,49 @@ class Editor : public PublicEditor bool _xfade_visibility; /* */ - void handle_new_imageframe_time_axis_view(std::string track_name, void* src) ; - void handle_new_imageframe_marker_time_axis_view(std::string track_name, TimeAxisView* marked_track) ; - - void start_imageframe_grab(Gnome::Canvas::Item*, GdkEvent*) ; - void start_markerview_grab(Gnome::Canvas::Item*, GdkEvent*) ; - - void imageframe_drag_motion_callback(Gnome::Canvas::Item*, GdkEvent*) ; - void markerview_drag_motion_callback(Gnome::Canvas::Item*, GdkEvent*) ; - void timeaxis_item_drag_finished_callback(Gnome::Canvas::Item*, GdkEvent*) ; - - gint canvas_imageframe_item_view_event(Gnome::Canvas::Item* item, GdkEvent* event, ImageFrameView* ifv); - gint canvas_imageframe_view_event(Gnome::Canvas::Item* item, GdkEvent* event, ImageFrameTimeAxis* ifta); - gint canvas_imageframe_start_handle_event(Gnome::Canvas::Item* item, GdkEvent* event, ImageFrameView* ifv); - gint canvas_imageframe_end_handle_event(Gnome::Canvas::Item* item, GdkEvent* event, ImageFrameView* ifv); - - gint canvas_marker_time_axis_view_event(Gnome::Canvas::Item* item, GdkEvent* event, MarkerTimeAxis* mta); - gint canvas_markerview_item_view_event(Gnome::Canvas::Item* item, GdkEvent* event, MarkerView* mv); - gint canvas_markerview_start_handle_event(Gnome::Canvas::Item* item, GdkEvent* event, MarkerView* mv); - gint canvas_markerview_end_handle_event(Gnome::Canvas::Item* item, GdkEvent* event, MarkerView* mv); - - void imageframe_start_handle_op(Gnome::Canvas::Item* item, GdkEvent* event) ; - void imageframe_end_handle_op(Gnome::Canvas::Item* item, GdkEvent* event) ; - void imageframe_start_handle_trim_motion(Gnome::Canvas::Item* item, GdkEvent* event) ; - void imageframe_start_handle_end_trim(Gnome::Canvas::Item* item, GdkEvent* event) ; - void imageframe_end_handle_trim_motion(Gnome::Canvas::Item* item, GdkEvent* event) ; - void imageframe_end_handle_end_trim(Gnome::Canvas::Item* item, GdkEvent* event) ; + void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ; + void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ; + + void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ; + void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ; + + void imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent*) ; + void markerview_drag_motion_callback(ArdourCanvas::Item*, GdkEvent*) ; + void timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent*) ; + + gint canvas_imageframe_item_view_event(ArdourCanvas::Item* item, GdkEvent* event, ImageFrameView* ifv); + gint canvas_imageframe_view_event(ArdourCanvas::Item* item, GdkEvent* event, ImageFrameTimeAxis* ifta); + gint canvas_imageframe_start_handle_event(ArdourCanvas::Item* item, GdkEvent* event, ImageFrameView* ifv); + gint canvas_imageframe_end_handle_event(ArdourCanvas::Item* item, GdkEvent* event, ImageFrameView* ifv); + + gint canvas_marker_time_axis_view_event(ArdourCanvas::Item* item, GdkEvent* event, MarkerTimeAxis* mta); + gint canvas_markerview_item_view_event(ArdourCanvas::Item* item, GdkEvent* event, MarkerView* mv); + gint canvas_markerview_start_handle_event(ArdourCanvas::Item* item, GdkEvent* event, MarkerView* mv); + gint canvas_markerview_end_handle_event(ArdourCanvas::Item* item, GdkEvent* event, MarkerView* mv); + + void imageframe_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; + void imageframe_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; + void imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; + void imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; + void imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; + void imageframe_end_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; - void markerview_item_start_handle_op(Gnome::Canvas::Item* item, GdkEvent* event) ; - void markerview_item_end_handle_op(Gnome::Canvas::Item* item, GdkEvent* event) ; - void markerview_start_handle_trim_motion(Gnome::Canvas::Item* item, GdkEvent* event) ; - void markerview_start_handle_end_trim(Gnome::Canvas::Item* item, GdkEvent* event) ; - void markerview_end_handle_trim_motion(Gnome::Canvas::Item* item, GdkEvent* event) ; - void markerview_end_handle_end_trim(Gnome::Canvas::Item* item, GdkEvent* event) ; + void markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; + void markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event) ; + void markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; + void markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; + void markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event) ; + void markerview_end_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event) ; - void popup_imageframe_edit_menu(int button, int32_t time, Gnome::Canvas::Item* ifv, bool with_frame) ; - void popup_marker_time_axis_edit_menu(int button, int32_t time, Gnome::Canvas::Item* ifv, bool with_frame) ; + void popup_imageframe_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_frame) ; + void popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_frame) ; ImageFrameSocketHandler* image_socket_listener ; /* */ - void toggle_xfade_active (ARDOUR::Crossfade*); - void toggle_xfade_length (ARDOUR::Crossfade*); - void edit_xfade (ARDOUR::Crossfade*); - void remove_xfade (); + void toggle_xfade_active (boost::weak_ptr); + void toggle_xfade_length (boost::weak_ptr); + void edit_xfade (boost::weak_ptr); void xfade_edit_left_region (); void xfade_edit_right_region (); @@ -1791,10 +1796,9 @@ 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); + nframes_t get_nudge_distance (nframes_t pos, nframes_t& next); /* audio filters */ @@ -1802,7 +1806,7 @@ class Editor : public PublicEditor /* handling cleanup */ - int playlist_deletion_dialog (ARDOUR::Playlist*); + int playlist_deletion_dialog (boost::shared_ptr); vector session_connections; @@ -1814,24 +1818,33 @@ 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; void toggle_gain_envelope_visibility (); void toggle_gain_envelope_active (); + void reset_region_gain_envelopes (); + + Gtk::CheckMenuItem* region_envelope_visible_item; + Gtk::CheckMenuItem* region_envelope_active_item; + Gtk::CheckMenuItem* region_mute_item; + Gtk::CheckMenuItem* region_lock_item; + Gtk::CheckMenuItem* region_opaque_item; - typedef std::map ColorStyleMap; - void init_colormap (); + bool on_key_press_event (GdkEventKey*); + + void session_state_saved (string); - /* GTK2 stuff */ + Glib::RefPtr undo_action; + Glib::RefPtr redo_action; - Glib::RefPtr ui_manager; + void history_changed (); }; #endif /* __ardour_editor_h__ */