Added comment explaining new Gtk::Dialog idiom.

[ardour.git] / gtk2_ardour / public_editor.h

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index d75abb1d007308a4c876e887c750255fdbb5b5e8..9e73596b9f5fe1d07a86ee8db30faca05fd4dff6 100644 (file)
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -6,18 +6,18 @@
 #include <string>
 #include <glib.h>
 #include <gdk/gdktypes.h>
-#include <gtk-canvas.h>
 #include <gtkmm/window.h>
 #include <jack/types.h>
 #include <sigc++/signal.h>
 
 #include "editing.h"
 #include "keyboard_target.h"
+#include "canvas.h"
 
 namespace ARDOUR {
        class Session;
        class AudioExportSpecification;
-       class AudioRegion;
+       class Region;
        class Playlist;
        class RouteGroup;
 }
@@ -34,15 +34,29 @@ class PluginSelector;
 class PlaylistSelector;
 class XMLNode;
 class Selection;
+class AutomationLine;
+class ControlPoint;
+class SelectionRect;
+class CrossfadeView;
+class AudioTimeAxisView;
+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<TimeAxisView *> 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;
@@ -59,7 +73,7 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget
        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 bool consider_auditioning (ARDOUR::AudioRegion*) = 0;
+       virtual void consider_auditioning (ARDOUR::Region&) = 0;
        virtual void set_show_waveforms (bool yn) = 0;
        virtual bool show_waveforms() const = 0;
        virtual void set_show_waveforms_recording (bool yn) = 0;
@@ -80,6 +94,7 @@ 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 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;
@@ -114,72 +129,42 @@ class PublicEditor : public Gtk::Window, public Stateful, public KeyboardTarget
        sigc::signal<void> XOriginChanged;
        sigc::signal<void> Resized;
 
-       static gint canvas_crossfade_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_fade_in_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_fade_in_handle_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_fade_out_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_fade_out_handle_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_region_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_region_view_name_highlight_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_region_view_name_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_stream_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_zoom_rect_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_selection_rect_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_selection_start_trim_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_selection_end_trim_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_control_point_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_line_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_tempo_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_meter_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_tempo_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_meter_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_range_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_transport_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data);
-       static gint canvas_imageframe_item_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data) ;
-       static gint canvas_imageframe_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data) ;
-       static gint canvas_imageframe_start_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_imageframe_end_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_marker_time_axis_view_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_markerview_item_view_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_markerview_start_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_markerview_end_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-       static gint canvas_automation_track_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) ;
-
-  protected:
-       virtual gint _canvas_fade_in_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_fade_in_handle_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_fade_out_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_fade_out_handle_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_crossfade_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_region_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_region_view_name_highlight_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_region_view_name_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_stream_view_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_zoom_rect_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_selection_rect_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_selection_start_trim_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_selection_end_trim_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_control_point_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_line_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_tempo_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_meter_marker_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_tempo_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_meter_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_range_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_transport_marker_bar_event (GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_imageframe_item_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_imageframe_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_imageframe_start_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_imageframe_end_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_marker_time_axis_view_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_markerview_item_view_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_markerview_start_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_markerview_end_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
-       virtual gint _canvas_automation_track_event(GtkCanvasItem* item, GdkEvent* event, gpointer data) = 0;
+       // FIXED FOR GTK2
+
+       virtual bool canvas_control_point_event (GdkEvent* event,ArdourCanvas::Item*, ControlPoint*) = 0;
+       virtual bool canvas_line_event (GdkEvent* event,ArdourCanvas::Item*, AutomationLine*) = 0;
+       virtual bool canvas_selection_rect_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*) = 0;
+       virtual bool canvas_selection_start_trim_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*) = 0;
+       virtual bool canvas_selection_end_trim_event (GdkEvent* event,ArdourCanvas::Item*, SelectionRect*) = 0;
+       virtual bool canvas_crossfade_view_event (GdkEvent* event,ArdourCanvas::Item*, CrossfadeView*) = 0;
+       virtual bool canvas_fade_in_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*) = 0;
+       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_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;
+       virtual bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*) = 0;
+       virtual bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*) = 0;
+
+       virtual bool canvas_tempo_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
+       virtual bool canvas_meter_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
+       virtual bool canvas_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
+       virtual bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
+       virtual bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 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;
 };