projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor LTC File decoder, prepare for Lua bindings
[ardour.git]
/
gtk2_ardour
/
video_monitor.h
diff --git
a/gtk2_ardour/video_monitor.h
b/gtk2_ardour/video_monitor.h
index 80273cf5e302eee35072edf0bb86f72cbb982fd5..ec804ba01cd92f34c7de53fd3f5c532626c8e7e2 100644
(file)
--- 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 "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;
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 restore_settings_mask (int i) { _restore_settings_mask = i;}
int restore_settings_mask () const { return _restore_settings_mask;}
- void set_offset (ARDOUR::
fram
eoffset_t);
- void manual_seek (ARDOUR::
framepos_t, bool, ARDOUR::fram
eoffset_t);
+ void set_offset (ARDOUR::
sampl
eoffset_t);
+ void manual_seek (ARDOUR::
samplepos_t, bool, ARDOUR::sampl
eoffset_t);
void srsupdate ();
void querystate ();
bool synced_by_manual_seeks() { return sync_by_manual_seek; }
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;
protected:
PublicEditor *editor;
- SystemExec *process;
+
ARDOUR::
SystemExec *process;
float fps;
void parse_output (std::string d, size_t s);
void terminated ();
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 ();
XJSettings xjadeo_settings;
void xjadeo_sync_setup ();
- ARDOUR::
fram
epos_t manually_seeked_frame;
- ARDOUR::
fram
eoffset_t video_offset;
+ ARDOUR::
sampl
epos_t manually_seeked_frame;
+ ARDOUR::
sampl
eoffset_t video_offset;
bool sync_by_manual_seek;
sigc::connection clock_connection;
sigc::connection state_connection;
bool sync_by_manual_seek;
sigc::connection clock_connection;
sigc::connection state_connection;