eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-18 21:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

if no filter selected run at correct speed

Browse Source
This commit is contained in:
lostjared
2017-03-01 18:09:02 -08:00
parent 99c5cb5adf
commit fcb8b60370
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main_window.cpp
View File

@@ -26,7 +26,6 @@ void generate_map() {
filter_map[filter_n] = std::make_pair(1, index); filter_map[filter_n] = std::make_pair(1, index);
++index; ++index;
} }
for(unsigned int j = 0; j < plugins.plugin_list.size(); ++j) { for(unsigned int j = 0; j < plugins.plugin_list.size(); ++j) {
std::string name = "plugin " + plugins.plugin_list[j]->name(); std::string name = "plugin " + plugins.plugin_list[j]->name();
filter_map[name] = std::make_pair(2, j); filter_map[name] = std::make_pair(2, j);
@@ -227,7 +226,6 @@ void AC_MainWindow::cb_SetIndex(int index) {
} }
void AC_MainWindow::addClicked() { void AC_MainWindow::addClicked() {
int row = filters->currentRow(); int row = filters->currentRow();
if(row != -1) { if(row != -1) {
QListWidgetItem *item = filters->item(row); QListWidgetItem *item = filters->item(row);
@@ -253,7 +251,6 @@ void AC_MainWindow::rmvClicked() {
std::vector<std::pair<int, int>> v; std::vector<std::pair<int, int>> v;
buildVector(v); buildVector(v);
playback->setVector(v); playback->setVector(v);
} }
} }
@@ -266,7 +263,6 @@ void AC_MainWindow::upClicked() {
std::vector<std::pair<int, int>> v; std::vector<std::pair<int, int>> v;
buildVector(v); buildVector(v);
playback->setVector(v); playback->setVector(v);
} }
} }

5
src/playback_thread.cpp
View File

@@ -49,6 +49,9 @@ void Playback::setDisplayed(bool shown) {
} }
void Playback::run() { void Playback::run() {
int duration = 1000/ac::fps;
while(!stop) { while(!stop) {
mutex.lock(); mutex.lock();
if(!capture.read(frame)) { if(!capture.read(frame)) {
@@ -78,6 +81,8 @@ void Playback::run() {
draw_plugin(frame, cur[i].second); draw_plugin(frame, cur[i].second);
} }
} }
} else {
msleep(duration);
} }
mutex.lock(); mutex.lock();
if(recording && writer.isOpened()) { if(recording && writer.isOpened()) {