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

Merge branch 'master' of https://github.com/libretro/RetroArch

Browse Source
This commit is contained in:
T. Joseph Carter 2015-02-10 13:38:25 -08:00
commit 69e3ba9858
6 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drivers/coreaudio.c
View File

@ -258,7 +258,7 @@ static void *coreaudio_init(const char *device,
goto error; goto error;
/* Check returned audio format. */ /* Check returned audio format. */
i_size = sizeof(real_desc);; i_size = sizeof(real_desc);
if (AudioUnitGetProperty(dev->dev, kAudioUnitProperty_StreamFormat, if (AudioUnitGetProperty(dev->dev, kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Input, 0, &real_desc, &i_size) != noErr) kAudioUnitScope_Input, 0, &real_desc, &i_size) != noErr)
goto error; goto error;

2
deps/7zip/7zDec.c vendored
View File

@ -58,7 +58,7 @@ static uint8_t Readuint8_t(void *pp)
p->cur = p->begin; p->cur = p->begin;
p->end = p->begin + size; p->end = p->begin + size;
if (size != 0) if (size != 0)
return *p->cur++;; return *p->cur++;
} }
p->extra = True; p->extra = True;
return 0; return 0;

27
menu/menu_entries_cbs.c
View File

@ -849,9 +849,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
database_info_list_t *db_info = NULL; database_info_list_t *db_info = NULL;
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
file_list_t *menu_list = (file_list_t*)userdata; file_list_t *menu_list = (file_list_t*)userdata;
struct string_list *str_list = NULL; struct string_list *str_list = string_split(label, "|");
str_list = string_split(label, "|");
if (!str_list) if (!str_list)
return -1; return -1;
@ -1050,16 +1048,16 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
{ {
char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH]; char elem0[PATH_MAX_LENGTH], elem1[PATH_MAX_LENGTH];
bool match_found = false; bool match_found = false;
str_list = string_split( struct string_list *tmp_str_list = string_split(
playlist->entries[j].core_name, "|"); playlist->entries[j].core_name, "|");
if (!str_list) if (!tmp_str_list)
continue;; continue;
if (str_list && str_list->size > 0) if (tmp_str_list->size > 0)
strlcpy(elem0, str_list->elems[0].data, sizeof(elem0)); strlcpy(elem0, tmp_str_list->elems[0].data, sizeof(elem0));
if (str_list && str_list->size > 1) if (tmp_str_list->size > 1)
strlcpy(elem1, str_list->elems[1].data, sizeof(elem1)); strlcpy(elem1, tmp_str_list->elems[1].data, sizeof(elem1));
if (!strcmp(elem1, "crc")) if (!strcmp(elem1, "crc"))
{ {
@ -1077,7 +1075,7 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
match_found = true; match_found = true;
} }
string_list_free(str_list); string_list_free(tmp_str_list);
if (!match_found) if (!match_found)
continue; continue;
@ -1166,13 +1164,6 @@ static int action_ok_core_load(const char *path,
static int action_ok_core_download(const char *path, static int action_ok_core_download(const char *path,
const char *label, unsigned type, size_t idx) const char *label, unsigned type, size_t idx)
{ {
const char *menu_path = NULL;
if (!driver.menu)
return -1;
menu_list_get_last_stack(driver.menu->menu_list,
&menu_path, NULL, NULL);
return 0; return 0;
} }

2
ps3/gcmgl/src/rgl_ps3_raster.cpp
View File

@ -1259,7 +1259,7 @@ static void update_state_validation(void)
gcm_emit_at(gcm_context->current, 7, (((platformTexture->gcmTexture.height) | ((platformTexture->gcmTexture.width) << 16)))); gcm_emit_at(gcm_context->current, 7, (((platformTexture->gcmTexture.height) | ((platformTexture->gcmTexture.width) << 16))));
gcm_emit_at(gcm_context->current, 8, ((platformTexture->gcmMethods.borderColor))); gcm_emit_at(gcm_context->current, 8, ((platformTexture->gcmMethods.borderColor)));
gcm_emit_at(gcm_context->current, 9, ((((1) << (18)) | ((CELL_GCM_NV4097_SET_TEXTURE_CONTROL3) + (unit) * 0x04)))); gcm_emit_at(gcm_context->current, 9, ((((1) << (18)) | ((CELL_GCM_NV4097_SET_TEXTURE_CONTROL3) + (unit) * 0x04))));
gcm_emit_at(gcm_context->current, 10, (((platformTexture->gcmTexture.pitch) | ((platformTexture->gcmTexture.depth) << 20))));; gcm_emit_at(gcm_context->current, 10, (((platformTexture->gcmTexture.pitch) | ((platformTexture->gcmTexture.depth) << 20))));
gcm_finish_n_commands(gcm_context->current, 11); gcm_finish_n_commands(gcm_context->current, 11);
} }
else else

2
runloop.c
View File

@ -747,7 +747,7 @@ static void check_block_hotkey(bool enable_hotkey)
bind->joyaxis != AXIS_NONE || bind->joyaxis != AXIS_NONE ||
autoconf_bind->key != RETROK_UNKNOWN || autoconf_bind->key != RETROK_UNKNOWN ||
autoconf_bind->joykey != NO_BTN || autoconf_bind->joykey != NO_BTN ||
autoconf_bind->joyaxis != AXIS_NONE;; autoconf_bind->joyaxis != AXIS_NONE;
driver.block_hotkey = driver.block_input || driver.block_hotkey = driver.block_input ||
(use_hotkey_enable && !enable_hotkey); (use_hotkey_enable && !enable_hotkey);

2
settings_data.c
View File

@ -3636,7 +3636,7 @@ static bool setting_data_append_list_general_options(
group_info.name, group_info.name,
subgroup_info.name, subgroup_info.name,
general_write_handler, general_write_handler,
general_read_handler);; general_read_handler);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
CONFIG_UINT( CONFIG_UINT(