From 33130d7d151a5f650c896673b522623dd97a3baa Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 16 Aug 2021 07:36:54 -0700
Subject: [PATCH] Revert "mac-virtualcam: Move DAL plugin to plugin data
 directory"

This reverts commit 4d1764036fdc05c4534468f22894baf299d24b2f.
---
 plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt | 2 +-
 plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
index 5718ec930..9224985a3 100644
--- a/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
+++ b/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
@@ -104,6 +104,6 @@ add_custom_command(TARGET mac-dal-plugin
 add_custom_command(TARGET mac-dal-plugin
 	POST_BUILD
 	COMMAND rm -rf "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-mac-virtualcam.plugin" || true
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-mac-virtualcam.plugin"
 	COMMENT "Copy plugin to destination"
 )
diff --git a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
index 18c17ff5c..59f097ba1 100644
--- a/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
+++ b/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
@@ -58,7 +58,7 @@ static bool check_dal_plugin()
 		if ([app bundleIdentifier] != nil) {
 			NSURL *bundleURL = [app bundleURL];
 			NSString *pluginPath =
-				@"Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin";
+				@"Contents/Resources/data/obs-mac-virtualcam.plugin";
 
 			NSURL *pluginUrl = [bundleURL
 				URLByAppendingPathComponent:pluginPath];
@@ -66,7 +66,7 @@ static bool check_dal_plugin()
 		} else {
 			dalPluginSourcePath = [[[[app executableURL]
 				URLByAppendingPathComponent:
-					@"../data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"]
+					@"../data/obs-mac-virtualcam.plugin"]
 				path]
 				stringByReplacingOccurrencesOfString:@"obs/"
 							  withString:@""];