projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSC: no op, white space cleanup
[ardour.git]
/
gtk2_ardour
/
video_monitor.cc
diff --git
a/gtk2_ardour/video_monitor.cc
b/gtk2_ardour/video_monitor.cc
index 4f05ef84714d6395e31df1208306362026d50aa4..1fe8f97f0918fcfbe1c19d248d87a20db579ac28 100644
(file)
--- a/
gtk2_ardour/video_monitor.cc
+++ b/
gtk2_ardour/video_monitor.cc
@@
-20,7
+20,7
@@
#include "pbd/file_utils.h"
#include "pbd/convert.h"
#include "gui_thread.h"
#include "pbd/file_utils.h"
#include "pbd/convert.h"
#include "gui_thread.h"
-#include "
ardour_ui
.h"
+#include "
timers
.h"
#include "utils.h"
#include <stdio.h>
#include "utils.h"
#include <stdio.h>
@@
-28,7
+28,7
@@
#include "editor.h"
#include "video_monitor.h"
#include "editor.h"
#include "video_monitor.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace PBD;
using namespace std;
using namespace PBD;
@@
-159,10
+159,10
@@
VideoMonitor::open (std::string filename)
querystate();
state_clk_divide = 0;
/* TODO once every two second or so -- state_clk_divide hack below */
querystate();
state_clk_divide = 0;
/* TODO once every two second or so -- state_clk_divide hack below */
- state_connection =
ARDOUR_UI::RapidScreenUpdate.
connect (sigc::mem_fun (*this, &VideoMonitor::querystate));
+ state_connection =
Timers::rapid_
connect (sigc::mem_fun (*this, &VideoMonitor::querystate));
}
sync_by_manual_seek = true;
}
sync_by_manual_seek = true;
- clock_connection =
ARDOUR_UI::FPSUpdate.
connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
+ clock_connection =
Timers::fps_
connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
xjadeo_sync_setup();
}
xjadeo_sync_setup();
}
@@
-255,9
+255,7
@@
VideoMonitor::is_started ()
void
VideoMonitor::forward_keyevent (unsigned int keyval)
{
void
VideoMonitor::forward_keyevent (unsigned int keyval)
{
- Editor* ed = dynamic_cast<Editor*>(&PublicEditor::instance());
- if (!ed) return;
- emulate_key_event(ed, keyval);
+ emulate_key_event (keyval);
}
void
}
void
@@
-468,7
+466,7
@@
VideoMonitor::get_custom_setting (const std::string k)
return (xjadeo_settings[k]);
}
return (xjadeo_settings[k]);
}
-#define NO_OFFSET (
1<<31) //< skip setting or modifying offset -- TODO check ARDOUR::frameoffset_t max value.
+#define NO_OFFSET (
ARDOUR::max_framepos) //< skip setting or modifying offset
void
VideoMonitor::srsupdate ()
{
void
VideoMonitor::srsupdate ()
{
@@
-570,7
+568,7
@@
VideoMonitor::xjadeo_sync_setup ()
process->write_to_stdin("jack connect\n");
} else {
process->write_to_stdin("jack disconnect\n");
process->write_to_stdin("jack connect\n");
} else {
process->write_to_stdin("jack disconnect\n");
- clock_connection =
ARDOUR_UI::FPSUpdate.
connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
+ clock_connection =
Timers::fps_
connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
}
sync_by_manual_seek = my_manual_seek;
}
}
sync_by_manual_seek = my_manual_seek;
}