From fd34f0b2abe6abb2635479a313b1f1f96a37cb9a Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Sat, 28 Nov 2020 03:16:00 +0100
Subject: [PATCH] mac-virtualcam: Fix remaining global namespaces

Gives the MachServer a unique name which was forgotten in a previous commit
---
 plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt        | 4 ++--
 .../src/obs-plugin/{MachServer.h => OBSDALMachServer.h}     | 2 +-
 .../src/obs-plugin/{MachServer.mm => OBSDALMachServer.mm}   | 6 +++---
 plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename plugins/mac-virtualcam/src/obs-plugin/{MachServer.h => OBSDALMachServer.h} (92%)
 rename plugins/mac-virtualcam/src/obs-plugin/{MachServer.mm => OBSDALMachServer.mm} (97%)

diff --git a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
index 7e68774a..e151adcd 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
+++ b/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt
@@ -25,12 +25,12 @@ include_directories(${AVFOUNDATION}
 
 set(mac-virtualcam_HEADERS
 	Defines.h
-	MachServer.h
+	OBSDALMachServer.h
 	../common/MachProtocol.h)
 
 set(mac-virtualcam_SOURCES
 	plugin-main.mm
-	MachServer.mm)
+	OBSDALMachServer.mm)
 
 add_library(mac-virtualcam MODULE
 	${mac-virtualcam_SOURCES}
diff --git a/plugins/mac-virtualcam/src/obs-plugin/MachServer.h b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h
similarity index 92%
rename from plugins/mac-virtualcam/src/obs-plugin/MachServer.h
rename to plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h
index 0f21f091..c6ab0305 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/MachServer.h
+++ b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h
@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MachServer : NSObject
+@interface OBSDALMachServer : NSObject
 
 - (void)run;
 
diff --git a/plugins/mac-virtualcam/src/obs-plugin/MachServer.mm b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
similarity index 97%
rename from plugins/mac-virtualcam/src/obs-plugin/MachServer.mm
rename to plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
index 4529f4c3..42db688a 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/MachServer.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm
@@ -5,19 +5,19 @@
 //  Created by John Boiles  on 5/5/20.
 //
 
-#import "MachServer.h"
+#import "OBSDALMachServer.h"
 #import <Foundation/Foundation.h>
 #include <obs-module.h>
 #include "MachProtocol.h"
 #include "Defines.h"
 
-@interface MachServer () <NSPortDelegate>
+@interface OBSDALMachServer () <NSPortDelegate>
 @property NSPort *port;
 @property NSMutableSet *clientPorts;
 @property NSRunLoop *runLoop;
 @end
 
-@implementation MachServer
+@implementation OBSDALMachServer
 
 - (id)init
 {
diff --git a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
index 0857e4e5..37437f47 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
@@ -7,7 +7,7 @@
 #include <obs.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <AppKit/AppKit.h>
-#include "MachServer.h"
+#include "OBSDALMachServer.h"
 #include "Defines.h"
 
 OBS_DECLARE_MODULE()
@@ -19,7 +19,7 @@ MODULE_EXPORT const char *obs_module_description(void)
 
 obs_output_t *outputRef;
 obs_video_info videoInfo;
-static MachServer *sMachServer;
+static OBSDALMachServer *sMachServer;
 
 static bool check_dal_plugin()
 {
@@ -120,7 +120,7 @@ static void *virtualcam_output_create(obs_data_t *settings,
 	outputRef = output;
 
 	blog(LOG_DEBUG, "output_create");
-	sMachServer = [[MachServer alloc] init];
+	sMachServer = [[OBSDALMachServer alloc] init];
 	return data;
 }
 
-- 
GitLab