Call PW init functions and revert IDs

Fixes #7
dimtpap · Jun 28, 2022 · 61efdcf · 61efdcf
1 parent b46b85a
commit 61efdcf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/linux-pipewire-audio.c b/linux-pipewire-audio.c
@@ -30,7 +30,16 @@ MODULE_EXPORT const char *obs_module_description(void)
 
 bool obs_module_load(void)
 {
+	pw_init(NULL, NULL);
+
 	pipewire_audio_capture_load();
 	pipewire_audio_capture_app_load();
 	return true;
+}
+
+void obs_module_unload(void)
+{
+#if PW_CHECK_VERSION(0, 3, 49)
+	pw_deinit();
+#endif
 }
diff --git a/pipewire-audio-capture-app.c b/pipewire-audio-capture-app.c
@@ -868,7 +868,7 @@ const char *pipewire_audio_capture_app_name(void *data)
 void pipewire_audio_capture_app_load(void)
 {
 	struct obs_source_info pipewire_audio_capture_application = {
-		.id = "pipewire-audio-capture-application",
+		.id = "pipewire_audio_application_capture",
 		.type = OBS_SOURCE_TYPE_INPUT,
 		.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE,
 		.get_name = pipewire_audio_capture_app_name,

diff --git a/pipewire-audio-capture.c b/pipewire-audio-capture.c
@@ -551,7 +551,7 @@ const char *pipewire_audio_capture_output_name(void *data)
 void pipewire_audio_capture_load(void)
 {
 	struct obs_source_info pipewire_audio_capture_input = {
-		.id = "pipewire-audio-capture-input",
+		.id = "pipewire_audio_input_capture",
 		.type = OBS_SOURCE_TYPE_INPUT,
 		.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE,
 		.get_name = pipewire_audio_capture_input_name,
@@ -565,7 +565,7 @@ void pipewire_audio_capture_load(void)
 		.icon_type = OBS_ICON_TYPE_AUDIO_INPUT,
 	};
 	struct obs_source_info pipewire_audio_capture_output = {
-		.id = "pipewire-audio-capture-output",
+		.id = "pipewire_audio_output_capture",
 		.type = OBS_SOURCE_TYPE_INPUT,
 		.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE |
 				OBS_SOURCE_DO_NOT_SELF_MONITOR,