Skip to content
Snippets Groups Projects
Commit 865b6ba5 authored by George Kiagiadakis's avatar George Kiagiadakis
Browse files

modules: softdsp-endpoint: disable exporting with WpImplEndpoint

parent 7b20baa6
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ struct _WpPwAudioSoftdspEndpoint ...@@ -48,7 +48,7 @@ struct _WpPwAudioSoftdspEndpoint
WpAudioStream *adapter; WpAudioStream *adapter;
GPtrArray *converters; GPtrArray *converters;
WpImplEndpoint *impl_ep; // WpImplEndpoint *impl_ep;
}; };
enum { enum {
...@@ -88,9 +88,7 @@ endpoint_get_role (WpBaseEndpoint *ep) ...@@ -88,9 +88,7 @@ endpoint_get_role (WpBaseEndpoint *ep)
static guint32 static guint32
endpoint_get_global_id (WpBaseEndpoint *ep) endpoint_get_global_id (WpBaseEndpoint *ep)
{ {
WpPwAudioSoftdspEndpoint *self = WP_PW_AUDIO_SOFTDSP_ENDPOINT (ep); return SPA_ID_INVALID; //wp_proxy_get_bound_id (WP_PROXY (self->impl_ep));
return wp_proxy_get_bound_id (WP_PROXY (self->impl_ep));
} }
static gboolean static gboolean
...@@ -142,6 +140,7 @@ endpoint_begin_fade (WpBaseEndpoint * ep, guint32 stream_id, guint duration, ...@@ -142,6 +140,7 @@ endpoint_begin_fade (WpBaseEndpoint * ep, guint32 stream_id, guint duration,
cancellable, callback, data); cancellable, callback, data);
} }
#if 0
static void static void
on_exported_control_changed (WpEndpoint * ep, guint32 control_id, on_exported_control_changed (WpEndpoint * ep, guint32 control_id,
WpPwAudioSoftdspEndpoint *self) WpPwAudioSoftdspEndpoint *self)
...@@ -266,6 +265,7 @@ do_export (WpPwAudioSoftdspEndpoint *self) ...@@ -266,6 +265,7 @@ do_export (WpPwAudioSoftdspEndpoint *self)
wp_proxy_augment (WP_PROXY (self->impl_ep), WP_PROXY_FEATURE_BOUND, wp_proxy_augment (WP_PROXY (self->impl_ep), WP_PROXY_FEATURE_BOUND,
NULL, on_endpoint_exported, self); NULL, on_endpoint_exported, self);
} }
#endif
static void static void
on_audio_convert_created(GObject *initable, GAsyncResult *res, gpointer data) on_audio_convert_created(GObject *initable, GAsyncResult *res, gpointer data)
...@@ -296,8 +296,10 @@ on_audio_convert_created(GObject *initable, GAsyncResult *res, gpointer data) ...@@ -296,8 +296,10 @@ on_audio_convert_created(GObject *initable, GAsyncResult *res, gpointer data)
stream_id, name); stream_id, name);
/* Finish the endpoint creation when all the streams are created */ /* Finish the endpoint creation when all the streams are created */
if (--self->stream_count == 0) if (--self->stream_count == 0) {
do_export (self); g_task_return_boolean (self->init_task, TRUE);
g_clear_object(&self->init_task);
}
} }
static void static void
...@@ -333,7 +335,8 @@ on_audio_adapter_created(GObject *initable, GAsyncResult *res, ...@@ -333,7 +335,8 @@ on_audio_adapter_created(GObject *initable, GAsyncResult *res,
/* Just finish if no streams need to be created */ /* Just finish if no streams need to be created */
if (!self->streams) { if (!self->streams) {
do_export (self); g_task_return_boolean (self->init_task, TRUE);
g_clear_object(&self->init_task);
return; return;
} }
...@@ -363,7 +366,7 @@ endpoint_finalize (GObject * object) ...@@ -363,7 +366,7 @@ endpoint_finalize (GObject * object)
{ {
WpPwAudioSoftdspEndpoint *self = WP_PW_AUDIO_SOFTDSP_ENDPOINT (object); WpPwAudioSoftdspEndpoint *self = WP_PW_AUDIO_SOFTDSP_ENDPOINT (object);
g_clear_object (&self->impl_ep); // g_clear_object (&self->impl_ep);
g_clear_pointer(&self->streams, g_variant_unref); g_clear_pointer(&self->streams, g_variant_unref);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment