mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MSVC) Some build fixes

Browse Source
This commit is contained in:
twinaphex 2014-08-17 18:59:49 +02:00
parent 1223b4fe99
commit f264062364
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/backend/menu_common_backend.c
View File

@ -500,7 +500,7 @@ static int menu_info_screen_iterate(unsigned action, rarch_setting_t *setting)
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render) if (driver.video_data && driver.menu_ctx && driver.menu_ctx->render)
driver.menu_ctx->render(); driver.menu_ctx->render();
current_setting = file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr); current_setting = (rarch_setting_t*)file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
if (current_setting) if (current_setting)
setting_data_get_description(current_setting, msg, sizeof(msg)); setting_data_get_description(current_setting, msg, sizeof(msg));
@ -2850,7 +2850,7 @@ static int menu_common_shader_manager_setting_toggle(unsigned id,
{ {
unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1; unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1;
if (pass) if (pass)
pass->filter = ((pass->filter + delta) % 3); pass->filter = (gfx_filter_type)((pass->filter + delta) % 3);
break; break;
} }
@ -3052,7 +3052,7 @@ static bool osk_callback_enter_filename(void *data)
config_file_t *conf; config_file_t *conf;
RARCH_LOG("OSK - Applying input data.\n"); RARCH_LOG("OSK - Applying input data.\n");
num = wcstombs(tmp_str, driver.osk->get_text_buf(driver.osk_data), sizeof(tmp_str)); num = wcstombs(tmp_str, (const wchar_t*)driver.osk->get_text_buf(driver.osk_data), sizeof(tmp_str));
tmp_str[num] = 0; tmp_str[num] = 0;
fill_pathname_join(filepath, g_settings.video.shader_dir, tmp_str, sizeof(filepath)); fill_pathname_join(filepath, g_settings.video.shader_dir, tmp_str, sizeof(filepath));
@ -3102,7 +3102,7 @@ static int menu_common_setting_set(unsigned id, unsigned action, rarch_setting_t
struct retro_perf_counter **counters; struct retro_perf_counter **counters;
unsigned port = driver.menu->current_pad; unsigned port = driver.menu->current_pad;
setting = file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr); setting = (rarch_setting_t*)file_list_get_last_setting(driver.menu->selection_buf, driver.menu->selection_ptr);
if (id >= MENU_SETTINGS_PERF_COUNTERS_BEGIN && id <= MENU_SETTINGS_PERF_COUNTERS_END) if (id >= MENU_SETTINGS_PERF_COUNTERS_BEGIN && id <= MENU_SETTINGS_PERF_COUNTERS_END)
{ {

2
retroarch.c
View File

@ -556,7 +556,7 @@ static bool audio_flush(const int16_t *data, size_t samples)
RARCH_PERFORMANCE_INIT(audio_convert_float); RARCH_PERFORMANCE_INIT(audio_convert_float);
RARCH_PERFORMANCE_START(audio_convert_float); RARCH_PERFORMANCE_START(audio_convert_float);
audio_convert_float_to_s16(g_extern.audio_data.conv_outsamples, audio_convert_float_to_s16(g_extern.audio_data.conv_outsamples,
output_data, output_frames * 2); (const float*)output_data, output_frames * 2);
RARCH_PERFORMANCE_STOP(audio_convert_float); RARCH_PERFORMANCE_STOP(audio_convert_float);
output_data = g_extern.audio_data.conv_outsamples; output_data = g_extern.audio_data.conv_outsamples;