Logs config file with verbose options.

This commit is contained in:
Themaister 2010-12-30 01:38:20 +01:00
parent 75d8781854
commit 8e1b1e8c05
4 changed files with 12 additions and 7 deletions

View File

@ -3,6 +3,7 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#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;
}

View File

@ -20,6 +20,7 @@
#include "general.h"
#include <stdio.h>
#include <string.h>
#include "hqflt/filters.h"
static const audio_driver_t *audio_drivers[] = {
#ifdef HAVE_ALSA

View File

@ -3,6 +3,7 @@
#include "config.h.def"
#include <assert.h>
#include <string.h>
#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

10
ssnes.c
View File

@ -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) )