WIP

Change object model

pinos/modules/spa/module.c

@@ -31,10 +31,10 @@ gboolean pinos__module_init (PinosModule *module, const gchar * args);
 G_MODULE_EXPORT gboolean
 pinos__module_init (PinosModule * module, G_GNUC_UNUSED const gchar * args)
 {
-  pinos_spa_alsa_monitor_new (module->daemon);
-  pinos_spa_v4l2_monitor_new (module->daemon);
-  pinos_spa_audiotestsrc_new (module->daemon, "audiotestsrc", NULL);
-  pinos_spa_videotestsrc_new (module->daemon, "videotestsrc", NULL);
+  pinos_spa_alsa_monitor_new (module->core);
+  pinos_spa_v4l2_monitor_new (module->core);
+  pinos_spa_audiotestsrc_new (module->core, "audiotestsrc", NULL);
+  pinos_spa_videotestsrc_new (module->core, "videotestsrc", NULL);
 
   return TRUE;
 }

pinos/modules/spa/spa-alsa-monitor.c

@@ -26,39 +26,28 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include <gio/gio.h>
-
 #include <spa/include/spa/node.h>
 #include <spa/include/spa/monitor.h>
-
 #include <pinos/client/log.h>
+#include <pinos/server/node.h>
 
 #include "spa-alsa-monitor.h"
 
-#define PINOS_SPA_ALSA_MONITOR_GET_PRIVATE(obj)  \
-     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_SPA_ALSA_MONITOR, PinosSpaALSAMonitorPrivate))
-
-struct _PinosSpaALSAMonitorPrivate
+typedef struct
 {
-  PinosDaemon *daemon;
+  PinosSpaALSAMonitor this;
+
+  PinosObject object;
+
+  PinosCore *core;
 
   SpaHandle *handle;
-  SpaMonitor *monitor;
 
   GHashTable *nodes;
-};
-
-enum
-{
-  PROP_0,
-  PROP_DAEMON,
-  PROP_MONITOR,
-};
-
-G_DEFINE_TYPE (PinosSpaALSAMonitor, pinos_spa_alsa_monitor, G_TYPE_OBJECT);
+} PinosSpaALSAMonitorImpl;
 
 static SpaResult
-make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const char *name, const SpaDict *info)
+make_handle (PinosCore *core, SpaHandle **handle, const char *lib, const char *name, const SpaDict *info)
 {
   SpaResult res;
   void *hnd, *state = NULL;
@@ -85,7 +74,7 @@ make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const cha
       continue;
 
     *handle = g_malloc0 (factory->size);
-    if ((res = spa_handle_factory_init (factory, *handle, info, daemon->support, daemon->n_support)) < 0) {
+    if ((res = spa_handle_factory_init (factory, *handle, info, core->support, core->n_support)) < 0) {
       g_error ("can't make factory instance: %d", res);
       return res;
     }
@@ -97,7 +86,7 @@ make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const cha
 static void
 add_item (PinosSpaALSAMonitor *this, SpaMonitorItem *item)
 {
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
+  PinosSpaALSAMonitorImpl *impl = SPA_CONTAINER_OF (this, PinosSpaALSAMonitorImpl, this);
   SpaResult res;
   SpaHandle *handle;
   PinosNode *node;
@@ -110,16 +99,16 @@ add_item (PinosSpaALSAMonitor *this, SpaMonitorItem *item)
   if ((res = spa_handle_factory_init (item->factory,
                                       handle,
                                       item->info,
-                                      priv->daemon->support,
-                                      priv->daemon->n_support)) < 0) {
+                                      impl->core->support,
+                                      impl->core->n_support)) < 0) {
     g_error ("can't make factory instance: %d", res);
     return;
   }
-  if ((res = spa_handle_get_interface (handle, priv->daemon->registry.uri.spa_node, &node_iface)) < 0) {
+  if ((res = spa_handle_get_interface (handle, impl->core->registry.uri.spa_node, &node_iface)) < 0) {
     g_error ("can't get NODE interface: %d", res);
     return;
   }
-  if ((res = spa_handle_get_interface (handle, priv->daemon->registry.uri.spa_clock, &clock_iface)) < 0) {
+  if ((res = spa_handle_get_interface (handle, impl->core->registry.uri.spa_clock, &clock_iface)) < 0) {
     pinos_log_debug ("can't get CLOCK interface: %d", res);
     clock_iface = NULL;
   }
@@ -135,29 +124,27 @@ add_item (PinosSpaALSAMonitor *this, SpaMonitorItem *item)
                             item->info->items[i].value);
   }
 
-  node = g_object_new (PINOS_TYPE_NODE,
-                       "daemon", priv->daemon,
-                       "name", item->factory->name,
-                       "node", node_iface,
-                       "clock", clock_iface,
-                       "properties", props,
-                       NULL);
+  node = pinos_node_new (impl->core,
+                         item->factory->name,
+                         node_iface,
+                         clock_iface,
+                         props);
 
-  g_hash_table_insert (priv->nodes, g_strdup (item->id), node);
+  g_hash_table_insert (impl->nodes, strdup (item->id), node);
 }
 
 static void
 remove_item (PinosSpaALSAMonitor *this, SpaMonitorItem *item)
 {
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
+  PinosSpaALSAMonitorImpl *impl = SPA_CONTAINER_OF (this, PinosSpaALSAMonitorImpl, this);
   PinosNode *node;
 
   pinos_log_debug ("alsa-monitor %p: remove: \"%s\" (%s)", this, item->name, item->id);
 
-  node = g_hash_table_lookup (priv->nodes, item->id);
+  node = g_hash_table_lookup (impl->nodes, item->id);
   if (node) {
-    pinos_node_remove (node);
-    g_hash_table_remove (priv->nodes, item->id);
+    pinos_node_destroy (node);
+    g_hash_table_remove (impl->nodes, item->id);
   }
 }
 
