X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_monitor.h;h=ec804ba01cd92f34c7de53fd3f5c532626c8e7e2;hb=e8903a7590caaa46498d3e53c9d7df63edb24090;hp=59b90f5e46fa95ee09e211ce5122024e8bb4cb33;hpb=f208593249c7bc1f139809aa32c8aa6320782af0;p=ardour.git

diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 59b90f5e46..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 "system_exec.h"
+#include "ardour/system_exec.h"
 
 namespace ARDOUR {
 	class Session;
@@ -61,15 +61,14 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 
 	void set_session (ARDOUR::Session *s);
 	void save_session ();
-	void clear_session_state ();
 	void query_full_state (bool);
 	bool set_custom_setting (const std::string, const std::string);
 	const std::string get_custom_setting (const std::string);
 	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; }
@@ -84,10 +83,11 @@ 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 ();
+	void forward_keyevent (unsigned int);
 
 	void parameter_changed (std::string const & p);
 
@@ -98,7 +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::samplepos_t manually_seeked_frame;
+	ARDOUR::sampleoffset_t video_offset;
 	bool sync_by_manual_seek;
 	sigc::connection clock_connection;
 	sigc::connection state_connection;
@@ -106,6 +107,8 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 	int starting;
 	int knownstate;
 	int osdmode;
+
+	PBD::Signal1<void, unsigned int> XJKeyEvent;
 #if 1
 	bool debug_enable;
 #endif