X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_monitor.h;h=d2ab91b3a7b93296f2901d5d5bdd7c8a17731754;hb=c912bd61ae49cc79158f3322439c29b27ef51de8;hp=be3b76f9a47340741355275d356893c09c8e98e1;hpb=55a10480945f2a41fe6cfda2173bed12d3d5bc89;p=ardour.git

diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index be3b76f9a4..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;
@@ -62,7 +60,8 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
 	void open (std::string);
 
 	void set_session (ARDOUR::Session *s);
-	void clear_session_state ();
+	void save_session ();
+	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;}
@@ -84,12 +83,12 @@ 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 save_session ();
 	void parameter_changed (std::string const & p);
 
 	typedef std::map<std::string,std::string> XJSettings;
@@ -100,17 +99,19 @@ 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;
 	int state_clk_divide;
 	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 */