more cleanups

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

@@ -38,18 +38,10 @@
 struct _PinosSpaAlsaSinkPrivate
 {
   PinosRingbuffer *ringbuffer;
-
-  SpaPollFd fds[16];
-  unsigned int n_fds;
-  SpaPollItem poll;
-
-  gboolean running;
-  pthread_t thread;
 };
 
 enum {
   PROP_0,
-  PROP_POSSIBLE_FORMATS
 };
 
 G_DEFINE_TYPE (PinosSpaAlsaSink, pinos_spa_alsa_sink, PINOS_TYPE_NODE);
@@ -98,39 +90,7 @@ make_node (SpaNode **node, const char *lib, const char *name)
   return SPA_RESULT_ERROR;
 }
 
-static void *
+#if 0
-loop (void *user_data)
-{
-  PinosSpaAlsaSink *this = user_data;
-  PinosSpaAlsaSinkPrivate *priv = this->priv;
-  int r;
-
-  g_debug ("spa-alsa-sink %p: enter thread", this);
-  while (priv->running) {
-    SpaPollNotifyData ndata;
-
-    r = poll ((struct pollfd *) priv->fds, priv->n_fds, -1);
-    if (r < 0) {
-      if (errno == EINTR)
-        continue;
-      break;
-    }
-    if (r == 0) {
-      g_debug ("spa-alsa-sink %p: select timeout", this);
-      break;
-    }
-    if (priv->poll.after_cb) {
-      ndata.fds = priv->poll.fds;
-      ndata.n_fds = priv->poll.n_fds;
-      ndata.user_data = priv->poll.user_data;
-      priv->poll.after_cb (&ndata);
-    }
-  }
-  g_debug ("spa-alsa-sink %p: leave thread", this);
-
-  return NULL;
-}
-
 static void
 on_sink_event (SpaNode *node, SpaEvent *event, void *user_data)
 {
@@ -175,47 +135,12 @@ on_sink_event (SpaNode *node, SpaEvent *event, void *user_data)
         g_debug ("got error %d", res);
       break;
     }
-
-    case SPA_EVENT_TYPE_ADD_POLL:
-    {
-      SpaPollItem *poll = event->data;
-      int err;
-
-      g_debug ("add poll");
-      priv->poll = *poll;
-      priv->fds[0] = poll->fds[0];
-      priv->n_fds = 1;
-      priv->poll.fds = priv->fds;
-
-      if (!priv->running) {
-        priv->running = true;
-        if ((err = pthread_create (&priv->thread, NULL, loop, this)) != 0) {
-          g_debug ("spa-v4l2-source %p: can't create thread", strerror (err));
-          priv->running = false;
-        }
-      }
-      break;
-    }
-    case SPA_EVENT_TYPE_REMOVE_POLL:
-    {
-      if (priv->running) {
-        priv->running = false;
-        pthread_join (priv->thread, NULL);
-      }
-      break;
-    }
-    case SPA_EVENT_TYPE_STATE_CHANGE:
-    {
-      SpaEventStateChange *sc = event->data;
-
-      pinos_node_update_node_state (PINOS_NODE (this), sc->state);
-      break;
-    }
     default:
       g_debug ("got event %d", event->type);
       break;
   }
 }
+#endif
 
 static void
 setup_node (PinosSpaAlsaSink *this)
@@ -225,8 +150,6 @@ setup_node (PinosSpaAlsaSink *this)
   SpaProps *props;
   SpaPropValue value;
 
-  spa_node_set_event_callback (node->node, on_sink_event, this);
-
   if ((res = spa_node_get_props (node->node, &props)) < 0)
     g_debug ("got get_props error %d", res);
 
@@ -239,69 +162,6 @@ setup_node (PinosSpaAlsaSink *this)
     g_debug ("got set_props error %d", res);
 }
 
