move things around

Makefile.in

@@ -10,13 +10,13 @@ clean:
 run:
 	SPA_PLUGIN_DIR=build/spa/plugins \
 	PIPEWIRE_MODULE_DIR=build \
-	PIPEWIRE_CONFIG_FILE=build/pipewire/daemon/pipewire.conf \
-	build/pipewire/daemon/pipewire
+	PIPEWIRE_CONFIG_FILE=build/src/daemon/pipewire.conf \
+	build/src/daemon/pipewire
 
 monitor:
 	SPA_PLUGIN_DIR=build/spa/plugins \
-	PIPEWIRE_MODULE_DIR=build/pipewire/modules/ \
-	build/pipewire/tools/pipewire-monitor
+	PIPEWIRE_MODULE_DIR=build/src/modules/ \
+	build/src/tools/pipewire-monitor
 
 dist:
 	git archive --prefix=pipewire-@VERSION@/ -o pipewire-@VERSION@.tar.gz @TAG@

doc/Doxyfile.in

@@ -780,8 +780,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "@top_srcdir@/pipewire/client/" \
-                         "@top_srcdir@/pipewire/server/"
+INPUT                  = "@top_srcdir@/src/"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -854,8 +853,8 @@ EXCLUDE_SYMBOLS        =
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = "@top_srcdir@/pipewire/tools" \
-                         "@top_srcdir@/pipewire/examples"
+EXAMPLE_PATH           = "@top_srcdir@/src/tools" \
+                         "@top_srcdir@/src/examples"
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and

meson.build

@@ -121,6 +121,7 @@ configure_file(input : 'config.h.meson',
   configuration : cdata)
 
 configinc = include_directories('.')
+pipewire_inc = include_directories('src')
 
 makedata = configuration_data()
   makedata.set('VERSION', pipewire_version)
@@ -152,7 +153,7 @@ gst_dep = [dependency('gstreamer-1.0'),
            dependency('gstreamer-allocators-1.0'),]
 
 subdir('spa')
-subdir('pipewire')
+subdir('src')
 subdir('pkgconfig')
 
 doxygen = find_program('doxygen', required: false)

pipewire.spec

@@ -13,7 +13,7 @@
 
 Name:           pipewire
 Summary:        Media Sharing Server
-Version:        0.1.2
+Version:        0.1.2.1
 Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PipeWire
@@ -108,7 +108,6 @@ exit 0
 %{_datadir}/doc/pipewire/html
 %{_bindir}/pipewire
 %{_libdir}/libpipewire-%{majorminor}.so.*
-%{_libdir}/libpipewirecore-%{majorminor}.so.*
 %{_libdir}/libspa-lib.so.*
 %{_libdir}/gstreamer-1.0/libgstpipewire.*
 %{_libdir}/pipewire-%{majorminor}/
@@ -124,12 +123,10 @@ exit 0
 
 %files devel
 %{_libdir}/libpipewire-%{majorminor}.so
-%{_libdir}/libpipewirecore-%{majorminor}.so
 %{_libdir}/libspa-lib.so
 %{_includedir}/pipewire/
 %{_includedir}/spa/
 %{_libdir}/pkgconfig/libpipewire-%{majorminor}.pc
-%{_libdir}/pkgconfig/libpipewirecore-%{majorminor}.pc
 %{_libdir}/pkgconfig/libspa-%{majorminor}.pc
 
 %files utils

pkgconfig/libpipewire.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@/
 moduledir=@moduledir@
 
 Name: libpipewire
-Description: PipeWire Client Interface
+Description: PipeWire Interface
 Version: @VERSION@
 Libs: -L${libdir} -lpipewire-@PIPEWIRE_API_VERSION@
 Cflags: -I${includedir} -D_REENTRANT

pkgconfig/libpipewirecore.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/
-moduledir=@moduledir@
-
-Name: libpipewirecore
-Description: PipeWire Core
-Version: @VERSION@
-Libs: -L${libdir} -lpipewirecore-@PIPEWIRE_API_VERSION@
-Cflags: -I${includedir} -D_REENTRANT

pkgconfig/meson.build

@@ -11,7 +11,6 @@ pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
 
 pkg_files = [
   'libpipewire',
-  'libpipewirecore',
   'libspa',
 ]
 

src/daemon/daemon-config.c

@@ -25,10 +25,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/server/command.h>
+#include <pipewire/pipewire.h>
+#include <pipewire/command.h>
 
-#include "pipewire/daemon/daemon-config.h"
+#include "daemon/daemon-config.h"
 
 #define DEFAULT_CONFIG_FILE PIPEWIRE_CONFIG_DIR "/pipewire.conf"
 

