mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn overlay_state_ptr into non-pointer

Browse Source
This commit is contained in:
Twinaphex 2015-07-11 18:22:23 +02:00
parent c3f5ea0fcc
commit 70607acb6b
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
View File

@ -7,7 +7,7 @@
<key>IDESourceControlProjectIdentifier</key> <key>IDESourceControlProjectIdentifier</key>
<string>6D7FAF49-495D-480E-B0C9-8C39AC77CE3C</string> <string>6D7FAF49-495D-480E-B0C9-8C39AC77CE3C</string>
<key>IDESourceControlProjectName</key> <key>IDESourceControlProjectName</key>
<string>RetroArch_iOS</string> <string>project</string>
<key>IDESourceControlProjectOriginsDictionary</key> <key>IDESourceControlProjectOriginsDictionary</key>
<dict> <dict>
<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key> <key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
@ -24,21 +24,21 @@
<string>https://github.com/libretro/common-overlays.git</string> <string>https://github.com/libretro/common-overlays.git</string>
</dict> </dict>
<key>IDESourceControlProjectPath</key> <key>IDESourceControlProjectPath</key>
<string>apple/iOS/RetroArch_iOS.xcodeproj</string> <string>apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key> <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict> <dict>
<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key> <key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
<string>../../../../media/autoconfig</string> <string>../../../..media/autoconfig</string>
<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key> <key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
<string>../../../../..</string> <string>../../../../..</string>
<key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key> <key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key>
<string>../../../../media/assets</string> <string>../../../..media/assets</string>
<key>C3AEE01BDA902108663DB5DB9CD7916436919463</key> <key>C3AEE01BDA902108663DB5DB9CD7916436919463</key>
<string>../../../../media/libretrodb</string> <string>../../../..media/libretrodb</string>
<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key> <key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
<string>../../../..</string> <string>../../../..</string>
<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key> <key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
<string>../../../../media/overlays</string> <string>../../../..media/overlays</string>
</dict> </dict>
<key>IDESourceControlProjectURL</key> <key>IDESourceControlProjectURL</key>
<string>https://github.com/libretro/RetroArch.git</string> <string>https://github.com/libretro/RetroArch.git</string>

19
input/input_overlay.c
View File

@ -157,7 +157,7 @@ struct input_overlay
}; };
static input_overlay_t *overlay_ptr; static input_overlay_t *overlay_ptr;
static input_overlay_state_t *overlay_state_ptr; static input_overlay_state_t overlay_state_ptr;
static config_file_t *overlay_conf; static config_file_t *overlay_conf;
input_overlay_t *input_overlay_get_ptr(void) input_overlay_t *input_overlay_get_ptr(void)
@ -167,7 +167,7 @@ input_overlay_t *input_overlay_get_ptr(void)
input_overlay_state_t *input_overlay_get_state_ptr(void) input_overlay_state_t *input_overlay_get_state_ptr(void)
{ {
return overlay_state_ptr; return &overlay_state_ptr;
} }
bool input_overlay_is_active(void) bool input_overlay_is_active(void)
@ -1307,12 +1307,11 @@ void input_overlay_free(input_overlay_t *ol)
void input_overlay_free_ptr(void) void input_overlay_free_ptr(void)
{ {
input_overlay_free(overlay_ptr); if (overlay_ptr)
input_overlay_free(overlay_ptr);
overlay_ptr = NULL; overlay_ptr = NULL;
if (overlay_state_ptr) memset(&overlay_state_ptr, 0, sizeof(overlay_state_ptr));
free(overlay_state_ptr);
overlay_state_ptr = NULL;
} }
int input_overlay_new_ptr(void) int input_overlay_new_ptr(void)
@ -1331,11 +1330,6 @@ int input_overlay_new_ptr(void)
return 1; return 1;
} }
overlay_state_ptr = (input_overlay_state_t *)calloc(1, sizeof(*overlay_state_ptr));
if (!overlay_state_ptr)
return -1;
overlay_ptr = input_overlay_new( overlay_ptr = input_overlay_new(
driver->osk_enable ? driver->osk_enable ?
settings->osk.overlay : settings->input.overlay, settings->osk.overlay : settings->input.overlay,
@ -1345,10 +1339,7 @@ int input_overlay_new_ptr(void)
settings->input.overlay_scale); settings->input.overlay_scale);
if (!overlay_ptr) if (!overlay_ptr)
{
free(overlay_state_ptr);
return -1; return -1;
}
return 0; return 0;
} }