X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_monitor.h;h=d2ab91b3a7b93296f2901d5d5bdd7c8a17731754;hb=b8f5306d5bf59ddb237fabcdbab91a7d1e6fd612;hp=0f954e9cd5c3cf5de467fd7d12ff5a2bf565614e;hpb=6592c8696ad5e8b479c3997639e7b54981ec06af;p=ardour.git

diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 0f954e9cd5..d2ab91b3a7 100644
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_monitor_h__
 #define __ardour_video_monitor_h__
 
@@ -28,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;
@@ -63,7 +61,6 @@ 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);
@@ -86,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);
 
@@ -101,6 +99,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 
 	void xjadeo_sync_setup ();
 	ARDOUR::framepos_t manually_seeked_frame;
+	ARDOUR::frameoffset_t video_offset;
 	bool sync_by_manual_seek;
 	sigc::connection clock_connection;
 	sigc::connection state_connection;
@@ -108,11 +107,11 @@ 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
 };
 
 #endif /* __ardour_video_monitor_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */