projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Timers/Timeouts from ARDOUR_UI into functions in timers.h and use PBD::Timers
[ardour.git]
/
gtk2_ardour
/
video_monitor.cc
diff --git
a/gtk2_ardour/video_monitor.cc
b/gtk2_ardour/video_monitor.cc
index be412f6725d33e18dd691c472209f26daa778e79..ece1856d545e8be9903f038307538611109a4452 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>
@@
-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();
}
@@
-570,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::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;
}