A slight cleanup.

This commit is contained in:
Themaister 2011-01-23 03:16:14 +01:00
parent e5fd3b95fa
commit 9cf25dcb67
2 changed files with 11 additions and 9 deletions

View File

@ -54,12 +54,12 @@ struct settings
char cg_shader_path[256]; char cg_shader_path[256];
char bsnes_shader_path[256]; char bsnes_shader_path[256];
unsigned filter; unsigned filter;
#ifdef HAVE_FREETYPE
char font_path[256]; char font_path[256];
unsigned font_size; unsigned font_size;
float msg_pos_x; float msg_pos_x;
float msg_pos_y; float msg_pos_y;
#endif
} video; } video;
struct struct

16
ssnes.c
View File

@ -104,39 +104,41 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height)
if (g_settings.video.filter != FILTER_NONE) if (g_settings.video.filter != FILTER_NONE)
process_frame(output, data, width, height); process_frame(output, data, width, height);
const char *msg = msg_queue_pull(g_extern.msg_queue);
switch (g_settings.video.filter) switch (g_settings.video.filter)
{ {
case FILTER_HQ2X: case FILTER_HQ2X:
ProcessHQ2x(output, output_filter); ProcessHQ2x(output, output_filter);
if (!driver.video->frame(driver.video_data, output_filter, width << 1, height << 1, width << 2, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, output_filter, width << 1, height << 1, width << 2, msg))
g_extern.video_active = false; g_extern.video_active = false;
break; break;
case FILTER_HQ4X: case FILTER_HQ4X:
ProcessHQ4x(output, output_filter); ProcessHQ4x(output, output_filter);
if (!driver.video->frame(driver.video_data, output_filter, width << 2, height << 2, width << 3, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, output_filter, width << 2, height << 2, width << 3, msg))
g_extern.video_active = false; g_extern.video_active = false;
break; break;
case FILTER_GRAYSCALE: case FILTER_GRAYSCALE:
grayscale_filter(output, width, height); grayscale_filter(output, width, height);
if (!driver.video->frame(driver.video_data, output, width, height, width << 1, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, output, width, height, width << 1, msg))
g_extern.video_active = false; g_extern.video_active = false;
break; break;
case FILTER_BLEED: case FILTER_BLEED:
bleed_filter(output, width, height); bleed_filter(output, width, height);
if (!driver.video->frame(driver.video_data, output, width, height, width << 1, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, output, width, height, width << 1, msg))
g_extern.video_active = false; g_extern.video_active = false;
break; break;
case FILTER_NTSC: case FILTER_NTSC:
ntsc_filter(output_filter, output, width, height); 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, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, output_filter, SNES_NTSC_OUT_WIDTH(width), height, SNES_NTSC_OUT_WIDTH(width) << 1, msg))
g_extern.video_active = false; g_extern.video_active = false;
break; break;
default: default:
if (!driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048, msg))
g_extern.video_active = false; g_extern.video_active = false;
} }
#else #else
if (!driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048, msg_queue_pull(g_extern.msg_queue))) if (!driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048, msg))
g_extern.video_active = false; g_extern.video_active = false;
#endif #endif
} }