fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc

git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 33 deletions

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 57574d82ba..06d9b6035f 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -56,6 +56,7 @@
 #include "enums.h"
 #include "region_selection.h"
 #include "canvas.h"
+#include "draginfo.h"
 
 namespace Gtkmm2ext {
 	class TearOff;
@@ -254,6 +255,10 @@ class Editor : public PublicEditor
 	jack_nframes_t leftmost_frame;
 	void clear_playlist (ARDOUR::Playlist&);
 
+	void new_playlists ();
+	void copy_playlists ();
+	void clear_playlists ();
+
 	TrackViewList* get_valid_views (TimeAxisView*, ARDOUR::RouteGroup* grp = 0);
 
 	Width editor_mixer_strip_width;
@@ -442,11 +447,14 @@ class Editor : public PublicEditor
 	CrossfadeView*     clicked_crossfadeview;
 	ControlPoint*      clicked_control_point;
 
-	void mapover_audio_tracks (sigc::slot<void,AudioTimeAxisView&> sl);
+	void mapover_audio_tracks (sigc::slot<void,AudioTimeAxisView&,uint32_t> sl);
 
 	/* functions to be passed to mapover_audio_tracks(), possibly with sigc::bind()-supplied arguments */
 
-	void track_set_selected_regionview_from_click (AudioTimeAxisView&, AudioRegionView*, vector<AudioRegionView*>*);
+	void mapped_set_selected_regionview_from_click (AudioTimeAxisView&, uint32_t, AudioRegionView*, vector<AudioRegionView*>*);
+	void mapped_use_new_playlist (AudioTimeAxisView&, uint32_t);
+	void mapped_use_copy_playlist (AudioTimeAxisView&, uint32_t);
+	void mapped_clear_playlist (AudioTimeAxisView&, uint32_t);
 
 	/* end */
 
@@ -1051,37 +1059,7 @@ class Editor : public PublicEditor
 
 	void    hide_all_tracks (bool with_select);
 
-	struct DragInfo {
-	  ArdourCanvas::Item* item;
-	    void* data;
- 	    jack_nframes_t last_frame_position;
-	    int32_t pointer_frame_offset;
-	    jack_nframes_t grab_frame;
-	    jack_nframes_t last_pointer_frame;
-	    jack_nframes_t current_pointer_frame;
-	    double grab_x, grab_y;
-	    double cumulative_x_drag;
-	    double cumulative_y_drag;
-	    double current_pointer_x;
-	    double current_pointer_y;
-	  void (Editor::*motion_callback)(ArdourCanvas::Item*, GdkEvent*);
-	  void (Editor::*finished_callback)(ArdourCanvas::Item*, GdkEvent*);
-	    TimeAxisView* last_trackview;
-	    bool x_constrained;
-	    bool copy;
-	    bool was_rolling;
-	    bool first_move;
-	    bool move_threshold_passsed;
-	    bool want_move_threshold;
-	    bool brushing;
-	    ARDOUR::Location* copied_location;
-	} drag_info;
-
-	struct LineDragInfo {
-	    uint32_t before;
-	    uint32_t after;
-	};
-
+	DragInfo drag_info;
 	LineDragInfo current_line_drag_info;
 
 	void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0);