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

Cross fade disabled by default now

Browse Source
This commit is contained in:
Jared Bruni
2022-03-02 20:19:05 -08:00
parent e54d7a199d
commit ac2820cd74
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_window.cpp
View File

@@ -480,7 +480,7 @@ void AC_MainWindow::createMenu() {
fade_on = new QAction(tr("Cross Fade"), this); fade_on = new QAction(tr("Cross Fade"), this);
fade_on->setCheckable(true); fade_on->setCheckable(true);
fade_on->setChecked(true); fade_on->setChecked(false);
options->addAction(fade_on); options->addAction(fade_on);
options->addAction(repeat_v); options->addAction(repeat_v);
options->addAction(cycle_custom); options->addAction(cycle_custom);

11
src/playback_thread.cpp
View File

@@ -19,7 +19,7 @@ Playback::Playback(QObject *parent) : QThread(parent) {
flip_frame1 = false; flip_frame1 = false;
flip_frame2 = false; flip_frame2 = false;
repeat_video = false; repeat_video = false;
fadefilter = true; fadefilter = false;
cycle_on = 0; cycle_on = 0;
cycle_index = 0; cycle_index = 0;
frame_num = 0; frame_num = 0;
@@ -295,8 +295,9 @@ void Playback::setIndexChanged(std::string value) {
current_filter = filter_map_ex[value]; current_filter = filter_map_ex[value];
// here: // here:
//ac::release_all_objects(); //ac::release_all_objects();
mutex.unlock();
alpha = 1.0; alpha = 1.0;
mutex.unlock();
} }
void Playback::setSingleMode(bool val) { void Playback::setSingleMode(bool val) {
@@ -410,7 +411,7 @@ void Playback::run() {
static std::vector<FilterValue> cur; static std::vector<FilterValue> cur;
cur = current; cur = current;
ac::orig_frame = frame.clone(); ac::orig_frame = frame.clone();
FilterValue current_filterx = current_filter, prev_filterx = prev_filter; FilterValue current_filterxv = current_filter, prev_filterx = prev_filter;
std::string png_pathx = png_path; std::string png_pathx = png_path;
if(blend_image_copy_set) { if(blend_image_copy_set) {
blend_image = blend_image_copy.clone(); blend_image = blend_image_copy.clone();
@@ -475,13 +476,13 @@ void Playback::run() {
} }
if(single_mode == true && alpha > 0) { if(single_mode == true && alpha > 0) {
if(fadefilter == true) filterFade(frame, current_filterx, prev_filterx, alpha); if(fadefilter == true) filterFade(frame, current_filterxv, prev_filterx, alpha);
drawEffects(frame); drawEffects(frame);
alpha = alpha-0.08; alpha = alpha-0.08;
} else if(single_mode == true) { } else if(single_mode == true) {
ac::setSubFilter(-1); ac::setSubFilter(-1);
ac::in_custom = false; ac::in_custom = false;
drawFilter(frame, current_filterx); drawFilter(frame, current_filterxv);
drawEffects(frame); drawEffects(frame);
msleep(duration); msleep(duration);
} else if(cur.size()>0) { } else if(cur.size()>0) {