projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
video_monitor.cc
diff --git
a/gtk2_ardour/video_monitor.cc
b/gtk2_ardour/video_monitor.cc
index c48999c3cd1b273005a01609c7501ecde4e730cf..be412f6725d33e18dd691c472209f26daa778e79 100644
(file)
--- a/
gtk2_ardour/video_monitor.cc
+++ b/
gtk2_ardour/video_monitor.cc
@@
-128,7
+128,6
@@
VideoMonitor::open (std::string filename)
if (!is_started()) return;
manually_seeked_frame = 0;
osdmode = 10; // 1: frameno, 2: timecode, 8: box
if (!is_started()) return;
manually_seeked_frame = 0;
osdmode = 10; // 1: frameno, 2: timecode, 8: box
- sync_by_manual_seek = false;
starting = 15;
process->write_to_stdin("load " + filename + "\n");
process->write_to_stdin("set fps -1\n");
starting = 15;
process->write_to_stdin("load " + filename + "\n");
process->write_to_stdin("set fps -1\n");
@@
-162,6
+161,8
@@
VideoMonitor::open (std::string filename)
/* TODO once every two second or so -- state_clk_divide hack below */
state_connection = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::querystate));
}
/* TODO once every two second or so -- state_clk_divide hack below */
state_connection = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::querystate));
}
+ sync_by_manual_seek = true;
+ clock_connection = ARDOUR_UI::FPSUpdate.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
xjadeo_sync_setup();
}
xjadeo_sync_setup();
}
@@
-467,7
+468,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 ()
{
@@
-569,7
+570,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::
SuperRapidScreen
Update.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
+ clock_connection = ARDOUR_UI::
FPS
Update.connect (sigc::mem_fun (*this, &VideoMonitor::srsupdate));
}
sync_by_manual_seek = my_manual_seek;
}
}
sync_by_manual_seek = my_manual_seek;
}