X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpublic_editor.h;h=f672ea180d01c2c0ee66174902e50b571939e458;hb=76c25a4a4459b8e550c3c687458d04db0beaee77;hp=f85210327c38860687b6326a155a7959a66e7cfb;hpb=00bf20c236d38a754e62c74cec3518aeec70d78a;p=ardour.git

diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index f85210327c..f672ea180d 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -11,9 +11,12 @@
 #include <jack/types.h>
 #include <sigc++/signal.h>
 
+#include <pbd/statefuldestructible.h> 
+
 #include "editing.h"
 #include "keyboard_target.h"
 #include "canvas.h"
+#include "selection.h"
 
 namespace ARDOUR {
 	class Session;
@@ -51,7 +54,7 @@ class ImageFrameView;
 class ImageFrameTimeAxis;
 class MarkerView;
 
-class PublicEditor : public Gtk::Window, public Stateful {
+class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway {
   public:
 	PublicEditor();
 	virtual ~PublicEditor();
@@ -75,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;
@@ -83,14 +86,14 @@ class PublicEditor : public Gtk::Window, public Stateful {
 	virtual void new_region_from_selection () = 0;
 	virtual void separate_region_from_selection () = 0;
 	virtual void toggle_playback (bool with_abort) = 0;
-	virtual void set_edit_menu (Gtk::Menu&) = 0;
-	virtual jack_nframes_t unit_to_frame (double unit) = 0;
-	virtual double frame_to_unit (jack_nframes_t frame) = 0;
+	virtual nframes_t unit_to_frame (double unit) = 0;
+	virtual double frame_to_unit (nframes_t frame) = 0;
 	virtual double frame_to_unit (double frame) = 0;
-	virtual jack_nframes_t pixel_to_frame (double pixel) = 0;
-	virtual gulong frame_to_pixel (jack_nframes_t frame) = 0;
+	virtual nframes_t pixel_to_frame (double pixel) = 0;
+	virtual gulong frame_to_pixel (nframes_t frame) = 0;
 	virtual Selection& get_selection() const = 0;
 	virtual Selection& get_cut_buffer() const = 0;
+	virtual bool extend_selection_to_track (TimeAxisView&) = 0;
 	virtual void play_selection () = 0;
 	virtual void set_show_measures (bool yn) = 0;
 	virtual bool show_measures () const = 0;
@@ -104,26 +107,29 @@ class PublicEditor : public Gtk::Window, public Stateful {
 	virtual gdouble   get_current_zoom () = 0;
 	virtual PlaylistSelector& playlist_selector() const = 0;
 	virtual void route_name_changed (TimeAxisView *) = 0;
-	virtual void clear_playlist (ARDOUR::Playlist&) = 0;
+	virtual void clear_playlist (boost::shared_ptr<ARDOUR::Playlist>) = 0;
 	virtual void new_playlists () = 0;
 	virtual void copy_playlists () = 0;
 	virtual void clear_playlists () = 0;
+	virtual bool set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove = false) = 0;
 	virtual void set_selected_mixer_strip (TimeAxisView&) = 0;
 	virtual void hide_track_in_display (TimeAxisView& tv) = 0;
+	virtual void show_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 bool dragging_playhead() 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;
-	virtual jack_nframes_t leftmost_position() const = 0;
-	virtual jack_nframes_t current_page_frames() const = 0;
+	virtual nframes_t leftmost_position() const = 0;
+	virtual nframes_t current_page_frames() const = 0;
 	virtual void temporal_zoom_step (bool coarser) = 0;
 	virtual void scroll_tracks_down_line () = 0;
 	virtual void scroll_tracks_up_line () = 0;
 	virtual bool new_regionviews_display_gain () = 0;
 	virtual void prepare_for_cleanup () = 0;
-	virtual void reposition_x_origin (jack_nframes_t frame) = 0;
+	virtual void reset_x_origin (nframes_t frame) = 0;
 	virtual void remove_last_capture () = 0;
 	virtual void maximise_editing_space() = 0;
 	virtual void restore_editing_space() = 0;
@@ -133,6 +139,8 @@ class PublicEditor : public Gtk::Window, public Stateful {
 	sigc::signal<void> ZoomChanged;
 	sigc::signal<void> Resized;
 	sigc::signal<void> Realized;
+	sigc::signal<void> GoingAway;
+	sigc::signal<void,nframes_t> UpdateAllTransportClocks;
 
 	Glib::RefPtr<Gtk::ActionGroup> editor_actions;