(Apple) Get rid of HAVE_CORELOCATION/HAVE_AVFOUNDATION - was mostly d…

…ormant code and makes the Apple code needlessly complex right now. We can always reintroduce this later on when the time is right
mario8705 · Feb 7, 2019 · f705503 · f705503
1 parent d1edfab
commit f705503
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 1,102 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -980,11 +980,6 @@ ifeq ($(HAVE_IOHIDMANAGER), 1)
    endif
 endif
 
-ifeq ($(HAVE_CORELOCATION), 1)
-   DEFINES += -DHAVE_CORELOCATION
-   LIBS += -framework CoreLocation
-endif
-
 ifeq ($(HAVE_HID), 1)
    DEFINES += -DHAVE_HID
    OBJ += input/drivers_joypad/hid_joypad.o \
@@ -1794,15 +1789,6 @@ ifneq ($(findstring Win32,$(OS)),)
    LIBS += -lmsimg32 -lhid -lsetupapi
 endif
 
-ifeq ($(HAVE_AVFOUNDATION), 1)
-   ifeq ($(HAVE_COCOA), 1)
-      DEFINES += -DHAVE_AVFOUNDATION
-      LIBS += -framework AVFoundation
-      LIBS += -framework CoreVideo
-      LIBS += -framework CoreMedia
-   endif
-endif
-
 # Record
 
 ifeq ($(HAVE_FFMPEG), 1)

diff --git a/camera/camera_driver.c b/camera/camera_driver.c
@@ -37,11 +37,6 @@ static const camera_driver_t *camera_drivers[] = {
 #endif
 #ifdef ANDROID
    &camera_android,
-#endif
-#if defined(HAVE_AVFOUNDATION)
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-    &camera_avfoundation,
-#endif
 #endif
    &camera_null,
    NULL,

diff --git a/config.features.h b/config.features.h
@@ -356,12 +356,6 @@ static const bool _coretext_supp = true;
 static const bool _coretext_supp = false;
 #endif
 
-#ifdef HAVE_AVFOUNDATION
-static const bool _avfoundation_supp = true;
-#else
-static const bool _avfoundation_supp = false;
-#endif
-
 #if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
 #if defined(__HAIKU__)
 #define GLOBAL_CONFIG_DIR "/system/settings"

diff --git a/configuration.c b/configuration.c
@@ -547,8 +547,6 @@ static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_V4L2;
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_RWEBCAM;
 #elif defined(ANDROID)
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_ANDROID;
-#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
-static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_AVFOUNDATION;
 #else
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_NULL;
 #endif
@@ -561,8 +559,6 @@ static enum wifi_driver_enum WIFI_DEFAULT_DRIVER = WIFI_NULL;
 
 #if defined(ANDROID)
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_ANDROID;
-#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
-static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_CORELOCATION;
 #else
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
 #endif

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -30,9 +30,6 @@
 #include <AppKit/NSOpenGL.h>
 #elif defined(HAVE_COCOATOUCH)
 #include <GLKit/GLKit.h>
-#ifdef HAVE_AVFOUNDATION
-#import <AVFoundation/AVFoundation.h>
-#endif
 #endif
 
 #include <retro_assert.h>
@@ -153,12 +150,6 @@ static void glkitview_init_xibs(void)
 #if defined(HAVE_COCOATOUCH)
 void cocoagl_bind_game_view_fbo(void)
 {
-#ifdef HAVE_AVFOUNDATION
-   /*  Implicitly initializes your audio session */
-   AVAudioSession *audio_session = [AVAudioSession sharedInstance];
-   [audio_session setCategory:AVAudioSessionCategoryAmbient error:nil];
-   [audio_session setActive:YES error:nil];
-#endif
    if (g_context)
       [g_view bindDrawable];
 }

diff --git a/gfx/drivers_context/cocoa_gl_ctx_metal.m b/gfx/drivers_context/cocoa_gl_ctx_metal.m
@@ -29,9 +29,6 @@
 #include <AppKit/NSOpenGL.h>
 #elif defined(HAVE_COCOATOUCH)
 #include <GLKit/GLKit.h>
-#ifdef HAVE_AVFOUNDATION
-#import <AVFoundation/AVFoundation.h>
-#endif
 #endif
 
 #include <retro_assert.h>
@@ -151,12 +148,6 @@ static void glkitview_init_xibs(void)
 #if defined(HAVE_COCOATOUCH)
 void cocoagl_bind_game_view_fbo(void)
 {
-#ifdef HAVE_AVFOUNDATION
-   /*  Implicitly initializes your audio session */
-   AVAudioSession *audio_session = [AVAudioSession sharedInstance];
-   [audio_session setCategory:AVAudioSessionCategoryAmbient error:nil];
-   [audio_session setActive:YES error:nil];
-#endif
    if (g_context)
       [g_view bindDrawable];
 }

diff --git a/location/location_driver.c b/location/location_driver.c
@@ -32,11 +32,6 @@
 static const location_driver_t *location_drivers[] = {
 #ifdef ANDROID
    &location_android,
-#endif
-#ifdef HAVE_CORELOCATION
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-   &location_corelocation,
-#endif
 #endif
    &location_null,
    NULL,

diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
@@ -333,7 +333,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -344,7 +343,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -377,7 +375,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS10;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -422,7 +419,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -433,7 +429,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -467,7 +462,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
@@ -478,7 +472,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -489,7 +482,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -523,7 +515,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS10;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -568,7 +559,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -579,7 +569,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -641,7 +630,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -652,7 +640,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",

diff --git a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
@@ -342,7 +342,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -352,7 +351,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -384,7 +382,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS10S;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +427,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -440,7 +436,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -473,7 +468,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
@@ -485,7 +479,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -495,7 +488,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -528,7 +520,6 @@
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
-					"-DHAVE_AVFOUNDATION",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS10S;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -574,7 +565,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -584,7 +574,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -646,7 +635,6 @@
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
                "-DHAVE_NETPLAYDISCOVERY",
-					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -656,7 +644,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORELOCATION",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",