tentative fix for requesting driver+device list from backend

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index df55270e5435ce6ec6c98ff505569cc4bcc27647..259dc50778c697a040e6ea8b2c8bdd2b87f4b4f1 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -74,12 +74,12 @@ public:
                return !_drags.empty ();
        }
 
-       /** @return current pointer x position in trackview coordinates */
+       /** @return current pointer x position in canvas coordinates */
        double current_pointer_x () const {
                return _current_pointer_x;
        }
 
-       /** @return current pointer y position in trackview coordinates */
+       /** @return current pointer y position in canvas coordinates */
        double current_pointer_y () const {
                return _current_pointer_y;
        }
@@ -93,8 +93,8 @@ private:
        Editor* _editor;
        std::list<Drag*> _drags;
        bool _ending; ///< true if end_grab or abort is in progress, otherwise false
-       double _current_pointer_x; ///< trackview x of the current pointer
-       double _current_pointer_y; ///< trackview y of the current pointer
+       double _current_pointer_x; ///< canvas-coordinate space x of the current pointer
+       double _current_pointer_y; ///< canvas-coordinate space y of the current pointer
        ARDOUR::framepos_t _current_pointer_frame; ///< frame that the pointer is now at
        bool _old_follow_playhead; ///< state of Editor::follow_playhead() before the drags started
 };
@@ -261,6 +261,7 @@ public:
        double initial_y; ///< the initial y position of the view before any reparenting
        framepos_t initial_position; ///< initial position of the region
        framepos_t initial_end; ///< initial end position of the region
+       framepos_t anchored_fade_length; ///< fade_length when anchored during drag
        boost::shared_ptr<ARDOUR::Playlist> initial_playlist;
 };
 
@@ -378,6 +379,7 @@ private:
        void add_stateful_diff_commands_for_playlists (PlaylistSet const &);
 
        void collect_new_region_view (RegionView *);
+       RouteTimeAxisView* create_destination_time_axis (boost::shared_ptr<ARDOUR::Region>);
 
        bool _copy;
        RegionView* _new_region_view;
@@ -572,6 +574,7 @@ private:
        Operation _operation;
        
        bool _preserve_fade_anchor;
+       bool _jump_position_when_done;
 };
 
 /** Meter marker drag */