diff options
| author | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
| commit | 82232f06ba3eea4a2b4342ad91fab552f4044402 (patch) | |
| tree | d517cb47c017f51e2ecd9450624b86eb70d9f97b /gtk2_ardour/public_editor.h | |
| parent | 25d1670a61d19e795227b939a98be9cf5a050c67 (diff) | |
Merged with trunk R861
Possible new bugs - not very thoroughly tested, but at least functional at first glance
git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/public_editor.h')
| -rw-r--r-- | gtk2_ardour/public_editor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index cb3d62f625..a37e33bede 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -11,6 +11,8 @@ #include <jack/types.h> #include <sigc++/signal.h> +#include <pbd/statefuldestructible.h> + #include "editing.h" #include "keyboard_target.h" #include "canvas.h" @@ -52,7 +54,7 @@ class ImageFrameView; class ImageFrameTimeAxis; class MarkerView; -class PublicEditor : public Gtk::Window, public Stateful { +class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { public: PublicEditor(); virtual ~PublicEditor(); @@ -76,7 +78,7 @@ class PublicEditor : public Gtk::Window, public Stateful { virtual void connect_to_image_compositor() = 0; virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0; virtual TimeAxisView* get_named_time_axis(const string & name) = 0; - virtual void consider_auditioning (ARDOUR::Region&) = 0; + virtual void consider_auditioning (boost::shared_ptr<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; |