diff --git a/conf/config_file.c b/conf/config_file.c index 4041d101ae..588d465e05 100644 --- a/conf/config_file.c +++ b/conf/config_file.c @@ -3,6 +3,7 @@ #include #include #include +#include "general.h" struct entry_list { @@ -155,7 +156,8 @@ config_file_t *config_file_new(const char *path) } fclose(file); - print_config(conf); + if (g_extern.verbose) + print_config(conf); return conf; } diff --git a/driver.c b/driver.c index 6e03733a04..425519fd92 100644 --- a/driver.c +++ b/driver.c @@ -20,6 +20,7 @@ #include "general.h" #include #include +#include "hqflt/filters.h" static const audio_driver_t *audio_drivers[] = { #ifdef HAVE_ALSA diff --git a/settings.c b/settings.c index 5c3b0fb40f..06f1519cbb 100644 --- a/settings.c +++ b/settings.c @@ -3,6 +3,7 @@ #include "config.h.def" #include #include +#include "hqflt/filters.h" struct settings g_settings; @@ -174,11 +175,12 @@ void parse_config(void) "\t%s\n" "\t%s\n", FILTER_HQ2X_STR, FILTER_HQ4X_STR, FILTER_GRAYSCALE_STR, - FILTER_BLEED, FILTER_NTSC); + FILTER_BLEED_STR, FILTER_NTSC_STR); exit(1); } free(tmp_str); + g_settings.video.filter = filter; } #endif diff --git a/ssnes.c b/ssnes.c index eebbe6ca81..247f55e3e2 100644 --- a/ssnes.c +++ b/ssnes.c @@ -92,27 +92,27 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height) case FILTER_HQ2X: ProcessHQ2x(output, output_filter); if ( !driver.video->frame(driver.video_data, output_filter, width << 1, height << 1, width << 2) ) - video_active = false; + g_extern.video_active = false; break; case FILTER_HQ4X: ProcessHQ4x(output, output_filter); if ( !driver.video->frame(driver.video_data, output_filter, width << 2, height << 2, width << 3) ) - video_active = false; + g_extern.video_active = false; break; case FILTER_GRAYSCALE: grayscale_filter(output, width, height); if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) ) - video_active = false; + g_extern.video_active = false; break; case FILTER_BLEED: bleed_filter(output, width, height); if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) ) - video_active = false; + g_extern.video_active = false; break; case FILTER_NTSC: ntsc_filter(output_filter, output, width, height); if ( !driver.video->frame(driver.video_data, output_filter, SNES_NTSC_OUT_WIDTH(width), height, SNES_NTSC_OUT_WIDTH(width) << 1) ) - video_active = false; + g_extern.video_active = false; break; default: if ( !driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048) )