X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=f70e4c20bd5ee163f2bbf7ea2ccfe581d21194bc;hb=0a24970b4eeb84a3313755266872b1981c708d95;hp=756ec028aee16f89df8dfed6589a4eb9533510cb;hpb=08a6f9bbb52ef117c0b72555f0ba722d8215fb1b;p=ardour.git diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 756ec028ae..f70e4c20bd 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -38,21 +39,25 @@ class AutomationLine; class ControlPoint; class SelectionRect; class CrossfadeView; -class AudioTimeAxisView; +class RouteTimeAxisView; class AudioRegionView; class TempoMarker; class MeterMarker; class Marker; class AutomationTimeAxisView; +class MarkerTimeAxis; +class ImageFrameView; +class ImageFrameTimeAxis; +class MarkerView; -class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget { +class PublicEditor : public Gtk::Window, public Stateful { public: PublicEditor(); virtual ~PublicEditor(); typedef list TrackViewList; - static PublicEditor* instance() { return _instance; } + static PublicEditor& instance() { return *_instance; } virtual void connect_to_session (ARDOUR::Session*) = 0; virtual ARDOUR::Session* current_session() const = 0; @@ -64,11 +69,11 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual void set_mouse_mode (Editing::MouseMode, bool force = false) = 0; virtual void step_mouse_mode (bool next) = 0; virtual Editing::MouseMode current_mouse_mode () = 0; - virtual void add_imageframe_time_axis(std::string track_name, void*) = 0; - virtual void add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void*) = 0; + virtual void add_imageframe_time_axis(const string & track_name, void*) = 0; + virtual void add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void*) = 0; virtual void connect_to_image_compositor() = 0; virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0; - virtual TimeAxisView* get_named_time_axis(std::string name) = 0; + virtual TimeAxisView* get_named_time_axis(const string & name) = 0; virtual void consider_auditioning (ARDOUR::Region&) = 0; virtual void set_show_waveforms (bool yn) = 0; virtual bool show_waveforms() const = 0; @@ -90,6 +95,8 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual bool show_measures () const = 0; virtual void export_session() = 0; virtual void export_selection() = 0; + virtual void export_range_markers() = 0; + virtual void register_actions() = 0; virtual void add_toplevel_controls (Gtk::Container&) = 0; virtual void set_zoom_focus (Editing::ZoomFocus) = 0; virtual Editing::ZoomFocus get_zoom_focus () const = 0; @@ -97,14 +104,14 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual PlaylistSelector& playlist_selector() const = 0; virtual void route_name_changed (TimeAxisView *) = 0; virtual void clear_playlist (ARDOUR::Playlist&) = 0; + virtual void new_playlists () = 0; + virtual void copy_playlists () = 0; + virtual void clear_playlists () = 0; virtual void set_selected_mixer_strip (TimeAxisView&) = 0; - virtual void unselect_strip_in_display (TimeAxisView& tv) = 0; + virtual void hide_track_in_display (TimeAxisView& tv) = 0; virtual void set_follow_playhead (bool yn) = 0; virtual void toggle_follow_playhead () = 0; virtual bool follow_playhead() const = 0; - virtual void toggle_xfade_visibility () = 0; - virtual void set_xfade_visibility (bool yn) = 0; - virtual bool xfade_visibility() const = 0; virtual void ensure_float (Gtk::Window&) = 0; virtual void show_window () = 0; virtual TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0) = 0; @@ -117,14 +124,16 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual void prepare_for_cleanup () = 0; virtual void reposition_x_origin (jack_nframes_t frame) = 0; virtual void remove_last_capture () = 0; + virtual void maximise_editing_space() = 0; + virtual void restore_editing_space() = 0; sigc::signal DisplayControlChanged; sigc::signal ZoomFocusChanged; sigc::signal ZoomChanged; - sigc::signal XOriginChanged; sigc::signal Resized; + sigc::signal Realized; - // FIXED FOR GTK2 + Glib::RefPtr editor_actions; virtual bool canvas_control_point_event (GdkEvent* event,ArdourCanvas::Item*, ControlPoint*) = 0; virtual bool canvas_line_event (GdkEvent* event,ArdourCanvas::Item*, AutomationLine*) = 0; @@ -136,10 +145,10 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; virtual bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; virtual bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; - virtual bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; - virtual bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; - virtual bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0; - virtual bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, AudioTimeAxisView*) = 0; + virtual bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*) = 0; + virtual bool canvas_stream_view_event (GdkEvent* event,ArdourCanvas::Item*, RouteTimeAxisView*) = 0; virtual bool canvas_marker_event (GdkEvent* event,ArdourCanvas::Item*, Marker*) = 0; virtual bool canvas_zoom_rect_event (GdkEvent* event,ArdourCanvas::Item*) = 0; virtual bool canvas_tempo_marker_event (GdkEvent* event,ArdourCanvas::Item*, TempoMarker*) = 0; @@ -152,18 +161,16 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget virtual bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; virtual bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; - // PENDING - - virtual gint canvas_imageframe_item_view_event(GdkEvent* event) = 0; - virtual gint canvas_imageframe_view_event(GdkEvent* event) = 0; - virtual gint canvas_imageframe_start_handle_event(GdkEvent* event) = 0; - virtual gint canvas_imageframe_end_handle_event(GdkEvent* event) = 0; - virtual gint canvas_marker_time_axis_view_event(GdkEvent* event) = 0; - virtual gint canvas_markerview_item_view_event(GdkEvent* event) = 0; - virtual gint canvas_markerview_start_handle_event(GdkEvent* event) = 0; - virtual gint canvas_markerview_end_handle_event(GdkEvent* event) = 0; + virtual bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; + virtual bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*) = 0; + virtual bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; + virtual bool canvas_imageframe_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; + virtual bool canvas_marker_time_axis_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerTimeAxis*) = 0; + virtual bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; + virtual bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; + virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; static PublicEditor* _instance; }; -#endif // __gtk_ardour_public_editor_h__ +#endif // __gtk_ardour_public_editor_h__