-static void
-pause_pipeline (PinosSpaAlsaSink *sink)
-{
-  PinosNode *node = PINOS_NODE (sink);
-  SpaResult res;
-  SpaCommand cmd;
-
-  g_debug ("spa-alsa-sink %p: pausing pipeline", sink);
-
-  cmd.type = SPA_COMMAND_PAUSE;
-  if ((res = spa_node_send_command (node->node, &cmd)) < 0)
-    g_debug ("got error %d", res);
-}
-
-static void
-suspend_pipeline (PinosSpaAlsaSink *this)
-{
-  PinosNode *node = PINOS_NODE (this);
-  SpaResult res;
-
-  g_debug ("spa-alsa-sink %p: suspend pipeline", this);
-
-  if ((res = spa_node_port_set_format (node->node, 0, 0, NULL)) < 0) {
-    g_warning ("error unset format output: %d", res);
-  }
-}
-
-static void
-destroy_pipeline (PinosSpaAlsaSink *sink)
-{
-  g_debug ("spa-alsa-sink %p: destroy pipeline", sink);
-}
-
-static gboolean
-set_state (PinosNode      *node,
-           PinosNodeState  state)
-{
-  PinosSpaAlsaSink *this = PINOS_SPA_ALSA_SINK (node);
-
-  g_debug ("spa-alsa-sink %p: set state %s", node, pinos_node_state_as_string (state));
-
-  switch (state) {
-    case PINOS_NODE_STATE_SUSPENDED:
-      suspend_pipeline (this);
-      break;
-
-    case PINOS_NODE_STATE_INITIALIZING:
-      break;
-
-    case PINOS_NODE_STATE_IDLE:
-      pause_pipeline (this);
-      break;
-
-    case PINOS_NODE_STATE_RUNNING:
-      break;
-
-    case PINOS_NODE_STATE_ERROR:
-      break;
-  }
-  pinos_node_update_state (node, state);
-  return TRUE;
-}
-
 static void
 get_property (GObject    *object,
               guint       prop_id,
@@ -383,9 +243,12 @@ sink_constructed (GObject * object)
 static void
 sink_finalize (GObject * object)
 {
+  PinosNode *node = PINOS_NODE (object);
   PinosSpaAlsaSink *sink = PINOS_SPA_ALSA_SINK (object);
 
-  destroy_pipeline (sink);
+  g_debug ("alsa-sink %p: dispose", sink);
+  spa_handle_clear (node->node->handle);
+  g_free (node->node->handle);
 
   G_OBJECT_CLASS (pinos_spa_alsa_sink_parent_class)->finalize (object);
 }
@@ -394,7 +257,6 @@ static void
 pinos_spa_alsa_sink_class_init (PinosSpaAlsaSinkClass * klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  PinosNodeClass *node_class = PINOS_NODE_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (PinosSpaAlsaSinkPrivate));
 
@@ -402,8 +264,6 @@ pinos_spa_alsa_sink_class_init (PinosSpaAlsaSinkClass * klass)
   gobject_class->finalize = sink_finalize;
   gobject_class->get_property = get_property;
   gobject_class->set_property = set_property;
-
-  node_class->set_state = set_state;
 }
 
 static void

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

@@ -113,12 +113,6 @@ setup_node (PinosSpaV4l2Source *this)
     g_debug ("got set_props error %d", res);
 }
 
-static void
-destroy_pipeline (PinosSpaV4l2Source *this)
-{
-  g_debug ("spa-v4l2-source %p: destroy pipeline", this);
-}
-
 static void
 get_property (GObject    *object,
               guint       prop_id,
@@ -162,8 +156,6 @@ source_finalize (GObject * object)
   PinosSpaV4l2Source *source = PINOS_SPA_V4L2_SOURCE (object);
 
   g_debug ("spa-source %p: dispose", source);
-  destroy_pipeline (source);
-
   spa_handle_clear (node->node->handle);
   g_free (node->node->handle);
 

pinos/server/daemon.c

@@ -293,18 +293,6 @@ exit_error:
   }
 }
 
-static gboolean
-handle_link_nodes (PinosDaemon1           *interface,
-                   GDBusMethodInvocation  *invocation,
-                   const gchar            *arg_node,
-                   const gchar            *arg_port,
-                   const gchar            *arg_possible_formats,
-                   GVariant               *arg_properties,
-                   gpointer                user_data)
-{
-  return TRUE;
-}
-
 static void
 export_server_object (PinosDaemon              *daemon,
                       GDBusObjectManagerServer *manager)
@@ -709,7 +697,6 @@ pinos_daemon_init (PinosDaemon * daemon)
   priv->iface = pinos_daemon1_skeleton_new ();
   g_signal_connect (priv->iface, "handle-create-node", (GCallback) handle_create_node, daemon);
   g_signal_connect (priv->iface, "handle-create-client-node", (GCallback) handle_create_client_node, daemon);
-  g_signal_connect (priv->iface, "handle-link-nodes", (GCallback) handle_link_nodes, daemon);
 
   priv->server_manager = g_dbus_object_manager_server_new (PINOS_DBUS_OBJECT_PREFIX);
   priv->clients = g_hash_table_new (g_str_hash, g_str_equal);

pinos/server/node.h

@@ -107,8 +107,6 @@ void                pinos_node_report_error            (PinosNode *node, GError
 void                pinos_node_report_idle             (PinosNode *node);
 void                pinos_node_report_busy             (PinosNode *node);
 
-void                pinos_node_update_node_state       (PinosNode *node, SpaNodeState state);
-
 G_END_DECLS
 
 #endif /* __PINOS_NODE_H__ */