Complete revamp

CMakeLists.txt

@@ -5,8 +5,10 @@ if(BUILD_STANDALONE OR ENABLE_PIPEWIRE)
 
 	set(linux-pipewire-audio_SOURCES
 			linux-pipewire-audio.c
-			pipewire-input.c
-			pipewire-wrapper.c
+			pipewire-audio.h
+			pipewire-audio.c
+			pipewire-audio-capture.c
+			pipewire-audio-capture-app.c
 	)
 
 	set(linux-capture-audio_HEADERS

README.md

@@ -1,11 +1,7 @@
 # PipeWire Audio Capturing for OBS Studio
 ## Use this for production at your own risk
-**Experimental** PipeWire audio capturing for OBS Studio  
+PipeWire audio capturing for OBS Studio  
 This plugin adds 3 sources for capturing audio outputs, inputs and applications using PipeWire
-## Issues
-- It currently conflicts with the PipeWire screen/window captures. Expect crashes if you're using sources from both.
-- It only captures one stream per application, this is being worked on.
-- Generally there needs to be more error handling and polishing.
 ## Installation
 If you're using pre-built binaries from the [releases](https://github.com/Qufyy/obs-pipewire-audio-capture/releases) extract the archive in `~/.config/obs-studio/plugins/`
 

linux-pipewire-audio.c

@@ -17,21 +17,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <obs-module.h>
 
+#include <pipewire/pipewire.h>
+
+#include "pipewire-audio.h"
+
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("linux-pipewire-audio", "en-US")
 MODULE_EXPORT const char *obs_module_description(void)
 {
 	return "PipeWire input, output and application audio capture";
 }
 
-extern struct obs_source_info pipewire_audio_input_capture;
-extern struct obs_source_info pipewire_audio_output_capture;
-extern struct obs_source_info pipewire_audio_application_capture;
-
 bool obs_module_load(void)
 {
-	obs_register_source(&pipewire_audio_input_capture);
-	obs_register_source(&pipewire_audio_output_capture);
-	obs_register_source(&pipewire_audio_application_capture);
+	pipewire_audio_capture_load();
+	pipewire_audio_capture_app_load();
 	return true;
 }