diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-13 16:42:05 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-13 16:42:05 -0500 |
| commit | 83044710626ca6f7ac3fb3f46609166c25f918f6 (patch) | |
| tree | 9f143124f496d2d2992d1dad129767d84ed300c1 /gtk2_ardour | |
| parent | 6f98f91f18869a6536ec38218862151e16c00ff9 (diff) | |
fix up recent cherry-picks from waves' tracks
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index bdd93efe7d..2fd642fb29 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1096,9 +1096,6 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; - typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; - PlaylistMapping playlist_mapping; - /* insert the regions into their new playlists */ for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end();) { @@ -1188,9 +1185,6 @@ RegionMoveDrag::finished_no_copy ( typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; PlaylistMapping playlist_mapping; - typedef map<boost::shared_ptr<Playlist>, RouteTimeAxisView*> PlaylistMapping; - PlaylistMapping playlist_mapping; - for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ) { RegionView* rv = i->view; @@ -3467,10 +3461,6 @@ MarkerDrag::motion (GdkEvent* event, bool) copy_location = x->location; - if ((type != TrimRight) && (delta < 0)) { - delta = max (-((framecnt_t) earliest_start), delta); - } - if ((real_location = _editor->find_location_from_marker (x->markers.front(), is_start)) == 0) { continue; } diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index ce2ac1ca16..c25c24839b 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -239,9 +239,8 @@ private: bool _trackview_only; ///< true if pointer y value should always be relative to the top of the trackview group bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false - bool _was_double_click; ///< true if drag initiated by a double click event bool _initially_vertical; ///< true if after move threshold is passed we appear to be moving vertically; undefined before that - bool _was_double_click; ///< true if drag initiated by a double click event + bool _was_double_click; ///< true if drag initiated by a double click event double _grab_x; ///< trackview x of the grab start position double _grab_y; ///< y of the grab start position, possibly adjusted if _trackview_only is true double _last_pointer_x; ///< trackview x of the pointer last time a motion occurred |