src/daemon/daemon-config.h

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/server/core.h>
+#include <pipewire/core.h>
 
 struct pw_daemon_config {
 	struct spa_list commands;

src/daemon/main.c

@@ -17,9 +17,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/server/core.h>
-#include <pipewire/server/module.h>
+#include <pipewire/pipewire.h>
+#include <pipewire/core.h>
+#include <pipewire/module.h>
 
 #include "daemon-config.h"
 

src/daemon/meson.build

@@ -26,5 +26,5 @@ executable('pipewire',
   install: true,
   c_args : pipewire_c_args,
   include_directories : [configinc, spa_inc],
-  dependencies : [pipewire_dep, pipewirecore_dep],
+  dependencies : [pipewire_dep],
 )

src/examples/local-v4l2.c

@@ -27,13 +27,13 @@
 #include <spa/video/format-utils.h>
 #include <spa/format-builder.h>
 #include <spa/props.h>
-
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/sig.h>
-#include <pipewire/server/module.h>
-#include <pipewire/server/node-factory.h>
 #include <spa/lib/debug.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/sig.h>
+#include <pipewire/module.h>
+#include <pipewire/node-factory.h>
+
 struct type {
 	uint32_t format;
 	uint32_t props;
@@ -475,7 +475,6 @@ static void make_nodes(struct data *data)
 	pw_node_export(data->node);
 
 	factory = pw_core_find_node_factory(data->core, "spa-node-factory");
-
 	props = pw_properties_new("spa.library.name", "v4l2/libspa-v4l2",
 				  "spa.factory.name", "v4l2-source", NULL);
 	data->v4l2 = pw_node_factory_create_node(factory, NULL, "v4l2-source", props);

src/examples/meson.build

@@ -1,18 +1,18 @@
 executable('video-src',
   'video-src.c',
   install: false,
-  dependencies : [pipewirecore_dep],
+  dependencies : [pipewire_dep],
 )
 
 if sdl_dep.found()
   executable('video-play',
     'video-play.c',
     install: false,
-    dependencies : [pipewire_dep,pipewirecore_dep, sdl_dep],
+    dependencies : [pipewire_dep, sdl_dep],
   )
   executable('local-v4l2',
     'local-v4l2.c',
     install: false,
-    dependencies : [pipewire_dep,pipewirecore_dep, sdl_dep],
+    dependencies : [pipewire_dep, sdl_dep],
   )
 endif

src/examples/video-play.c

@@ -27,11 +27,11 @@
 #include <spa/video/format-utils.h>
 #include <spa/format-builder.h>
 #include <spa/props.h>
-
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/sig.h>
 #include <spa/lib/debug.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/sig.h>
+
 struct type {
 	uint32_t format;
 	uint32_t props;
@@ -294,12 +294,12 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
 	struct data *data = SPA_CONTAINER_OF(listener, struct data, on_state_changed);
 
 	switch (remote->state) {
-	case PW_CONTEXT_STATE_ERROR:
+	case PW_REMOTE_STATE_ERROR:
 		printf("remote error: %s\n", remote->error);
 		data->running = false;
 		break;
 
-	case PW_CONTEXT_STATE_CONNECTED:
+	case PW_REMOTE_STATE_CONNECTED:
 	{
 		const struct spa_format *formats[1];
 		uint8_t buffer[1024];

src/examples/video-src.c

@@ -27,11 +27,11 @@
 #include <spa/video/format-utils.h>
 #include <spa/format-builder.h>
 #include <spa/props.h>
-
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/sig.h>
 #include <spa/lib/debug.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/sig.h>
+
 struct type {
 	uint32_t format;
 	uint32_t props;

src/gst/gstpipewireclock.h

@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 
-#include <pipewire/client/pipewire.h>
+#include <pipewire/pipewire.h>
 
 G_BEGIN_DECLS
 

src/gst/gstpipewiredeviceprovider.h

@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#include <pipewire/client/pipewire.h>
+#include <pipewire/pipewire.h>
 
 #include <gst/gst.h>
 

src/gst/gstpipewirepool.h

@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 
-#include <pipewire/client/pipewire.h>
+#include <pipewire/pipewire.h>
 
 G_BEGIN_DECLS
 

src/gst/gstpipewiresink.h

@@ -23,8 +23,8 @@
 #include <gst/gst.h>
 #include <gst/base/gstbasesink.h>
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/gst/gstpipewirepool.h>
+#include <pipewire/pipewire.h>
+#include <gst/gstpipewirepool.h>
 
 G_BEGIN_DECLS
 

src/gst/gstpipewiresrc.c

@@ -1016,7 +1016,8 @@ gst_pipewire_src_open (GstPipeWireSrc * pwsrc)
     goto mainloop_failed;
 
   pw_thread_loop_lock (pwsrc->main_loop);
-  pwsrc->remote = pw_remote_new (pwsrc->core, NULL);
+  if ((pwsrc->remote = pw_remote_new (pwsrc->core, NULL)) == NULL)
+    goto no_remote;
 
   pw_signal_add (&pwsrc->remote->state_changed, &pwsrc->remote_state_changed, on_remote_state_changed);
 
@@ -1042,7 +1043,8 @@ gst_pipewire_src_open (GstPipeWireSrc * pwsrc)
     props = NULL;
   }
 
-  pwsrc->stream = pw_stream_new (pwsrc->remote, pwsrc->client_name, props);
+  if ((pwsrc->stream = pw_stream_new (pwsrc->remote, pwsrc->client_name, props)) == NULL)
+    goto no_stream;
 
   pw_signal_add (&pwsrc->stream->state_changed, &pwsrc->stream_state_changed, on_state_changed);
   pw_signal_add (&pwsrc->stream->format_changed, &pwsrc->stream_format_changed, on_format_changed);
@@ -1061,11 +1063,23 @@ mainloop_failed:
     GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED, ("error starting mainloop"), (NULL));
     return FALSE;
   }
+no_remote:
+  {
+    GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED, ("can't create remote"), (NULL));
+    pw_thread_loop_unlock (pwsrc->main_loop);
+    return FALSE;
+  }
 connect_error:
   {
     pw_thread_loop_unlock (pwsrc->main_loop);
     return FALSE;
   }
+no_stream:
+  {
+    GST_ELEMENT_ERROR (pwsrc, RESOURCE, FAILED, ("can't create stream"), (NULL));
+    pw_thread_loop_unlock (pwsrc->main_loop);
+    return FALSE;
+  }
 }
 
 static void

src/gst/gstpipewiresrc.h

@@ -23,7 +23,7 @@
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
 
-#include <pipewire/client/pipewire.h>
+#include <pipewire/pipewire.h>
 
 G_BEGIN_DECLS
 

src/gst/meson.build

@@ -25,7 +25,7 @@ pipewire_gst = shared_library('gstpipewire',
     pipewire_gst_sources,
     c_args : pipewire_gst_c_args,
     include_directories : [configinc, spa_inc],
-    dependencies : [gobject_dep, glib_dep, gio_dep, gst_dep, pipewire_dep, pipewirecore_dep],
+    dependencies : [gobject_dep, glib_dep, gio_dep, gst_dep, pipewire_dep],
     install : true,
     install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
 )

src/meson.build

@@ -1,7 +1,6 @@
 
-subdir('client')
+subdir('pipewire')
 subdir('extensions')
-subdir('server')
 subdir('daemon')
 subdir('tools')
 subdir('modules')

src/modules/meson.build

@@ -11,7 +11,7 @@ pipewire_module_flatpak = shared_library('pipewire-module-flatpak', [ 'module-fl
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
 )
 
 pipewire_module_autolink = shared_library('pipewire-module-autolink', [ 'module-autolink.c' ],
@@ -20,7 +20,7 @@ pipewire_module_autolink = shared_library('pipewire-module-autolink', [ 'module-
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 pipewire_module_mixer = shared_library('pipewire-module-mixer',
@@ -30,7 +30,7 @@ pipewire_module_mixer = shared_library('pipewire-module-mixer',
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 pipewire_module_client_node = shared_library('pipewire-module-client-node',
@@ -44,7 +44,7 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 #pipewire_module_protocol_dbus = shared_library('pipewire-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ],
@@ -53,7 +53,7 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
 #  link_with : spalib,
 #  install : true,
 #  install_dir : modules_install_dir,
-#  dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+#  dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep],
 #)
 
 pipewire_module_protocol_native = shared_library('pipewire-module-protocol-native',
@@ -65,20 +65,19 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 if jack_dep.found()
 pipewire_module_jack = shared_library('pipewire-module-jack',
   [ 'module-jack.c',
-    'module-jack/shm.c',
-    'module-jack/jack-node.c' ],
+    'module-jack/shm.c' ],
   c_args : pipewire_module_c_args,
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [jack_dep, mathlib, dl_lib, rt_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [jack_dep, mathlib, dl_lib, rt_lib, pipewire_dep],
 )
 endif
 
@@ -88,5 +87,5 @@ pipewire_module_suspend_on_idle = shared_library('pipewire-module-suspend-on-idl
   link_with : spalib,
   install : true,
   install_dir : modules_install_dir,
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )

src/modules/module-autolink.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include "pipewire/client/interfaces.h"
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
 
 struct impl {
 	struct pw_core *core;

src/modules/module-client-node.c

@@ -24,9 +24,10 @@
 
 #include "config.h"
 
-#include "pipewire/client/interfaces.h"
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
+
 #include "module-client-node/client-node.h"
 
 struct pw_protocol *pw_protocol_native_ext_client_node_init(void);

src/modules/module-client-node/client-node.c

@@ -32,12 +32,12 @@
 #include "spa/format-builder.h"
 #include "spa/lib/format.h"
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/interfaces.h"
-#include "pipewire/client/transport.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/transport.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/modules/spa/spa-node.h"
+#include "pipewire/core.h"
+#include "modules/spa/spa-node.h"
 #include "client-node.h"
 
 /** \cond */

src/modules/module-client-node/client-node.h

@@ -20,8 +20,8 @@
 #ifndef __PIPEWIRE_CLIENT_NODE_H__
 #define __PIPEWIRE_CLIENT_NODE_H__
 
-#include <pipewire/server/node.h>
-#include <pipewire/extensions/client-node.h>
+#include <pipewire/node.h>
+#include <extensions/client-node.h>
 
 #ifdef __cplusplus
 extern "C" {

src/modules/module-client-node/protocol-native.c

@@ -20,14 +20,14 @@
 #include <errno.h>
 
 #include "spa/pod-iter.h"
-#include "pipewire/client/pipewire.h"
 
-#include "pipewire/client/interfaces.h"
-#include "pipewire/client/protocol.h"
-#include "pipewire/server/client.h"
-#include "pipewire/extensions/client-node.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/protocol.h"
+#include "pipewire/client.h"
+#include "extensions/client-node.h"
 
-#include "pipewire/modules/module-protocol-native/connection.h"
+#include "modules/module-protocol-native/connection.h"
 
 /** \cond */
 

src/modules/module-flatpak.c

@@ -29,11 +29,11 @@
 
 #include <dbus/dbus.h>
 
-#include "pipewire/client/interfaces.h"
-#include "pipewire/client/utils.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/utils.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
 
 struct impl {
 	struct pw_core *core;

src/modules/module-jack.c

@@ -34,25 +34,25 @@
 
 #include "config.h"
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/log.h"
-#include "pipewire/client/interfaces.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/log.h"
+#include "pipewire/interfaces.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/server/node.h"
-#include "pipewire/server/module.h"
-#include "pipewire/server/client.h"
-#include "pipewire/server/resource.h"
-#include "pipewire/server/link.h"
-#include "pipewire/server/node-factory.h"
-#include "pipewire/server/data-loop.h"
-#include "pipewire/server/main-loop.h"
+#include "pipewire/core.h"
+#include "pipewire/node.h"
+#include "pipewire/module.h"
+#include "pipewire/client.h"
+#include "pipewire/resource.h"
+#include "pipewire/link.h"
+#include "pipewire/node-factory.h"
+#include "pipewire/data-loop.h"
+#include "pipewire/main-loop.h"
 
-#include "pipewire/modules/module-jack/defs.h"
-#include "pipewire/modules/module-jack/shm.h"
-#include "pipewire/modules/module-jack/shared.h"
-#include "pipewire/modules/module-jack/synchro.h"
-#include "pipewire/modules/module-jack/server.h"
+#include "modules/module-jack/defs.h"
+#include "modules/module-jack/shm.h"
+#include "modules/module-jack/shared.h"
+#include "modules/module-jack/synchro.h"
+#include "modules/module-jack/server.h"
 
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX   108

src/modules/module-jack/defs.h

@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "pipewire/client/log.h"
+#include "pipewire/log.h"
 
 #define USE_POSIX_SHM
 #undef JACK_MONITOR

src/modules/module-mixer.c

@@ -24,9 +24,9 @@
 
 #include "config.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
-#include "pipewire/modules/spa/spa-node.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
+#include "modules/spa/spa-node.h"
 
 #define AUDIOMIXER_LIB "audiomixer/libspa-audiomixer"
 

src/modules/module-protocol-native.c

@@ -29,20 +29,20 @@
 
 #include "config.h"
 
-#include "pipewire/client/connection.h"
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/log.h"
-#include "pipewire/client/interfaces.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/log.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/core.h"
+#include "pipewire/node.h"
+#include "pipewire/module.h"
+#include "pipewire/client.h"
+#include "pipewire/resource.h"
+#include "pipewire/link.h"
+#include "pipewire/node-factory.h"
+#include "pipewire/data-loop.h"
+#include "pipewire/main-loop.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/server/node.h"
-#include "pipewire/server/module.h"
-#include "pipewire/server/client.h"
-#include "pipewire/server/resource.h"
-#include "pipewire/server/link.h"
-#include "pipewire/server/node-factory.h"
-#include "pipewire/server/data-loop.h"
-#include "pipewire/server/main-loop.h"
+#include "modules/module-protocol-native/connection.h"
 
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX   108

src/modules/module-protocol-native/connection.c

@@ -27,7 +27,8 @@
 
 #include <spa/lib/debug.h>
 
-#include <pipewire/client/pipewire.h>
+#include <pipewire/pipewire.h>
+
 #include "connection.h"
 
 /** \cond */

src/modules/module-protocol-native/connection.h

@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 #include <spa/defs.h>
-#include <pipewire/client/sig.h>
+#include <pipewire/sig.h>
 
 /** \class pw_connection
  *

src/modules/module-protocol-native/protocol-native.c

@@ -20,11 +20,11 @@
 #include <errno.h>
 
 #include "spa/pod-iter.h"
-#include "pipewire/client/pipewire.h"
 
-#include "pipewire/client/protocol.h"
-#include "pipewire/client/interfaces.h"
-#include "pipewire/server/resource.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/protocol.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/resource.h"
 
 #include "connection.h"
 

src/modules/module-suspend-on-idle.c

@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
 
 struct impl {
 	struct pw_core *core;

src/modules/spa/meson.build

@@ -10,7 +10,7 @@ pipewire_module_spa_monitor = shared_library('pipewire-module-spa-monitor',
   link_with : spalib,
   install : true,
   install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
@@ -20,7 +20,7 @@ pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
   link_with : spalib,
   install : true,
   install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )
 
 pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
@@ -30,5 +30,5 @@ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-fact
   link_with : spalib,
   install : true,
   install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
-  dependencies : [mathlib, dl_lib, pipewire_dep, pipewirecore_dep],
+  dependencies : [mathlib, dl_lib, pipewire_dep],
 )

src/modules/spa/module-monitor.c

@@ -27,9 +27,9 @@
 
 #include <spa/lib/props.h>
 
-#include <pipewire/client/utils.h>
-#include <pipewire/server/core.h>
-#include <pipewire/server/module.h>
+#include <pipewire/utils.h>
+#include <pipewire/core.h>
+#include <pipewire/module.h>
 
 #include "spa-monitor.h"
 

src/modules/spa/module-node-factory.c

@@ -24,9 +24,10 @@
 
 #include "config.h"
 
-#include "pipewire/client/interfaces.h"
-#include "pipewire/server/core.h"
-#include "pipewire/server/module.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/core.h"
+#include "pipewire/module.h"
+
 #include "spa-node.h"
 
 struct impl {

src/modules/spa/module-node.c

@@ -27,9 +27,9 @@
 
 #include <spa/lib/props.h>
 
-#include <pipewire/client/utils.h>
-#include <pipewire/server/core.h>
-#include <pipewire/server/module.h>
+#include <pipewire/utils.h>
+#include <pipewire/core.h>
+#include <pipewire/module.h>
 
 #include "spa-monitor.h"
 #include "spa-node.h"

src/modules/spa/spa-monitor.c

@@ -29,8 +29,9 @@
 #include <spa/node.h>
 #include <spa/monitor.h>
 #include <spa/pod-iter.h>
-#include <pipewire/client/log.h>
-#include <pipewire/server/node.h>
+
+#include <pipewire/log.h>
+#include <pipewire/node.h>
 
 #include "spa-monitor.h"
 #include "spa-node.h"

src/modules/spa/spa-monitor.h

@@ -20,9 +20,10 @@
 #ifndef __PIPEWIRE_SPA_MONITOR_H__
 #define __PIPEWIRE_SPA_MONITOR_H__
 
-#include <pipewire/server/core.h>
 #include <spa/monitor.h>
 
+#include <pipewire/core.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/modules/spa/spa-node.h

@@ -20,8 +20,8 @@
 #ifndef __PIPEWIRE_SPA_NODE_H__
 #define __PIPEWIRE_SPA_NODE_H__
 
-#include <pipewire/server/core.h>
-#include <pipewire/server/node.h>
+#include <pipewire/core.h>
+#include <pipewire/node.h>
 
 #ifdef __cplusplus
 extern "C" {

src/pipewire/client.c

@@ -19,11 +19,11 @@
 
 #include <string.h>
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/interfaces.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
 
-#include "pipewire/server/client.h"
-#include "pipewire/server/resource.h"
+#include "pipewire/client.h"
+#include "pipewire/resource.h"
 
 /** \cond */
 struct impl {

src/pipewire/client.h

@@ -30,12 +30,11 @@ extern "C" {
 
 #include <sys/socket.h>
 
-#include <pipewire/client/introspect.h>
-#include <pipewire/client/properties.h>
-#include <pipewire/client/sig.h>
-
-#include <pipewire/server/core.h>
-#include <pipewire/server/resource.h>
+#include <pipewire/core.h>
+#include <pipewire/introspect.h>
+#include <pipewire/properties.h>
+#include <pipewire/sig.h>
+#include <pipewire/resource.h>
 
 /** \page page_client Client
  *

src/pipewire/command.c

@@ -20,9 +20,9 @@
 
 #include <string.h>
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/utils.h>
-#include <pipewire/server/module.h>
+#include <pipewire/pipewire.h>
+#include <pipewire/utils.h>
+#include <pipewire/module.h>
 
 #include "command.h"
 

src/pipewire/command.h

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/server/core.h>
+#include <pipewire/core.h>
 
 /** \class pw_command
  *

src/pipewire/core.c

@@ -18,13 +18,14 @@
  */
 #include <time.h>
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/interfaces.h>
-#include <pipewire/server/core.h>
-#include <pipewire/server/data-loop.h>
 #include <spa/lib/debug.h>
 #include <spa/format-utils.h>
 
+#include <pipewire/pipewire.h>
+#include <pipewire/interfaces.h>
+#include <pipewire/core.h>
+#include <pipewire/data-loop.h>
+
 /** \cond */
 struct global_impl {
 	struct pw_global this;

src/pipewire/core.h

@@ -29,15 +29,15 @@ extern "C" {
 
 struct pw_global;
 
-#include <pipewire/client/type.h>
-#include <pipewire/client/interfaces.h>
+#include <pipewire/type.h>
+#include <pipewire/interfaces.h>
 
-#include <pipewire/server/main-loop.h>
-#include <pipewire/server/data-loop.h>
-#include <pipewire/server/resource.h>
-#include <pipewire/server/node.h>
-#include <pipewire/server/link.h>
-#include <pipewire/server/node-factory.h>
+#include <pipewire/main-loop.h>
+#include <pipewire/data-loop.h>
+#include <pipewire/resource.h>
+#include <pipewire/node.h>
+#include <pipewire/link.h>
+#include <pipewire/node-factory.h>
 
 /** \page page_server_api Server API
  *

src/pipewire/data-loop.c

@@ -21,9 +21,9 @@
 #include <errno.h>
 #include <sys/resource.h>
 
-#include "pipewire/client/log.h"
-#include "pipewire/client/rtkit.h"
-#include "pipewire/server/data-loop.h"
+#include "pipewire/log.h"
+#include "pipewire/rtkit.h"
+#include "pipewire/data-loop.h"
 
 /** \cond */
 struct impl {

src/pipewire/data-loop.h

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/client/loop.h>
+#include <pipewire/loop.h>
 
 /** \class pw_data_loop
  *

src/pipewire/interfaces.h

@@ -30,7 +30,7 @@ extern "C" {
 #include <spa/param-alloc.h>
 #include <spa/node.h>
 
-#include <pipewire/client/introspect.h>
+#include <pipewire/introspect.h>
 
 /**
  * \page page_pipewire_protocol The PipeWire protocol

src/pipewire/introspect.c

@@ -19,10 +19,9 @@
 
 #include <string.h>
 
-#include "pipewire/client/pipewire.h"
+#include "pipewire/pipewire.h"
 
-#include "pipewire/server/remote.h"
-#include "pipewire/client/subscribe.h"
+#include "pipewire/remote.h"
 
 const char *pw_node_state_as_string(enum pw_node_state state)
 {

src/pipewire/introspect.h

@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/client/properties.h>
+#include <pipewire/properties.h>
 
 /** \enum pw_node_state The different node states \memberof pw_node */
 enum pw_node_state {

src/pipewire/link.c

@@ -26,11 +26,10 @@
 #include <spa/lib/format.h>
 #include <spa/lib/props.h>
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/interfaces.h"
-
-#include "pipewire/server/link.h"
-#include "pipewire/server/work-queue.h"
+#include "pipewire.h"
+#include "interfaces.h"
+#include "link.h"
+#include "work-queue.h"
 
 #define MAX_BUFFERS     16
 

src/pipewire/link.h

@@ -26,12 +26,12 @@ extern "C" {
 
 #include <spa/ringbuffer.h>
 
-#include <pipewire/client/mem.h>
-#include <pipewire/client/introspect.h>
+#include <pipewire/mem.h>
+#include <pipewire/introspect.h>
 
-#include <pipewire/server/core.h>
-#include <pipewire/server/port.h>
-#include <pipewire/server/main-loop.h>
+#include <pipewire/core.h>
+#include <pipewire/port.h>
+#include <pipewire/main-loop.h>
 
 /** \page page_link Link
  *

src/pipewire/log.c

@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <pipewire/client/log.h>
+#include <pipewire/log.h>
 
 #define DEFAULT_LOG_LEVEL SPA_LOG_LEVEL_ERROR
 

src/pipewire/loop.c

@@ -20,9 +20,9 @@
 #include <spa/loop.h>
 #include <spa/type-map.h>
 
-#include <pipewire/client/pipewire.h>
-#include <pipewire/client/loop.h>
-#include <pipewire/client/log.h>
+#include <pipewire/pipewire.h>
+#include <pipewire/loop.h>
+#include <pipewire/log.h>
 
 #define DATAS_SIZE (4096 * 8)
 

src/pipewire/loop.h

@@ -26,7 +26,7 @@ extern "C" {
 
 #include <spa/loop.h>
 
-#include <pipewire/client/sig.h>
+#include <pipewire/sig.h>
 
 /** \class pw_loop
  *

src/pipewire/main-loop.c

@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "pipewire/client/log.h"
-#include "pipewire/server/main-loop.h"
+#include "pipewire/log.h"
+#include "pipewire/main-loop.h"
 
 /** \cond */
 struct impl {

src/pipewire/main-loop.h

@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/client/loop.h>
+#include <pipewire/loop.h>
 
 /** \class pw_main_loop
  *

src/pipewire/map.h

@@ -28,8 +28,8 @@ extern "C" {
 #include <stdio.h>
 
 #include <spa/defs.h>
-#include <pipewire/client/array.h>
-#include <pipewire/client/log.h>
+#include <pipewire/array.h>
+#include <pipewire/log.h>
 
 /** \class pw_map
  *

src/pipewire/mem.c

@@ -31,8 +31,8 @@
 #include <stdlib.h>
 #include <sys/syscall.h>
 
-#include <pipewire/client/log.h>
-#include <pipewire/client/mem.h>
+#include <pipewire/log.h>
+#include <pipewire/mem.h>
 
 /*
  * No glibc wrappers exist for memfd_create(2), so provide our own.

src/pipewire/meson.build

@@ -1,15 +1,27 @@
 pipewire_headers = [
   'array.h',
+  'client.h',
+  'command.h',
+  'core.h',
+  'data-loop.h',
   'interfaces.h',
   'introspect.h',
+  'link.h',
   'log.h',
   'loop.h',
+  'main-loop.h',
   'map.h',
   'mem.h',
+  'module.h',
+  'node.h',
+  'node-factory.h',
   'pipewire.h',
+  'port.h',
   'properties.h',
   'protocol.h',
   'proxy.h',
+  'remote.h',
+  'resource.h',
   'rtkit.h',
   'sig.h',
   'stream.h',
@@ -17,26 +29,40 @@ pipewire_headers = [
   'transport.h',
   'type.h',
   'utils.h',
+  'work-queue.h',
 ]
 
 pipewire_sources = [
+  'client.c',
+  'command.c',
+  'core.c',
+  'data-loop.c',
   'introspect.c',
+  'link.c',
   'log.c',
   'loop.c',
+  'main-loop.c',
   'mem.c',
+  'module.c',
+  'node.c',
+  'node-factory.c',
   'pipewire.c',
+  'port.c',
   'properties.c',
   'protocol.c',
   'proxy.c',
+  'remote.c',
+  'resource.c',
   'stream.c',
   'rtkit.c',
   'thread-loop.c',
   'transport.c',
   'type.c',
   'utils.c',
+  'work-queue.c',
 ]
 
-install_headers(pipewire_headers, subdir : 'pipewire/client')
+install_headers(pipewire_headers, subdir : 'pipewire')
 
 libpipewire_c_args = [
   '-DHAVE_CONFIG_H',
@@ -44,18 +70,17 @@ libpipewire_c_args = [
   '-D_POSIX_C_SOURCE',
 ]
 
-
 libpipewire = shared_library('pipewire-@0@'.format(apiversion), pipewire_sources,
   version : libversion,
   soversion : soversion,
   c_args : libpipewire_c_args,
-  include_directories : [configinc, spa_inc],
+  include_directories : [pipewire_inc, configinc, spa_inc],
   link_with : spalib,
   install : true,
   dependencies : [dbus_dep, dl_lib, mathlib, pthread_lib],
 )
 
 pipewire_dep = declare_dependency(link_with : libpipewire,
-  include_directories : [configinc, spa_inc],
+  include_directories : [pipewire_inc, configinc, spa_inc],
   dependencies : [pthread_lib,spalib_dep],
 )

src/pipewire/module.c

@@ -27,10 +27,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/interfaces.h"
-#include "pipewire/client/utils.h"
-#include "pipewire/server/module.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
+#include "pipewire/utils.h"
+#include "pipewire/module.h"
 
 /** \cond */
 struct impl {
@@ -192,20 +192,24 @@ struct pw_module *pw_module_load(struct pw_core *core,
 	return this;
 
       not_found:
-	asprintf(err, "No module \"%s\" was found", name);
+	if (err)
+		asprintf(err, "No module \"%s\" was found", name);
 	return NULL;
       open_failed:
-	asprintf(err, "Failed to open module: \"%s\" %s", filename, dlerror());
+	if (err)
+		asprintf(err, "Failed to open module: \"%s\" %s", filename, dlerror());
 	free(filename);
 	return NULL;
       no_mem:
       no_pw_module:
-	asprintf(err, "\"%s\" is not a pipewire module", name);
+	if (err)
+		asprintf(err, "\"%s\" is not a pipewire module", name);
 	dlclose(hnd);
 	free(filename);
 	return NULL;
       init_failed:
-	asprintf(err, "\"%s\" failed to initialize", name);
+	if (err)
+		asprintf(err, "\"%s\" failed to initialize", name);
 	pw_module_destroy(this);
 	return NULL;
 }

src/pipewire/module.h

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-#include <pipewire/server/core.h>
+#include <pipewire/core.h>
 
 #define PIPEWIRE_SYMBOL_MODULE_INIT "pipewire__module_init"
 

src/pipewire/node-factory.c

@@ -17,5 +17,5 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/server/node-factory.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/node-factory.h"

src/pipewire/node-factory.h

@@ -27,8 +27,8 @@ extern "C" {
 #define PIPEWIRE_TYPE__NodeFactory                            "PipeWire:Object:NodeFactory"
 #define PIPEWIRE_TYPE_NODE_FACTORY_BASE                       PIPEWIRE_TYPE__NodeFactory ":"
 
-#include <pipewire/server/core.h>
-#include <pipewire/server/client.h>
+#include <pipewire/core.h>
+#include <pipewire/resource.h>
 
 /** \class pw_node_factory
  *

src/pipewire/node.c

@@ -21,13 +21,13 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "pipewire/client/pipewire.h"
-#include "pipewire/client/interfaces.h"
+#include "pipewire/pipewire.h"
+#include "pipewire/interfaces.h"
 
-#include "pipewire/server/node.h"
-#include "pipewire/server/data-loop.h"
-#include "pipewire/server/main-loop.h"
-#include "pipewire/server/work-queue.h"
+#include "pipewire/node.h"
+#include "pipewire/data-loop.h"
+#include "pipewire/main-loop.h"
+#include "pipewire/work-queue.h"
 
 /** \cond */
 struct impl {

src/pipewire/node.h

@@ -30,15 +30,15 @@ extern "C" {
 #include <spa/clock.h>
 #include <spa/node.h>
 
-#include <pipewire/client/mem.h>
-#include <pipewire/client/introspect.h>
-#include <pipewire/client/transport.h>
+#include <pipewire/mem.h>
+#include <pipewire/introspect.h>
+#include <pipewire/transport.h>
 
-#include <pipewire/server/core.h>
-#include <pipewire/server/port.h>
-#include <pipewire/server/link.h>
-#include <pipewire/server/client.h>
-#include <pipewire/server/data-loop.h>
+#include <pipewire/core.h>
+#include <pipewire/port.h>
+#include <pipewire/link.h>
+#include <pipewire/client.h>
+#include <pipewire/data-loop.h>
 
 struct pw_node;
 

src/pipewire/pipewire.c

@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <dlfcn.h>
 
-#include "pipewire/client/pipewire.h"
+#include "pipewire/pipewire.h"
 
 static char **categories = NULL;
 
@@ -271,7 +271,7 @@ const char *pw_get_host_name(void)
 
 /** Get the client name
  *
- * Make a new PipeWire client name that can be used to construct a context.
+ * Make a new PipeWire client name that can be used to construct a remote.
  *
  * \memberof pw_pipewire
  */
@@ -291,14 +291,14 @@ char *pw_get_client_name(void)
 	}
 }
 
-/** Fill context properties
+/** Fill remote properties
  * \param properties a \ref pw_properties
  *
- * Fill \a properties with a set of default context properties.
+ * Fill \a properties with a set of default remote properties.
  *
  * \memberof pw_pipewire
  */
-void pw_fill_context_properties(struct pw_properties *properties)
+void pw_fill_remote_properties(struct pw_properties *properties)
 {
 	if (!pw_properties_get(properties, "application.name"))
 		pw_properties_set(properties, "application.name", pw_get_application_name());

src/pipewire/pipewire.h

@@ -24,16 +24,14 @@
 extern "C" {
 #endif
 
-#include <pipewire/client/context.h>
-#include <pipewire/client/introspect.h>
-#include <pipewire/client/log.h>
-#include <pipewire/client/loop.h>
-#include <pipewire/client/mem.h>
-#include <pipewire/client/thread-loop.h>
-#include <pipewire/client/properties.h>
-#include <pipewire/client/stream.h>
-#include <pipewire/client/subscribe.h>
-#include <pipewire/client/utils.h>
+#include <pipewire/introspect.h>
+#include <pipewire/log.h>
+#include <pipewire/loop.h>
+#include <pipewire/mem.h>
+#include <pipewire/thread-loop.h>
+#include <pipewire/properties.h>
+#include <pipewire/stream.h>
+#include <pipewire/utils.h>
 
 #include <spa/type-map.h>
 
@@ -111,7 +109,7 @@ char *
 pw_get_client_name(void);
 
 void
-pw_fill_context_properties(struct pw_properties *properties);
+pw_fill_remote_properties(struct pw_properties *properties);
 
 void
 pw_fill_stream_properties(struct pw_properties *properties);