X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Feditor.h;h=919d6e0781c249f032e37661cc8d25a0ee32d30c;hb=6d0907089550571628b35774c371f2bbdd576fef;hp=6c0a52fa4278270928e5ad06dc9db7e3b5962233;hpb=40944574c620868b43872f64600a8a42d382a6a1;p=ardour.git diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6c0a52fa42..919d6e0781 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -43,7 +43,6 @@ #include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/stateful_button.h" #include "gtkmm2ext/bindings.h" -#include "gtkmm2ext/visibility_tracker.h" #include "pbd/stateful.h" #include "pbd/signals.h" @@ -137,7 +136,7 @@ class TimeSelection; class RegionLayeringOrderEditor; class VerboseCursor; -class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker +class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: Editor (); @@ -189,14 +188,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_internal_edit (bool yn); bool toggle_internal_editing_from_double_click (GdkEvent*); -#ifdef WITH_CMT - 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(const std::string & name) ; -#endif /* WITH_CMT */ - void foreach_time_axis_view (sigc::slot); void add_to_idle_resize (TimeAxisView*, int32_t); @@ -926,6 +917,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Glib::RefPtr xjadeo_zoom_100; void set_xjadeo_proc (); void toggle_xjadeo_proc (int state=-1); + void set_close_video_sensitive (bool onoff); void set_xjadeo_sensitive (bool onoff); void set_xjadeo_viewoption (int); void toggle_xjadeo_viewoption (int what, int state=-1); @@ -1454,15 +1446,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void queue_visual_videotimeline_update (); void embed_audio_from_video (std::string, framepos_t n = 0); - 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*); - PBD::Signal0 EditorFreeze; PBD::Signal0 EditorThaw; @@ -1912,47 +1895,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void nudge_track (bool use_edit_point, bool forwards); -#ifdef WITH_CMT - void handle_new_imageframe_time_axis_view(const std::string & track_name, void* src) ; - void handle_new_imageframe_marker_time_axis_view(const std::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(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, 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 ; -#endif - static const int32_t default_width = 995; static const int32_t default_height = 765;