ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix variable shadowing

This commit is contained in:
Twinaphex 2014-12-05 14:29:40 +01:00
parent 738d180816
commit cf5fac136a
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/common/contentview_camera_ios.m.inl
View File

@ -138,7 +138,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
dataOutput = (AVCaptureVideoDataOutput*)[[AVCaptureVideoDataOutput alloc] init]; dataOutput = (AVCaptureVideoDataOutput*)[[AVCaptureVideoDataOutput alloc] init];
[dataOutput setAlwaysDiscardsLateVideoFrames:NO]; /* Probably want to set this to NO when recording. */ [dataOutput setAlwaysDiscardsLateVideoFrames:NO]; /* Probably want to set this to NO when recording. */
[dataOutput setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]]; [dataOutput setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32RGBA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]];
/* Set dispatch to be on the main thread so OpenGL can do things with the data. */ /* Set dispatch to be on the main thread so OpenGL can do things with the data. */
[dataOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()]; [dataOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];

33
dynamic.c
View File

@ -497,7 +497,7 @@ static void rarch_log_libretro(enum retro_log_level level,
bool rarch_environment_cb(unsigned cmd, void *data) bool rarch_environment_cb(unsigned cmd, void *data)
{ {
unsigned p, id; unsigned p;
if (ignore_environment_cb) if (ignore_environment_cb)
return false; return false;
@ -657,6 +657,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS: case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS:
{ {
unsigned retro_id, retro_port;
memset(g_extern.system.input_desc_btn, 0, memset(g_extern.system.input_desc_btn, 0,
sizeof(g_extern.system.input_desc_btn)); sizeof(g_extern.system.input_desc_btn));
@ -665,8 +666,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
for (; desc->description; desc++) for (; desc->description; desc++)
{ {
unsigned port = desc->port; retro_port = desc->port;
unsigned id = desc->id; retro_id = desc->id;
if (desc->port >= MAX_PLAYERS) if (desc->port >= MAX_PLAYERS)
continue; continue;
@ -680,18 +681,18 @@ bool rarch_environment_cb(unsigned cmd, void *data)
if (desc->device == RETRO_DEVICE_ANALOG) if (desc->device == RETRO_DEVICE_ANALOG)
{ {
switch (id) switch (retro_id)
{ {
case RETRO_DEVICE_ID_ANALOG_X: case RETRO_DEVICE_ID_ANALOG_X:
switch (desc->index) switch (desc->index)
{ {
case RETRO_DEVICE_INDEX_ANALOG_LEFT: case RETRO_DEVICE_INDEX_ANALOG_LEFT:
g_extern.system.input_desc_btn[port][RARCH_ANALOG_LEFT_X_PLUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_LEFT_X_PLUS] = desc->description;
g_extern.system.input_desc_btn[port][RARCH_ANALOG_LEFT_X_MINUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_LEFT_X_MINUS] = desc->description;
break; break;
case RETRO_DEVICE_INDEX_ANALOG_RIGHT: case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
g_extern.system.input_desc_btn[port][RARCH_ANALOG_RIGHT_X_PLUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_RIGHT_X_PLUS] = desc->description;
g_extern.system.input_desc_btn[port][RARCH_ANALOG_RIGHT_X_MINUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_RIGHT_X_MINUS] = desc->description;
break; break;
} }
break; break;
@ -699,12 +700,12 @@ bool rarch_environment_cb(unsigned cmd, void *data)
switch (desc->index) switch (desc->index)
{ {
case RETRO_DEVICE_INDEX_ANALOG_LEFT: case RETRO_DEVICE_INDEX_ANALOG_LEFT:
g_extern.system.input_desc_btn[port][RARCH_ANALOG_LEFT_Y_PLUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_LEFT_Y_PLUS] = desc->description;
g_extern.system.input_desc_btn[port][RARCH_ANALOG_LEFT_Y_MINUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_LEFT_Y_MINUS] = desc->description;
break; break;
case RETRO_DEVICE_INDEX_ANALOG_RIGHT: case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
g_extern.system.input_desc_btn[port][RARCH_ANALOG_RIGHT_Y_PLUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_RIGHT_Y_PLUS] = desc->description;
g_extern.system.input_desc_btn[port][RARCH_ANALOG_RIGHT_Y_MINUS] = desc->description; g_extern.system.input_desc_btn[retro_port][RARCH_ANALOG_RIGHT_Y_MINUS] = desc->description;
break; break;
} }
break; break;
@ -712,7 +713,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
} }
else else
{ {
g_extern.system.input_desc_btn[port][id] = desc->description; g_extern.system.input_desc_btn[retro_port][retro_id] = desc->description;
} }
} }
@ -726,13 +727,13 @@ bool rarch_environment_cb(unsigned cmd, void *data)
RARCH_LOG("Environ SET_INPUT_DESCRIPTORS:\n"); RARCH_LOG("Environ SET_INPUT_DESCRIPTORS:\n");
for (p = 0; p < MAX_PLAYERS; p++) for (p = 0; p < MAX_PLAYERS; p++)
{ {
for (id = 0; id < RARCH_FIRST_CUSTOM_BIND; id++) for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
{ {
const char *description = g_extern.system.input_desc_btn[p][id]; const char *description = g_extern.system.input_desc_btn[p][retro_id];
if (description) if (description)
{ {
RARCH_LOG("\tRetroPad, Player %u, Button \"%s\" => \"%s\"\n", RARCH_LOG("\tRetroPad, Player %u, Button \"%s\" => \"%s\"\n",
p + 1, libretro_btn_desc[id], description); p + 1, libretro_btn_desc[retro_id], description);
} }
} }
} }