Procházet zdrojové kódy

mac-virtualcam: Fix remaining global namespaces

Gives the MachServer a unique name which was forgotten in a previous commit
gxalpha před 4 roky
rodič
revize
fd34f0b2ab

+ 2 - 2
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}

+ 1 - 1
plugins/mac-virtualcam/src/obs-plugin/MachServer.h → plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MachServer : NSObject
+@interface OBSDALMachServer : NSObject
 
 - (void)run;
 

+ 3 - 3
plugins/mac-virtualcam/src/obs-plugin/MachServer.mm → 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
 {

+ 3 - 3
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;
 }