diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
| commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
| tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /gtk2_ardour/editor_drag.h | |
| parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
| parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) | |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'gtk2_ardour/editor_drag.h')
| -rw-r--r-- | gtk2_ardour/editor_drag.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 3cfb38d020..5c9f09d04e 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -499,7 +499,6 @@ private: double _cumulative_dx; }; -#ifdef WITH_VIDEOTIMELINE /** Container for details about audio regions being dragged along with video */ class AVDraggingView { @@ -512,7 +511,6 @@ public: /** Drag of video offset */ class VideoTimeLineDrag : public Drag - //TODO , public sigc::trackable { public: VideoTimeLineDrag (Editor *e, ArdourCanvas::Item *i); @@ -538,7 +536,6 @@ private: ARDOUR::frameoffset_t _startdrag_video_offset; ARDOUR::frameoffset_t _max_backwards_drag; }; -#endif /** Drag to trim region(s) */ class TrimDrag : public RegionDrag |