projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix LV2UI_Request_Parameter Feature URI
[ardour.git]
/
gtk2_ardour
/
video_monitor.cc
diff --git
a/gtk2_ardour/video_monitor.cc
b/gtk2_ardour/video_monitor.cc
index 56dad67dc87d4bb4c128a168a1410a691e0d793c..d6831e45b744e6f232a17fda759f156cac53dec8 100644
(file)
--- a/
gtk2_ardour/video_monitor.cc
+++ b/
gtk2_ardour/video_monitor.cc
@@
-467,31
+467,31
@@
VideoMonitor::get_custom_setting (const std::string k)
return (xjadeo_settings[k]);
}
return (xjadeo_settings[k]);
}
-#define NO_OFFSET (
ARDOUR::max_fram
epos) //< skip setting or modifying offset
+#define NO_OFFSET (
Temporal::max_sampl
epos) //< skip setting or modifying offset
void
VideoMonitor::srsupdate ()
{
if (!_session) { return; }
if (editor->dragging_playhead()) { return ;}
void
VideoMonitor::srsupdate ()
{
if (!_session) { return; }
if (editor->dragging_playhead()) { return ;}
- manual_seek(_session->audible_
fram
e(), false, NO_OFFSET);
+ manual_seek(_session->audible_
sampl
e(), false, NO_OFFSET);
}
void
}
void
-VideoMonitor::set_offset (ARDOUR::
fram
eoffset_t offset)
+VideoMonitor::set_offset (ARDOUR::
sampl
eoffset_t offset)
{
if (!is_started()) { return; }
if (!_session) { return; }
if (offset == NO_OFFSET ) { return; }
{
if (!is_started()) { return; }
if (!_session) { return; }
if (offset == NO_OFFSET ) { return; }
-
fram
ecnt_t video_frame_offset;
-
fram
ecnt_t audio_sample_rate;
+
sampl
ecnt_t video_frame_offset;
+
sampl
ecnt_t audio_sample_rate;
if (_session->config.get_videotimeline_pullup()) {
if (_session->config.get_videotimeline_pullup()) {
- audio_sample_rate = _session->
fram
e_rate();
+ audio_sample_rate = _session->
sampl
e_rate();
} else {
} else {
- audio_sample_rate = _session->nominal_
fram
e_rate();
+ audio_sample_rate = _session->nominal_
sampl
e_rate();
}
}
- /* Note: pull-up/down are applied here:
frame_rate() vs. nominal_fram
e_rate() */
+ /* Note: pull-up/down are applied here:
sample_rate() vs. nominal_sampl
e_rate() */
if (_session->config.get_use_video_file_fps()) {
video_frame_offset = floor(offset * fps / audio_sample_rate);
} else {
if (_session->config.get_use_video_file_fps()) {
video_frame_offset = floor(offset * fps / audio_sample_rate);
} else {
@@
-506,19
+506,19
@@
VideoMonitor::set_offset (ARDOUR::frameoffset_t offset)
}
void
}
void
-VideoMonitor::manual_seek (
framepos_t when, bool /*force*/, ARDOUR::fram
eoffset_t offset)
+VideoMonitor::manual_seek (
samplepos_t when, bool /*force*/, ARDOUR::sampl
eoffset_t offset)
{
if (!is_started()) { return; }
if (!_session) { return; }
{
if (!is_started()) { return; }
if (!_session) { return; }
-
fram
ecnt_t video_frame;
-
fram
ecnt_t audio_sample_rate;
+
sampl
ecnt_t video_frame;
+
sampl
ecnt_t audio_sample_rate;
if (_session->config.get_videotimeline_pullup()) {
if (_session->config.get_videotimeline_pullup()) {
- audio_sample_rate = _session->
fram
e_rate();
+ audio_sample_rate = _session->
sampl
e_rate();
} else {
} else {
- audio_sample_rate = _session->nominal_
fram
e_rate();
+ audio_sample_rate = _session->nominal_
sampl
e_rate();
}
}
- /* Note: pull-up/down are applied here:
frame_rate() vs. nominal_fram
e_rate() */
+ /* Note: pull-up/down are applied here:
sample_rate() vs. nominal_sampl
e_rate() */
if (_session->config.get_use_video_file_fps()) {
video_frame = floor(when * fps / audio_sample_rate);
} else {
if (_session->config.get_use_video_file_fps()) {
video_frame = floor(when * fps / audio_sample_rate);
} else {
@@
-556,9
+556,8
@@
VideoMonitor::xjadeo_sync_setup ()
if (!_session) { return; }
bool my_manual_seek = true;
if (!_session) { return; }
bool my_manual_seek = true;
- if (_session->config.get_external_sync()) {
- if (ARDOUR::Config->get_sync_source() == ARDOUR::Engine)
- my_manual_seek = false;
+ if (_session->synced_to_engine ()) {
+ my_manual_seek = false;
}
if (my_manual_seek != sync_by_manual_seek) {
}
if (my_manual_seek != sync_by_manual_seek) {