Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
wireplumber
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
wireplumber
Commits
cf768e9b
Commit
cf768e9b
authored
5 years ago
by
Julian Bouzas
Browse files
Options
Downloads
Patches
Plain Diff
core: remove wp_core_get_pw_remote API
parent
c1bece82
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/wp/core.c
+0
-7
0 additions, 7 deletions
lib/wp/core.c
lib/wp/core.h
+0
-2
0 additions, 2 deletions
lib/wp/core.h
lib/wp/monitor.c
+4
-6
4 additions, 6 deletions
lib/wp/monitor.c
with
4 additions
and
15 deletions
lib/wp/core.c
+
0
−
7
View file @
cf768e9b
...
...
@@ -517,13 +517,6 @@ wp_core_get_pw_core (WpCore * self)
return
self
->
pw_core
;
}
struct
pw_remote
*
wp_core_get_pw_remote
(
WpCore
*
self
)
{
g_return_val_if_fail
(
WP_IS_CORE
(
self
),
NULL
);
return
self
->
pw_remote
;
}
gboolean
wp_core_connect
(
WpCore
*
self
)
{
...
...
This diff is collapsed.
Click to expand it.
lib/wp/core.h
+
0
−
2
View file @
cf768e9b
...
...
@@ -16,7 +16,6 @@
G_BEGIN_DECLS
struct
pw_core
;
struct
pw_remote
;
/**
* WpRemoteState:
...
...
@@ -45,7 +44,6 @@ guint wp_core_idle_add (WpCore * self, GSourceFunc function, gpointer data,
gboolean
wp_core_sync
(
WpCore
*
self
,
GCancellable
*
cancellable
,
GAsyncReadyCallback
callback
,
gpointer
user_data
);
struct
pw_core
*
wp_core_get_pw_core
(
WpCore
*
self
);
struct
pw_remote
*
wp_core_get_pw_remote
(
WpCore
*
self
);
gboolean
wp_core_connect
(
WpCore
*
self
);
WpRemoteState
wp_core_get_remote_state
(
WpCore
*
self
,
const
gchar
**
error
);
...
...
This diff is collapsed.
Click to expand it.
lib/wp/monitor.c
+
4
−
6
View file @
cf768e9b
...
...
@@ -287,7 +287,7 @@ device_new (WpMonitor *self, uint32_t id, const gchar *factory_name,
g_autoptr
(
WpCore
)
core
=
NULL
;
g_autoptr
(
WpProperties
)
props
=
NULL
;
g_autoptr
(
WpSpaObject
)
spa_dev
=
NULL
;
struct
pw_p
roxy
*
proxy
=
NULL
;
g_autoptr
(
WpP
roxy
)
proxy
=
NULL
;
struct
object
*
dev
=
NULL
;
gint
ret
=
0
;
...
...
@@ -315,9 +315,8 @@ device_new (WpMonitor *self, uint32_t id, const gchar *factory_name,
/* check for id != -1 to avoid exporting the "monitor" device itself;
exporting it is buggy, but we should revise this in the future; FIXME */
if
(
id
!=
-
1
&&
!
(
proxy
=
pw_remote_export
(
wp_core_get_pw_remote
(
core
),
SPA_TYPE_INTERFACE_Device
,
wp_properties_to_pw_properties
(
props
),
spa_dev
->
interface
,
0
)))
{
if
(
id
!=
-
1
&&
!
(
proxy
=
wp_core_export_object
(
core
,
SPA_TYPE_INTERFACE_Device
,
spa_dev
->
interface
,
props
)))
{
g_set_error
(
error
,
WP_DOMAIN_LIBRARY
,
WP_LIBRARY_ERROR_OPERATION_FAILED
,
"failed to export device: %s"
,
g_strerror
(
errno
));
return
NULL
;
...
...
@@ -330,8 +329,7 @@ device_new (WpMonitor *self, uint32_t id, const gchar *factory_name,
dev
->
type
=
SPA_TYPE_INTERFACE_Device
;
dev
->
spa_obj
=
g_steal_pointer
(
&
spa_dev
);
dev
->
properties
=
g_steal_pointer
(
&
props
);
dev
->
proxy
=
wp_proxy_new_wrap
(
core
,
proxy
,
PW_TYPE_INTERFACE_Device
,
PW_VERSION_DEVICE_PROXY
,
NULL
);
dev
->
proxy
=
g_steal_pointer
(
&
proxy
);
/* Add device listener for events */
ret
=
spa_device_add_listener
(
dev
->
spa_obj
->
interface
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment