提交 fd34f0b2 编写于 作者: G gxalpha 提交者: Jim

mac-virtualcam: Fix remaining global namespaces

Gives the MachServer a unique name which was forgotten in a previous commit
上级 7a17f47d
...@@ -25,12 +25,12 @@ include_directories(${AVFOUNDATION} ...@@ -25,12 +25,12 @@ include_directories(${AVFOUNDATION}
set(mac-virtualcam_HEADERS set(mac-virtualcam_HEADERS
Defines.h Defines.h
MachServer.h OBSDALMachServer.h
../common/MachProtocol.h) ../common/MachProtocol.h)
set(mac-virtualcam_SOURCES set(mac-virtualcam_SOURCES
plugin-main.mm plugin-main.mm
MachServer.mm) OBSDALMachServer.mm)
add_library(mac-virtualcam MODULE add_library(mac-virtualcam MODULE
${mac-virtualcam_SOURCES} ${mac-virtualcam_SOURCES}
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface MachServer : NSObject @interface OBSDALMachServer : NSObject
- (void)run; - (void)run;
......
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
// Created by John Boiles on 5/5/20. // Created by John Boiles on 5/5/20.
// //
#import "MachServer.h" #import "OBSDALMachServer.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include <obs-module.h> #include <obs-module.h>
#include "MachProtocol.h" #include "MachProtocol.h"
#include "Defines.h" #include "Defines.h"
@interface MachServer () <NSPortDelegate> @interface OBSDALMachServer () <NSPortDelegate>
@property NSPort *port; @property NSPort *port;
@property NSMutableSet *clientPorts; @property NSMutableSet *clientPorts;
@property NSRunLoop *runLoop; @property NSRunLoop *runLoop;
@end @end
@implementation MachServer @implementation OBSDALMachServer
- (id)init - (id)init
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <obs.h> #include <obs.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include "MachServer.h" #include "OBSDALMachServer.h"
#include "Defines.h" #include "Defines.h"
OBS_DECLARE_MODULE() OBS_DECLARE_MODULE()
...@@ -19,7 +19,7 @@ MODULE_EXPORT const char *obs_module_description(void) ...@@ -19,7 +19,7 @@ MODULE_EXPORT const char *obs_module_description(void)
obs_output_t *outputRef; obs_output_t *outputRef;
obs_video_info videoInfo; obs_video_info videoInfo;
static MachServer *sMachServer; static OBSDALMachServer *sMachServer;
static bool check_dal_plugin() static bool check_dal_plugin()
{ {
...@@ -120,7 +120,7 @@ static void *virtualcam_output_create(obs_data_t *settings, ...@@ -120,7 +120,7 @@ static void *virtualcam_output_create(obs_data_t *settings,
outputRef = output; outputRef = output;
blog(LOG_DEBUG, "output_create"); blog(LOG_DEBUG, "output_create");
sMachServer = [[MachServer alloc] init]; sMachServer = [[OBSDALMachServer alloc] init];
return data; return data;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册