From fab23d523bc588dd45e8966faf9af0e9922abff4 Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Sun, 19 Sep 2021 14:44:17 +0200
Subject: [PATCH] mac-virtualcam: Remove unneeded includes

---
 .../src/dal-plugin/CMakeLists.txt             | 26 ++++++----------
 .../src/dal-plugin/OBSDALDevice.mm            |  1 -
 .../src/dal-plugin/OBSDALPlugIn.h             |  3 --
 .../src/dal-plugin/OBSDALPlugIn.mm            |  2 --
 .../src/dal-plugin/OBSDALPlugInInterface.mm   |  2 --
 .../src/dal-plugin/OBSDALPlugInMain.mm        |  2 --
 .../src/dal-plugin/OBSDALStream.h             |  2 --
 .../src/dal-plugin/OBSDALStream.mm            |  1 -
 .../src/obs-plugin/CMakeLists.txt             | 30 ++-----------------
 .../src/obs-plugin/OBSDALMachServer.mm        |  1 -
 .../src/obs-plugin/plugin-main.mm             |  7 -----
 11 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
index 5718ec930..526a427e9 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
+++ b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
@@ -3,24 +3,18 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 
 project(mac-dal-plugin)
 
-find_library(AVFOUNDATION AVFoundation)
-find_library(COCOA Cocoa)
+find_library(APPKIT AppKit)
 find_library(COREFOUNDATION CoreFoundation)
-find_library(COREMEDIA CoreMedia)
 find_library(COREVIDEO CoreVideo)
-find_library(COCOA Cocoa)
+find_library(COREMEDIA CoreMedia)
 find_library(COREMEDIAIO CoreMediaIO)
-find_library(IOSURFACE IOSurface)
 find_library(IOKIT IOKit)
 
