update Chinese translation ardour/gtk2_ardour/po/zh.po base on Ardour build 4.7-372...

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index b4d5994a63402da89b7de2f923de6aac87785827..cd1b0c2474446934222a3f5cf9b3b41623fb6276 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -202,7 +202,7 @@ public:
        bool initially_vertical() const {
                return _initially_vertical;
        }
-       
+
        /** Set up the _pointer_frame_offset */
        virtual void setup_pointer_frame_offset () {
                _pointer_frame_offset = 0;
@@ -246,7 +246,7 @@ protected:
        /* sets snap delta from unsnapped pos */
        void setup_snap_delta (framepos_t pos);
 
-       boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*);
+       boost::shared_ptr<ARDOUR::Region> add_midi_region (MidiTimeAxisView*, bool commit);
 
        void show_verbose_cursor_time (framepos_t);
        void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0);
@@ -533,6 +533,7 @@ private:
        MidiRegionView*     region;
        bool                relative;
        bool                at_front;
+       bool                _was_selected;
        double              _snap_delta;
 };
 
@@ -556,7 +557,7 @@ class NoteDrag : public Drag
        NoteBase* _primary;
        double _cumulative_dx;
        double _cumulative_dy;
-       bool _was_selected;
+       bool   _was_selected;
        double _note_height;
 };
 
@@ -582,7 +583,7 @@ public:
 private:
        double y_to_region (double) const;
        ARDOUR::framecnt_t grid_frames (framepos_t) const;
-       
+
        MidiRegionView* _region_view;
        ArdourCanvas::Rectangle* _drag_rect;
        framepos_t _note[2];
@@ -675,7 +676,7 @@ public:
 private:
 
        Operation _operation;
-       
+
        bool _preserve_fade_anchor;
        bool _jump_position_when_done;
 };
@@ -824,7 +825,7 @@ private:
        void update_item (ARDOUR::Location *);
 
        ArdourMarker* _marker; ///< marker being dragged
-
+       bool _selection_changed;
         struct CopiedLocationMarkerInfo {
            ARDOUR::Location* location;
            std::vector<ArdourMarker*> markers;
@@ -932,7 +933,7 @@ public:
         *  @param drag_in_progress true if the drag is currently happening.
         */
        virtual void select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) = 0;
-       
+
        virtual void deselect_things () = 0;
 
   protected:
@@ -1042,7 +1043,7 @@ public:
 
        RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation);
        ~RangeMarkerBarDrag ();
-       
+
        void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
        void motion (GdkEvent *, bool);
        void finished (GdkEvent *, bool);
@@ -1134,7 +1135,7 @@ class CrossfadeEdgeDrag : public Drag
        void motion (GdkEvent*, bool);
        void finished (GdkEvent*, bool);
        void aborted (bool);
-       
+
        bool y_movement_matters () const {
                return false;
        }