Beginnings of dbus based control

spa/include/spa/id-map.h

@@ -37,8 +37,6 @@ typedef struct _SpaIDMap SpaIDMap;
  * Maps between uri and its id
  */
 struct _SpaIDMap {
-  /* pointer to the handle owning this interface */
-  SpaHandle *handle;
   /* the total size of this structure. This can be used to expand this
    * structure in the future */
   size_t size;

spa/include/spa/log.h

@@ -50,8 +50,6 @@ typedef enum
  * The Log interface
  */
 struct _SpaLog {
-  /* pointer to the handle owning this interface */
-  SpaHandle *handle;
   /* the total size of this log. This can be used to expand this
    * structure in the future */
   size_t size;

spa/include/spa/poll.h

@@ -92,8 +92,6 @@ typedef struct {
  * Register poll events
  */
 struct _SpaPoll {
-  /* pointer to the handle owning this interface */
-  SpaHandle *handle;
   /* the total size of this structure. This can be used to expand this
    * structure in the future */
   size_t size;

spa/lib/mapper.c

@@ -78,7 +78,6 @@ id_map_get_uri (SpaIDMap *map, uint32_t id)
 }
 
 static const SpaIDMap default_map = {
-  NULL,
   sizeof (SpaIDMap),
   NULL,
   id_map_get_id,

spa/plugins/remote/meson.build

@@ -1,4 +1,6 @@
-remote_sources = ['proxy.c', 'plugin.c']
+remote_sources = ['proxy.c',
+                  'dbus-proxy.c',
+                  'plugin.c']
 
 remotelib = shared_library('spa-remote',
                            remote_sources,

spa/plugins/remote/plugin.c

@@ -21,6 +21,7 @@
 #include <spa/node.h>
 
 extern const SpaHandleFactory spa_proxy_factory;
+extern const SpaHandleFactory spa_dbus_proxy_factory;
 
 SpaResult
 spa_enum_handle_factory (const SpaHandleFactory **factory,
@@ -37,6 +38,9 @@ spa_enum_handle_factory (const SpaHandleFactory **factory,
     case 0:
      *factory = &spa_proxy_factory;
       break;
+    case 1:
+     *factory = &spa_dbus_proxy_factory;
+      break;
     default:
       return SPA_RESULT_ENUM_END;
   }

spa/tests/test-mixer.c

@@ -360,7 +360,6 @@ main (int argc, char *argv[])
   SpaResult res;
 
   data.map = spa_id_map_get_default();
-  data.data_loop.handle = NULL;
   data.data_loop.size = sizeof (SpaPoll);
   data.data_loop.info = NULL;
   data.data_loop.add_item = do_add_item;

spa/tests/test-v4l2.c

@@ -455,7 +455,6 @@ main (int argc, char *argv[])
 
   data.map = spa_id_map_get_default ();
 
-  data.data_loop.handle = NULL;
   data.data_loop.size = sizeof (SpaPoll);
   data.data_loop.info = NULL;
   data.data_loop.add_item = do_add_item;

spa/tools/spa-monitor.c

@@ -200,7 +200,6 @@ main (int argc, char *argv[])
 
   data.map = spa_id_map_get_default ();
   data.log = NULL;
-  data.main_loop.handle = NULL;
   data.main_loop.size = sizeof (SpaPoll);
   data.main_loop.info = NULL;
   data.main_loop.add_item = do_add_item;