Browse Source

mac-avcapture: Remove unnecesary file

Palana 10 years ago
parent
commit
8d90c8a44e

+ 1 - 2
plugins/mac-avcapture/CMakeLists.txt

@@ -18,8 +18,7 @@ set(mac-avcapture_HEADERS
 	)
 
 set(mac-avcapture_SOURCES
-	av-capture.m
-	plugin-main.c)
+	av-capture.m)
 
 set_source_files_properties(av-capture.m
 	PROPERTIES LANGUAGE C)

+ 21 - 11
plugins/mac-avcapture/av-capture.m

@@ -867,15 +867,25 @@ static void av_capture_update(void *data, obs_data_t *settings)
 			obs_data_get_bool(settings, "buffering"));
 }
 
-struct obs_source_info av_capture_info = {
-	.id             = "av_capture_input",
-	.type           = OBS_SOURCE_TYPE_INPUT,
-	.output_flags   = OBS_SOURCE_ASYNC_VIDEO,
-	.get_name       = av_capture_getname,
-	.create         = av_capture_create,
-	.destroy        = av_capture_destroy,
-	.get_defaults   = av_capture_defaults,
-	.get_properties = av_capture_properties,
-	.update         = av_capture_update,
-};
+OBS_DECLARE_MODULE()
+OBS_MODULE_USE_DEFAULT_LOCALE("mac-avcapture", "en-US")
+
+struct obs_source_info av_capture_info;
+
+bool obs_module_load(void)
+{
+	struct obs_source_info av_capture_info = {
+		.id             = "av_capture_input",
+		.type           = OBS_SOURCE_TYPE_INPUT,
+		.output_flags   = OBS_SOURCE_ASYNC_VIDEO,
+		.get_name       = av_capture_getname,
+		.create         = av_capture_create,
+		.destroy        = av_capture_destroy,
+		.get_defaults   = av_capture_defaults,
+		.get_properties = av_capture_properties,
+		.update         = av_capture_update,
+	};
 
+	obs_register_source(&av_capture_info);
+	return true;
+}

+ 0 - 12
plugins/mac-avcapture/plugin-main.c

@@ -1,12 +0,0 @@
-#include <obs-module.h>
-
-OBS_DECLARE_MODULE()
-OBS_MODULE_USE_DEFAULT_LOCALE("mac-avcapture", "en-US")
-
-extern struct obs_source_info av_capture_info;
-
-bool obs_module_load(void)
-{
-	obs_register_source(&av_capture_info);
-	return true;
-}