@@ -166,7 +153,8 @@ on_monitor_event  (SpaMonitor      *monitor,
                    SpaMonitorEvent *event,
                    void            *user_data)
 {
-  PinosSpaALSAMonitor *this = user_data;
+  PinosSpaALSAMonitorImpl *impl = SPA_CONTAINER_OF (monitor, PinosSpaALSAMonitorImpl, this);
+  PinosSpaALSAMonitor *this = &impl->this;
 
   switch (event->type) {
     case SPA_MONITOR_EVENT_TYPE_ADDED:
@@ -192,143 +180,31 @@ on_monitor_event  (SpaMonitor      *monitor,
 }
 
 static void
-monitor_constructed (GObject * object)
+monitor_destroy (PinosObject * object)
 {
-  PinosSpaALSAMonitor *this = PINOS_SPA_ALSA_MONITOR (object);
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
-  SpaResult res;
-  void *state = NULL;
+  PinosSpaALSAMonitorImpl *impl = SPA_CONTAINER_OF (object, PinosSpaALSAMonitorImpl, object);
+  PinosSpaALSAMonitor *this = &impl->this;
 
-  pinos_log_debug ("spa-monitor %p: constructed", this);
+  pinos_log_debug ("spa-monitor %p: destroy", this);
 
-  G_OBJECT_CLASS (pinos_spa_alsa_monitor_parent_class)->constructed (object);
+  spa_handle_clear (impl->handle);
+  free (impl->handle);
 
-  while (TRUE) {
-    SpaMonitorItem *item;
-
-    if ((res = spa_monitor_enum_items (priv->monitor, &item, &state)) < 0) {
-      if (res != SPA_RESULT_ENUM_END)
-        pinos_log_debug ("spa_monitor_enum_items: got error %d\n", res);
-      break;
-    }
-    add_item (this, item);
-  }
-  spa_monitor_set_event_callback (priv->monitor, on_monitor_event, this);
+  g_hash_table_unref (impl->nodes);
+  free (impl);
 }
 
-static void
-monitor_get_property (GObject    *_object,
-                      guint       prop_id,
-                      GValue     *value,
-                      GParamSpec *pspec)
+PinosSpaALSAMonitor *
+pinos_spa_alsa_monitor_new (PinosCore *core)
 {
-  PinosSpaALSAMonitor *this = PINOS_SPA_ALSA_MONITOR (_object);
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
-
-  switch (prop_id) {
-    case PROP_DAEMON:
-      g_value_set_object (value, priv->daemon);
-      break;
-
-    case PROP_MONITOR:
-      g_value_set_pointer (value, priv->monitor);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (this, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-monitor_set_property (GObject      *_object,
-                      guint         prop_id,
-                      const GValue *value,
-                      GParamSpec   *pspec)
-{
-  PinosSpaALSAMonitor *this = PINOS_SPA_ALSA_MONITOR (_object);
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
-
-  switch (prop_id) {
-    case PROP_DAEMON:
-      priv->daemon = g_value_dup_object (value);
-      break;
-
-    case PROP_MONITOR:
-      priv->monitor = g_value_get_pointer (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (this, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-monitor_finalize (GObject * object)
-{
-  PinosSpaALSAMonitor *this = PINOS_SPA_ALSA_MONITOR (object);
-  PinosSpaALSAMonitorPrivate *priv = this->priv;
-
-  pinos_log_debug ("spa-monitor %p: dispose", this);
-  spa_handle_clear (priv->handle);
-  g_free (priv->handle);
-  g_hash_table_unref (priv->nodes);
-
-  G_OBJECT_CLASS (pinos_spa_alsa_monitor_parent_class)->finalize (object);
-}
-
-static void
-pinos_spa_alsa_monitor_class_init (PinosSpaALSAMonitorClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (PinosSpaALSAMonitorPrivate));
-
-  gobject_class->constructed = monitor_constructed;
-  gobject_class->finalize = monitor_finalize;
-  gobject_class->set_property = monitor_set_property;
-  gobject_class->get_property = monitor_get_property;
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_DAEMON,
-                                   g_param_spec_object ("daemon",
-                                                        "Daemon",
-                                                        "The Daemon",
-                                                        PINOS_TYPE_DAEMON,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT_ONLY |
-                                                        G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class,
-                                   PROP_MONITOR,
-                                   g_param_spec_pointer ("monitor",
-                                                         "Monitor",
-                                                         "The SPA monitor",
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_CONSTRUCT_ONLY |
-                                                         G_PARAM_STATIC_STRINGS));
-}
-
-static void
-pinos_spa_alsa_monitor_init (PinosSpaALSAMonitor * this)
-{
-  PinosSpaALSAMonitorPrivate *priv = this->priv = PINOS_SPA_ALSA_MONITOR_GET_PRIVATE (this);
-
-  priv->nodes = g_hash_table_new_full (g_str_hash,
-                                       g_str_equal,
-                                       g_free,
-                                       g_object_unref);
-}
-
-GObject *
-pinos_spa_alsa_monitor_new (PinosDaemon *daemon)
-{
-  GObject *monitor;
+  PinosSpaALSAMonitorImpl *impl;
+  PinosSpaALSAMonitor *this;
   SpaHandle *handle;
   SpaResult res;
   void *iface;
+  void *state = NULL;
 
-  if ((res = make_handle (daemon, &handle,
+  if ((res = make_handle (core, &handle,
                           "build/spa/plugins/alsa/libspa-alsa.so",
                           "alsa-monitor",
                           NULL)) < 0) {
@@ -338,16 +214,38 @@ pinos_spa_alsa_monitor_new (PinosDaemon *daemon)
 
 
   if ((res = spa_handle_get_interface (handle,
-                                       daemon->registry.uri.spa_monitor,
+                                       core->registry.uri.spa_monitor,
                                        &iface)) < 0) {
-    g_free (handle);
-    g_error ("can't get MONITOR interface: %d", res);
+    free (handle);
+    pinos_log_error ("can't get MONITOR interface: %d", res);
     return NULL;
   }
+  impl = calloc (1, sizeof (PinosSpaALSAMonitorImpl));
+  impl->core = core;
+  this = &impl->this;
+  this->monitor = iface;
 
-  monitor = g_object_new (PINOS_TYPE_SPA_ALSA_MONITOR,
-                          "daemon", daemon,
-                          "monitor", iface,
-                          NULL);
-  return monitor;
+  pinos_object_init (&impl->object,
+                     impl->core->registry.uri.monitor,
+                     this,
+                     monitor_destroy);
+
+  impl->nodes = g_hash_table_new_full (g_str_hash,
+                                       g_str_equal,
+                                       free,
+                                       NULL);
+
+  while (true) {
+    SpaMonitorItem *item;
+
+    if ((res = spa_monitor_enum_items (this->monitor, &item, &state)) < 0) {
+      if (res != SPA_RESULT_ENUM_END)
+        pinos_log_debug ("spa_monitor_enum_items: got error %d\n", res);
+      break;
+    }
+    add_item (this, item);
+  }
+  spa_monitor_set_event_callback (this->monitor, on_monitor_event, impl);
+
+  return this;
 }

pinos/modules/spa/spa-alsa-monitor.h

@@ -22,36 +22,20 @@
 
 #include <glib-object.h>
 
+
+#include <spa/include/spa/monitor.h>
 #include <pinos/server/daemon.h>
 
 G_BEGIN_DECLS
 
-#define PINOS_TYPE_SPA_ALSA_MONITOR                 (pinos_spa_alsa_monitor_get_type ())
-#define PINOS_IS_SPA_ALSA_MONITOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SPA_ALSA_MONITOR))
-#define PINOS_IS_SPA_ALSA_MONITOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), PINOS_TYPE_SPA_ALSA_MONITOR))
-#define PINOS_SPA_ALSA_MONITOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), PINOS_TYPE_SPA_ALSA_MONITOR, PinosSpaALSAMonitorClass))
-#define PINOS_SPA_ALSA_MONITOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), PINOS_TYPE_SPA_ALSA_MONITOR, PinosSpaALSAMonitor))
-#define PINOS_SPA_ALSA_MONITOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), PINOS_TYPE_SPA_ALSA_MONITOR, PinosSpaALSAMonitorClass))
-#define PINOS_SPA_ALSA_MONITOR_CAST(obj)            ((PinosSpaALSAMonitor*)(obj))
-#define PINOS_SPA_ALSA_MONITOR_CLASS_CAST(klass)    ((PinosSpaALSAMonitorClass*)(klass))
-
 typedef struct _PinosSpaALSAMonitor PinosSpaALSAMonitor;
-typedef struct _PinosSpaALSAMonitorClass PinosSpaALSAMonitorClass;
-typedef struct _PinosSpaALSAMonitorPrivate PinosSpaALSAMonitorPrivate;
 
 struct _PinosSpaALSAMonitor {
-  GObject object;
-
-  PinosSpaALSAMonitorPrivate *priv;
+  SpaMonitor *monitor;
 };
 
-struct _PinosSpaALSAMonitorClass {
-  GObjectClass parent_class;
-};
-
-GType             pinos_spa_alsa_monitor_get_type (void);
-
-GObject *         pinos_spa_alsa_monitor_new      (PinosDaemon *daemon);
+PinosSpaALSAMonitor *         pinos_spa_alsa_monitor_new      (PinosCore *core);
+void                          pinos_spa_alsa_monitor_destroy  (PinosSpaALSAMonitor *monitor);
 
 G_END_DECLS
 

pinos/modules/spa/spa-audiotestsrc.h

@@ -27,32 +27,7 @@
 
 G_BEGIN_DECLS
 
-#define PINOS_TYPE_SPA_AUDIOTESTSRC                 (pinos_spa_audiotestsrc_get_type ())
-#define PINOS_IS_SPA_AUDIOTESTSRC(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SPA_AUDIOTESTSRC))
-#define PINOS_IS_SPA_AUDIOTESTSRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), PINOS_TYPE_SPA_AUDIOTESTSRC))
-#define PINOS_SPA_AUDIOTESTSRC_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), PINOS_TYPE_SPA_AUDIOTESTSRC, PinosSpaAudioTestSrcClass))
-#define PINOS_SPA_AUDIOTESTSRC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), PINOS_TYPE_SPA_AUDIOTESTSRC, PinosSpaAudioTestSrc))
-#define PINOS_SPA_AUDIOTESTSRC_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), PINOS_TYPE_SPA_AUDIOTESTSRC, PinosSpaAudioTestSrcClass))
-#define PINOS_SPA_AUDIOTESTSRC_CAST(obj)            ((PinosSpaAudioTestSrc*)(obj))
-#define PINOS_SPA_AUDIOTESTSRC_CLASS_CAST(klass)    ((PinosSpaAudioTestSrcClass*)(klass))
-
-typedef struct _PinosSpaAudioTestSrc PinosSpaAudioTestSrc;
-typedef struct _PinosSpaAudioTestSrcClass PinosSpaAudioTestSrcClass;
-typedef struct _PinosSpaAudioTestSrcPrivate PinosSpaAudioTestSrcPrivate;
-
-struct _PinosSpaAudioTestSrc {
-  PinosNode object;
-
-  PinosSpaAudioTestSrcPrivate *priv;
-};
-
-struct _PinosSpaAudioTestSrcClass {
-  PinosNodeClass parent_class;
-};
-
-GType             pinos_spa_audiotestsrc_get_type (void);
-
-PinosNode *       pinos_spa_audiotestsrc_new      (PinosDaemon     *daemon,
+PinosNode *       pinos_spa_audiotestsrc_new      (PinosCore       *core,
                                                    const gchar     *name,
                                                    PinosProperties *properties);
 

pinos/modules/spa/spa-v4l2-monitor.c

@@ -29,44 +29,40 @@
 #include <spa/include/spa/node.h>
 #include <spa/include/spa/monitor.h>
 #include <pinos/client/log.h>
+#include <pinos/server/node.h>
 
 #include "spa-v4l2-monitor.h"
 
-#define PINOS_SPA_V4L2_MONITOR_GET_PRIVATE(obj)  \
-     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), PINOS_TYPE_SPA_V4L2_MONITOR, PinosSpaV4l2MonitorPrivate))
-
-struct _PinosSpaV4l2MonitorPrivate
+typedef struct
 {
-  PinosDaemon *daemon;
+  PinosSpaV4l2Monitor this;
+
+  PinosObject object;
+
+  PinosCore *core;
 
   SpaHandle *handle;
-  SpaMonitor *monitor;
 
   GHashTable *nodes;
-};
-
-enum
-{
-  PROP_0,
-  PROP_DAEMON,
-  PROP_MONITOR,
-};
-
-G_DEFINE_TYPE (PinosSpaV4l2Monitor, pinos_spa_v4l2_monitor, G_TYPE_OBJECT);
+} PinosSpaV4l2MonitorImpl;
 
 static SpaResult
-make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const char *name, const SpaDict *info)
+make_handle (PinosCore     *core,
+             SpaHandle    **handle,
+             const char    *lib,
+             const char    *name,
+             const SpaDict *info)
 {
   SpaResult res;
   void *hnd, *state = NULL;
   SpaEnumHandleFactoryFunc enum_func;
 
   if ((hnd = dlopen (lib, RTLD_NOW)) == NULL) {
-    g_error ("can't load %s: %s", lib, dlerror());
+    pinos_log_error ("can't load %s: %s", lib, dlerror());
     return SPA_RESULT_ERROR;
   }
   if ((enum_func = dlsym (hnd, "spa_enum_handle_factory")) == NULL) {
-    g_error ("can't find enum function");
+    pinos_log_error ("can't find enum function");
     return SPA_RESULT_ERROR;
   }
 
@@ -75,15 +71,19 @@ make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const cha
 
     if ((res = enum_func (&factory, &state)) < 0) {
       if (res != SPA_RESULT_ENUM_END)
-        g_error ("can't enumerate factories: %d", res);
+        pinos_log_error ("can't enumerate factories: %d", res);
       break;
     }
     if (strcmp (factory->name, name))
       continue;
 
-    *handle = g_malloc0 (factory->size);
-    if ((res = spa_handle_factory_init (factory, *handle, info, daemon->support, daemon->n_support)) < 0) {
-      g_error ("can't make factory instance: %d", res);
+    *handle = calloc (1, factory->size);
+    if ((res = spa_handle_factory_init (factory,
+                                        *handle,
+                                        info,
+                                        core->support,
+                                        core->n_support)) < 0) {
+      pinos_log_error ("can't make factory instance: %d", res);
       return res;
     }
     return SPA_RESULT_OK;
@@ -94,7 +94,7 @@ make_handle (PinosDaemon *daemon, SpaHandle **handle, const char *lib, const cha
 static void
 add_item (PinosSpaV4l2Monitor *this, SpaMonitorItem *item)
 {
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
+  PinosSpaV4l2MonitorImpl *impl = SPA_CONTAINER_OF (this, PinosSpaV4l2MonitorImpl, this);
   SpaResult res;
   SpaHandle *handle;
   PinosNode *node;
@@ -108,17 +108,17 @@ add_item (PinosSpaV4l2Monitor *this, SpaMonitorItem *item)
   if ((res = spa_handle_factory_init (item->factory,
                                       handle,
                                       item->info,
-                                      priv->daemon->support,
-                                      priv->daemon->n_support)) < 0) {
-    g_error ("can't make factory instance: %d", res);
+                                      impl->core->support,
+                                      impl->core->n_support)) < 0) {
+    pinos_log_error ("can't make factory instance: %d", res);
     return;
   }
-  if ((res = spa_handle_get_interface (handle, priv->daemon->registry.uri.spa_node, &node_iface)) < 0) {
-    g_error ("can't get NODE interface: %d", res);
+  if ((res = spa_handle_get_interface (handle, impl->core->registry.uri.spa_node, &node_iface)) < 0) {
+    pinos_log_error ("can't get NODE interface: %d", res);
     return;
   }
-  if ((res = spa_handle_get_interface (handle, priv->daemon->registry.uri.spa_clock, &clock_iface)) < 0) {
-    g_error ("can't get CLOCK interface: %d", res);
+  if ((res = spa_handle_get_interface (handle, impl->core->registry.uri.spa_clock, &clock_iface)) < 0) {
+    pinos_log_error ("can't get CLOCK interface: %d", res);
     return;
   }
 
@@ -133,29 +133,27 @@ add_item (PinosSpaV4l2Monitor *this, SpaMonitorItem *item)
                             item->info->items[i].value);
   }
 
-  node = g_object_new (PINOS_TYPE_NODE,
-                       "daemon", priv->daemon,
-                       "name", item->factory->name,
-                       "node", node_iface,
-                       "clock", clock_iface,
-                       "properties", props,
-                       NULL);
+  node = pinos_node_new (impl->core,
+                         item->factory->name,
+                         node_iface,
+                         clock_iface,
+                         props);
 
-  g_hash_table_insert (priv->nodes, g_strdup (item->id), node);
+  g_hash_table_insert (impl->nodes, strdup (item->id), node);
 }
 
 static void
 remove_item (PinosSpaV4l2Monitor *this, SpaMonitorItem *item)
 {
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
+  PinosSpaV4l2MonitorImpl *impl = SPA_CONTAINER_OF (this, PinosSpaV4l2MonitorImpl, this);
   PinosNode *node;
 
   pinos_log_debug ("v4l2-monitor %p: remove: \"%s\" (%s)", this, item->name, item->id);
 
-  node = g_hash_table_lookup (priv->nodes, item->id);
+  node = g_hash_table_lookup (impl->nodes, item->id);
   if (node) {
-    pinos_node_remove (node);
-    g_hash_table_remove (priv->nodes, item->id);
+    pinos_node_destroy (node);
+    g_hash_table_remove (impl->nodes, item->id);
   }
 }
 
@@ -190,162 +188,76 @@ on_monitor_event  (SpaMonitor      *monitor,
 }
 
 static void
-monitor_constructed (GObject * object)
+monitor_destroy (PinosObject * object)
 {
-  PinosSpaV4l2Monitor *this = PINOS_SPA_V4L2_MONITOR (object);
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
+  PinosSpaV4l2MonitorImpl *impl = SPA_CONTAINER_OF (object, PinosSpaV4l2MonitorImpl, object);
+  PinosSpaV4l2Monitor *this = &impl->this;
+
+  pinos_log_debug ("spa-monitor %p: dispose", this);
+  spa_handle_clear (impl->handle);
+  free (impl->handle);
+  g_hash_table_unref (impl->nodes);
+  free (impl);
+}
+
+
+PinosSpaV4l2Monitor *
+pinos_spa_v4l2_monitor_new (PinosCore *core)
+{
+  PinosSpaV4l2MonitorImpl *impl;
+  PinosSpaV4l2Monitor *this;
+  SpaHandle *handle;
   SpaResult res;
+  void *iface;
   void *state = NULL;
 
-  pinos_log_debug ("spa-monitor %p: constructed", this);
+  if ((res = make_handle (core,
+                          &handle,
+                          "build/spa/plugins/v4l2/libspa-v4l2.so",
+                          "v4l2-monitor",
+                          NULL)) < 0) {
+    pinos_log_error ("can't create v4l2-monitor: %d", res);
+    return NULL;
+  }
 
-  G_OBJECT_CLASS (pinos_spa_v4l2_monitor_parent_class)->constructed (object);
+  if ((res = spa_handle_get_interface (handle,
+                                       core->registry.uri.spa_monitor,
+                                       &iface)) < 0) {
+    free (handle);
+    pinos_log_error ("can't get MONITOR interface: %d", res);
+    return NULL;
+  }
+
+  impl = calloc (1, sizeof (PinosSpaV4l2MonitorImpl));
+  impl->core = core;
+
+  pinos_object_init (&impl->object,
+                     core->registry.uri.monitor,
+                     impl,
+                     monitor_destroy);
+
+  this = &impl->this;
+  this->monitor = iface;
+
+  impl->nodes = g_hash_table_new_full (g_str_hash,
+                                       g_str_equal,
+                                       g_free,
+                                       g_object_unref);
 
   while (TRUE) {
     SpaMonitorItem *item;
+    SpaResult res;
 
-    if ((res = spa_monitor_enum_items (priv->monitor, &item, &state)) < 0) {
+    if ((res = spa_monitor_enum_items (this->monitor, &item, &state)) < 0) {
       if (res != SPA_RESULT_ENUM_END)
         pinos_log_debug ("spa_monitor_enum_items: got error %d\n", res);
       break;
     }
     add_item (this, item);
   }
-  spa_monitor_set_event_callback (priv->monitor, on_monitor_event, this);
-}
-
-static void
-monitor_get_property (GObject    *_object,
-                      guint       prop_id,
-                      GValue     *value,
-                      GParamSpec *pspec)
-{
-  PinosSpaV4l2Monitor *this = PINOS_SPA_V4L2_MONITOR (_object);
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
-
-  switch (prop_id) {
-    case PROP_DAEMON:
-      g_value_set_object (value, priv->daemon);
-      break;
-
-    case PROP_MONITOR:
-      g_value_set_pointer (value, priv->monitor);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (this, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-monitor_set_property (GObject      *_object,
-                      guint         prop_id,
-                      const GValue *value,
-                      GParamSpec   *pspec)
-{
-  PinosSpaV4l2Monitor *this = PINOS_SPA_V4L2_MONITOR (_object);
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
-
-  switch (prop_id) {
-    case PROP_DAEMON:
-      priv->daemon = g_value_dup_object (value);
-      break;
-
-    case PROP_MONITOR:
-      priv->monitor = g_value_get_pointer (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (this, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-monitor_finalize (GObject * object)
-{
-  PinosSpaV4l2Monitor *this = PINOS_SPA_V4L2_MONITOR (object);
-  PinosSpaV4l2MonitorPrivate *priv = this->priv;
-
-  pinos_log_debug ("spa-monitor %p: dispose", this);
-  spa_handle_clear (priv->handle);
-  g_free (priv->handle);
-  g_hash_table_unref (priv->nodes);
-
-  G_OBJECT_CLASS (pinos_spa_v4l2_monitor_parent_class)->finalize (object);
-}
-
-static void
-pinos_spa_v4l2_monitor_class_init (PinosSpaV4l2MonitorClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (PinosSpaV4l2MonitorPrivate));
-
-  gobject_class->constructed = monitor_constructed;
-  gobject_class->finalize = monitor_finalize;
-  gobject_class->set_property = monitor_set_property;
-  gobject_class->get_property = monitor_get_property;
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_DAEMON,
-                                   g_param_spec_object ("daemon",
-                                                        "Daemon",
-                                                        "The Daemon",
-                                                        PINOS_TYPE_DAEMON,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT_ONLY |
-                                                        G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class,
-                                   PROP_MONITOR,
-                                   g_param_spec_pointer ("monitor",
-                                                         "Monitor",
-                                                         "The SPA monitor",
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_CONSTRUCT_ONLY |
-                                                         G_PARAM_STATIC_STRINGS));
-}
-
-static void
-pinos_spa_v4l2_monitor_init (PinosSpaV4l2Monitor * this)
-{
-  PinosSpaV4l2MonitorPrivate *priv = this->priv = PINOS_SPA_V4L2_MONITOR_GET_PRIVATE (this);
-
-  priv->nodes = g_hash_table_new_full (g_str_hash,
-                                       g_str_equal,
-                                       g_free,
-                                       g_object_unref);
-}
-
-GObject *
-pinos_spa_v4l2_monitor_new (PinosDaemon *daemon)
-{
-  GObject *monitor;
-  SpaHandle *handle;
-  SpaResult res;
-  void *iface;
-
-  if ((res = make_handle (daemon,
-                          &handle,
-                          "build/spa/plugins/v4l2/libspa-v4l2.so",
-                          "v4l2-monitor",
-                          NULL)) < 0) {
-    g_error ("can't create v4l2-monitor: %d", res);
-    return NULL;
-  }
-
-  if ((res = spa_handle_get_interface (handle,
-                                       daemon->registry.uri.spa_monitor,
-                                       &iface)) < 0) {
-    g_free (handle);
-    g_error ("can't get MONITOR interface: %d", res);
-    return NULL;
-  }
-
-  monitor = g_object_new (PINOS_TYPE_SPA_V4L2_MONITOR,
-                          "daemon", daemon,
-                          "monitor", iface,
-                          NULL);
-  return monitor;
+  spa_monitor_set_event_callback (this->monitor, on_monitor_event, this);
+
+  pinos_registry_add_object (&core->registry, &impl->object);
+
+  return this;
 }

pinos/modules/spa/spa-v4l2-monitor.h

@@ -20,39 +20,23 @@
 #ifndef __PINOS_SPA_V4L2_MONITOR_H__
 #define __PINOS_SPA_V4L2_MONITOR_H__
 
-#include <glib-object.h>
+#include <pinos/server/core.h>
 
-#include <pinos/server/daemon.h>
-
-G_BEGIN_DECLS
-
-#define PINOS_TYPE_SPA_V4L2_MONITOR                 (pinos_spa_v4l2_monitor_get_type ())
-#define PINOS_IS_SPA_V4L2_MONITOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SPA_V4L2_MONITOR))
-#define PINOS_IS_SPA_V4L2_MONITOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), PINOS_TYPE_SPA_V4L2_MONITOR))
-#define PINOS_SPA_V4L2_MONITOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), PINOS_TYPE_SPA_V4L2_MONITOR, PinosSpaV4l2MonitorClass))
-#define PINOS_SPA_V4L2_MONITOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), PINOS_TYPE_SPA_V4L2_MONITOR, PinosSpaV4l2Monitor))
-#define PINOS_SPA_V4L2_MONITOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), PINOS_TYPE_SPA_V4L2_MONITOR, PinosSpaV4l2MonitorClass))
-#define PINOS_SPA_V4L2_MONITOR_CAST(obj)            ((PinosSpaV4l2Monitor*)(obj))
-#define PINOS_SPA_V4L2_MONITOR_CLASS_CAST(klass)    ((PinosSpaV4l2MonitorClass*)(klass))
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct _PinosSpaV4l2Monitor PinosSpaV4l2Monitor;
-typedef struct _PinosSpaV4l2MonitorClass PinosSpaV4l2MonitorClass;
-typedef struct _PinosSpaV4l2MonitorPrivate PinosSpaV4l2MonitorPrivate;
 
 struct _PinosSpaV4l2Monitor {
-  GObject object;
-
-  PinosSpaV4l2MonitorPrivate *priv;
+  SpaMonitor *monitor;
 };
 
-struct _PinosSpaV4l2MonitorClass {
-  GObjectClass parent_class;
-};
+PinosSpaV4l2Monitor *      pinos_spa_v4l2_monitor_new      (PinosCore *core);
+void                       pinos_spa_v4l2_monitor_destroy  (PinosSpaV4l2Monitor *monitor);
 
-GType             pinos_spa_v4l2_monitor_get_type (void);
-
-GObject *         pinos_spa_v4l2_monitor_new      (PinosDaemon *daemon);
-
-G_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __PINOS_SPA_V4L2_MONITOR_H__ */

pinos/modules/spa/spa-videotestsrc.h

@@ -25,36 +25,18 @@
 #include <client/pinos.h>
 #include <server/node.h>
 
+typedef struct _PinosSpaVideoTestSrc PinosSpaVideoTestSrc;
+
 G_BEGIN_DECLS
 
-#define PINOS_TYPE_SPA_VIDEOTESTSRC                 (pinos_spa_videotestsrc_get_type ())
-#define PINOS_IS_SPA_VIDEOTESTSRC(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PINOS_TYPE_SPA_VIDEOTESTSRC))
-#define PINOS_IS_SPA_VIDEOTESTSRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), PINOS_TYPE_SPA_VIDEOTESTSRC))
-#define PINOS_SPA_VIDEOTESTSRC_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), PINOS_TYPE_SPA_VIDEOTESTSRC, PinosSpaVideoTestSrcClass))
-#define PINOS_SPA_VIDEOTESTSRC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), PINOS_TYPE_SPA_VIDEOTESTSRC, PinosSpaVideoTestSrc))
-#define PINOS_SPA_VIDEOTESTSRC_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), PINOS_TYPE_SPA_VIDEOTESTSRC, PinosSpaVideoTestSrcClass))
-#define PINOS_SPA_VIDEOTESTSRC_CAST(obj)            ((PinosSpaVideoTestSrc*)(obj))
-#define PINOS_SPA_VIDEOTESTSRC_CLASS_CAST(klass)    ((PinosSpaVideoTestSrcClass*)(klass))
-
-typedef struct _PinosSpaVideoTestSrc PinosSpaVideoTestSrc;
-typedef struct _PinosSpaVideoTestSrcClass PinosSpaVideoTestSrcClass;
-typedef struct _PinosSpaVideoTestSrcPrivate PinosSpaVideoTestSrcPrivate;
-
 struct _PinosSpaVideoTestSrc {
-  PinosNode object;
-
-  PinosSpaVideoTestSrcPrivate *priv;
+  PinosNode *node;
 };
 
-struct _PinosSpaVideoTestSrcClass {
-  PinosNodeClass parent_class;
-};
-
-GType             pinos_spa_videotestsrc_get_type (void);
-
-PinosNode *       pinos_spa_videotestsrc_new      (PinosDaemon     *daemon,
-                                                   const gchar     *name,
-                                                   PinosProperties *properties);
+PinosSpaVideoTestSrc * pinos_spa_videotestsrc_new      (PinosCore       *core,
+                                                        const gchar     *name,
+                                                        PinosProperties *properties);
+void                   pinos_spa_videotestsrc_destroy  (PinosSpaVideoTestSrc *src);
 
 G_END_DECLS