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/video_timeline.cc | |
| 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/video_timeline.cc')
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index aebb4f5d9f..5ddbe78d12 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -17,8 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef WITH_VIDEOTIMELINE - #include <algorithm> #include <sigc++/bind.h> #include "ardour/tempo.h" @@ -801,5 +799,3 @@ VideoTimeLine::manual_seek_video_monitor (framepos_t pos) if (!vmonitor->synced_by_manual_seeks()) { return; } vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo } - -#endif /* WITH_VIDEOTIMELINE */ |