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

now uses CallFilter than array of function pointers

Browse Source
This commit is contained in:
lostjared
2019-03-16 09:31:15 -07:00
parent fda278b4c4
commit 00479a9ef1
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main_window.cpp
View File

@@ -28,10 +28,9 @@ const char *menuNames[] = {"All Filters", "All Filters Sorted", "Blend", "Distor
void generate_map() { void generate_map() {
ac::fill_filter_map();
for(int i = 0; i < ac::draw_max; ++i ) for(int i = 0; i < ac::draw_max; ++i )
filter_map[ac::draw_strings[i]] = FilterValue(0, i, -1); filter_map[ac::draw_strings[i]] = FilterValue(0, i, -1);
int index = 0; int index = 0;
while(filter_names[index] != 0) { while(filter_names[index] != 0) {
std::string filter_n = "AF_"; std::string filter_n = "AF_";
@@ -44,7 +43,6 @@ void generate_map() {
std::string name = "plugin " + plugins.plugin_list[j]->name(); std::string name = "plugin " + plugins.plugin_list[j]->name();
filter_map[name] = FilterValue(2, j, -1); filter_map[name] = FilterValue(2, j, -1);
} }
} }
void custom_filter(cv::Mat &) { void custom_filter(cv::Mat &) {

3
src/playback_thread.cpp
View File

@@ -191,7 +191,8 @@ void Playback::drawEffects(cv::Mat &frame) {
void Playback::drawFilter(cv::Mat &frame, FilterValue &f) { void Playback::drawFilter(cv::Mat &frame, FilterValue &f) {
if(f.index == 0) { if(f.index == 0) {
ac::setSubFilter(f.subfilter); ac::setSubFilter(f.subfilter);
ac::draw_func[f.filter](frame); //ac::draw_func[f.filter](frame);
ac::CallFilter(f.filter, frame);
ac::setSubFilter(-1); ac::setSubFilter(-1);
} else if(current_filter.index == 1) { } else if(current_filter.index == 1) {
current_filterx = f.filter; current_filterx = f.filter;