Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 2953fd8277daaa0dfefa0ffafea1bb2eaa394f74..5ddbe78d12bbf4bdd03eddbafce5e343b5ab49c7 100644 (file)
--- 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"
@@ -30,8 +28,6 @@
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "canvas_impl.h"
-#include "simpleline.h"
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
@@ -803,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 */