-# Possible we could remove osme of these
-include_directories(${AVFOUNDATION}
-					${COCOA}
+include_directories(${APPKIT}
 					${COREFOUNDATION}
-					${COREMEDIA}
 					${COREVIDEO}
+					${COREMEDIA}
 					${COREMEDIAIO}
-					${COCOA}
 					${IOSURFACE}
 					./
 					../common)
@@ -29,10 +23,10 @@ set(mac-dal-plugin_HEADERS
 	Defines.h
 	Logging.h
 	OBSDALPlugInInterface.h
-    OBSDALObjectStore.h
+	OBSDALObjectStore.h
 	OBSDALPlugIn.h
 	OBSDALDevice.h
-    OBSDALStream.h
+	OBSDALStream.h
 	CMSampleBufferUtils.h
 	OBSDALMachClient.h
 	../common/MachProtocol.h)
@@ -43,7 +37,7 @@ set(mac-dal-plugin_SOURCES
 	OBSDALObjectStore.mm
 	OBSDALPlugIn.mm
 	OBSDALDevice.mm
-    OBSDALStream.mm
+	OBSDALStream.mm
 	CMSampleBufferUtils.mm
 	OBSDALMachClient.mm)
 
@@ -64,13 +58,11 @@ else (XCODE)
 endif (XCODE)
 
 target_link_libraries(mac-dal-plugin
-	${AVFOUNDATION}
-	${COCOA}
+	${APPKIT}
 	${COREFOUNDATION}
-	${COREMEDIA}
 	${COREVIDEO}
+	${COREMEDIA}
 	${COREMEDIAIO}
-	${IOSURFACE}
 	${IOKIT})
 
 add_custom_command(TARGET mac-dal-plugin
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm b/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm
index 65087caf8..3ff468024 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm
@@ -19,7 +19,6 @@
 
 #import "OBSDALDevice.h"
 
-#import <CoreFoundation/CoreFoundation.h>
 #include <IOKit/audio/IOAudioTypes.h>
 
 #import "OBSDALPlugIn.h"
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h
index 5ee418572..037dc06f7 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h
@@ -17,9 +17,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
 
-#import <Foundation/Foundation.h>
-#import <CoreMediaIO/CMIOHardwarePlugIn.h>
-
 #import "OBSDALObjectStore.h"
 #import "OBSDALMachClient.h"
 #import "OBSDALStream.h"
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm
index d69dfe95b..eb1346f0d 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm
@@ -19,8 +19,6 @@
 
 #import "OBSDALPlugIn.h"
 
-#import <CoreMediaIO/CMIOHardwarePlugin.h>
-
 #import "Logging.h"
 
 typedef enum {
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm
index 47e2f9ea2..0e93c809b 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm
@@ -21,8 +21,6 @@
 
 #import "OBSDALPlugInInterface.h"
 
-#import <CoreFoundation/CFUUID.h>
-
 #import "OBSDALPlugIn.h"
 #import "OBSDALDevice.h"
 #import "OBSDALStream.h"
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm
index d0a0866c3..4adf1b4c2 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm
@@ -17,8 +17,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
 
-#import <CoreMediaIO/CMIOHardwarePlugin.h>
-
 #import "OBSDALPlugInInterface.h"
 #import "Logging.h"
 #import "Defines.h"
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h b/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h
index 703e0c291..d660b71c2 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h
@@ -17,8 +17,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with obs-mac-virtualcam. If not, see <http://www.gnu.org/licenses/>.
 
-#import <Foundation/Foundation.h>
-
 #import "OBSDALObjectStore.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm b/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm
index 7c4334e43..730bb4cc2 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm
+++ b/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm
@@ -21,7 +21,6 @@
 
 #import <AppKit/AppKit.h>
 #import <mach/mach_time.h>
-#include <CoreMediaIO/CMIOSampleBuffer.h>
 
 #import "Logging.h"
 #import "CMSampleBufferUtils.h"
diff --git a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
index e151adcdc..a500a8a13 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
+++ b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
@@ -1,26 +1,10 @@
 project(mac-virtualcam)
 
-find_library(AVFOUNDATION AVFoundation)
 find_library(APPKIT AppKit)
-find_library(COCOA Cocoa)
 find_library(COREFOUNDATION CoreFoundation)
-find_library(COREMEDIA CoreMedia)
-find_library(COREVIDEO CoreVideo)
-find_library(COCOA Cocoa)
-find_library(COREMEDIAIO CoreMediaIO)
-find_library(IOSURFACE IOSurface)
-find_library(IOKIT IOKit)
 
-include_directories(${AVFOUNDATION}
-					${APPKIT}
-					${COCOA}
+include_directories(${APPKIT}
 					${COREFOUNDATION}
-					${COREMEDIA}
-					${COREVIDEO}
-					${COREMEDIAIO}
-					${COCOA}
-					${IOSURFACE}
-					"${CMAKE_SOURCE_DIR}/UI/obs-frontend-api"
 					../common)
 
 set(mac-virtualcam_HEADERS
@@ -38,18 +22,8 @@ add_library(mac-virtualcam MODULE
 
 target_link_libraries(mac-virtualcam
 	libobs
-	obs-frontend-api
-	Qt5::Core
-	Qt5::Widgets
-	${AVFOUNDATION}
 	${APPKIT}
-	${COCOA}
-	${COREFOUNDATION}
-	${COREMEDIA}
-	${COREVIDEO}
-	${COREMEDIAIO}
-	${IOSURFACE}
-	${IOKIT})
+	${COREFOUNDATION})
 
 set_target_properties(mac-virtualcam PROPERTIES
 	FOLDER "plugins"
diff --git a/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
index 42db688ad..f7bfb051d 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
@@ -6,7 +6,6 @@
 //
 
 #import "OBSDALMachServer.h"
-#import <Foundation/Foundation.h>
 #include <obs-module.h>
 #include "MachProtocol.h"
 #include "Defines.h"
diff --git a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
index 18c17ff5c..ea687fd1f 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
@@ -1,11 +1,4 @@
 #include <obs-module.h>
-#include <obs.hpp>
-#include <pthread.h>
-#include <QMainWindow.h>
-#include <QAction.h>
-#include <obs-frontend-api.h>
-#include <obs.h>
-#include <CoreFoundation/CoreFoundation.h>
 #include <AppKit/AppKit.h>
 #include "OBSDALMachServer.h"
 #include "Defines.h"