X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fvideo_monitor.h;h=ec804ba01cd92f34c7de53fd3f5c532626c8e7e2;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=80273cf5e302eee35072edf0bb86f72cbb982fd5;hpb=070bb7a8abcd787958b3ea07e77043dd404d653c;p=ardour.git

diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 80273cf5e3..ec804ba01c 100644
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -26,7 +26,7 @@
 #include "ardour/types.h"
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
-#include "pbd/system_exec.h"
+#include "ardour/system_exec.h"
 
 namespace ARDOUR {
 	class Session;
@@ -67,8 +67,8 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 	void restore_settings_mask (int i)  { _restore_settings_mask = i;}
 	int restore_settings_mask () const { return _restore_settings_mask;}
 
-	void set_offset (ARDOUR::frameoffset_t);
-	void manual_seek (ARDOUR::framepos_t, bool, ARDOUR::frameoffset_t);
+	void set_offset (ARDOUR::sampleoffset_t);
+	void manual_seek (ARDOUR::samplepos_t, bool, ARDOUR::sampleoffset_t);
 	void srsupdate ();
 	void querystate ();
 	bool synced_by_manual_seeks() { return sync_by_manual_seek; }
@@ -83,7 +83,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 
 	protected:
 	PublicEditor *editor;
-	SystemExec *process;
+	ARDOUR::SystemExec *process;
 	float fps;
 	void parse_output (std::string d, size_t s);
 	void terminated ();
@@ -98,8 +98,8 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 	XJSettings xjadeo_settings;
 
 	void xjadeo_sync_setup ();
-	ARDOUR::framepos_t manually_seeked_frame;
-	ARDOUR::frameoffset_t video_offset;
+	ARDOUR::samplepos_t manually_seeked_frame;
+	ARDOUR::sampleoffset_t video_offset;
 	bool sync_by_manual_seek;
 	sigc::connection clock_connection;
 	sigc::connection state_connection;