aboutsummaryrefslogtreecommitdiffstats
path: root/src/audiomanager_proxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/audiomanager_proxy.c')
-rw-r--r--src/audiomanager_proxy.c70
1 files changed, 36 insertions, 34 deletions
diff --git a/src/audiomanager_proxy.c b/src/audiomanager_proxy.c
index b62ee8b..d4cb7bc 100644
--- a/src/audiomanager_proxy.c
+++ b/src/audiomanager_proxy.c
@@ -215,16 +215,16 @@ ErrorCode am_proxy_connect(int source, int sink, int *main_connection_id){
if(is_range_over_guint16(source) == OUT_RANGE || is_range_over_guint16(sink) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 connection_id = -1, ret = UNABLE_SEND;
+ guint16 connection_id = 0, ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_connect_sync(
am_cmd_bus,
(guint16)source, (guint16)sink,
- &ret, connection_id,
+ &ret, &connection_id,
NULL, &err);
*main_connection_id = (int)connection_id;
ec = check_send_error(err, ret);
@@ -235,11 +235,11 @@ ErrorCode am_proxy_disconnect(int main_connection_id){
if(is_range_over_guint16(main_connection_id) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_disconnect_sync(
am_cmd_bus,
(guint16)main_connection_id,
@@ -253,11 +253,11 @@ ErrorCode am_proxy_set_volume(int sink, int volume){
if(is_range_over_guint16(sink) == OUT_RANGE && is_range_over_gint16(volume) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_set_volume_sync(
am_cmd_bus,
(guint16)sink,
@@ -271,11 +271,11 @@ ErrorCode am_proxy_volume_step(int sink, int volume){
if(is_range_over_guint16(sink) == OUT_RANGE && is_range_over_gint16(volume) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_volume_step_sync(
am_cmd_bus,
(guint16)sink,
@@ -289,25 +289,25 @@ ErrorCode am_proxy_set_sink_mute_state(int sink, int mute_state){
if(is_range_over_guint16(sink) == OUT_RANGE || is_range_over_gint16(mute_state) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_set_sink_mute_state_sync(
am_cmd_bus,
(guint16)sink, (gint16)mute_state,
- ret, NULL, &err);
+ &ret, NULL, &err);
ec = check_send_error(err, ret);
return ec;
}
ErrorCode am_proxy_get_list_main_connections(GVariant* connection_list){
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_get_list_main_connections_sync(
am_cmd_bus,
&ret,
@@ -320,11 +320,11 @@ ErrorCode am_proxy_get_list_main_connections(GVariant* connection_list){
}
ErrorCode am_proxy_get_list_main_sources(GVariant* source_list){
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_get_list_main_sources_sync(
am_cmd_bus,
&ret,
@@ -337,11 +337,11 @@ ErrorCode am_proxy_get_list_main_sources(GVariant* source_list){
}
ErrorCode am_proxy_get_list_main_sinks(GVariant* sink_list){
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_cmd_bus);
+ assert(am_cmd_bus != NULL);
audiomanager_commandinterface_call_get_list_main_sources_sync(
am_cmd_bus,
&ret,
@@ -360,7 +360,7 @@ ErrorCode am_proxy_ack_connect(int handle, int connection_id, int usr_err){
return OUT_RANGE;
}
- assert(!am_route_bus);
+ assert(am_route_bus != NULL);
GError *err = NULL;
audiomanager_routinginterface_call_ack_connect_sync(
@@ -377,7 +377,7 @@ ErrorCode am_proxy_ack_disconnect(int handle, int connection_id, int usr_err){
is_range_over_guint16(usr_err) == OUT_RANGE){
return OUT_RANGE;
}
- assert(!am_route_bus);
+ assert(am_route_bus != NULL);
GError *err = NULL;
audiomanager_routinginterface_call_ack_disconnect_sync(
am_route_bus,
@@ -393,7 +393,7 @@ ErrorCode am_proxy_ack_set_source_state(int handle, int usr_err){
return OUT_RANGE;
}
- assert(!am_route_bus);
+ assert(am_route_bus != NULL);
GError *err = NULL;
audiomanager_routinginterface_call_ack_set_source_state_sync(
am_route_bus,
@@ -404,18 +404,19 @@ ErrorCode am_proxy_ack_set_source_state(int handle, int usr_err){
}
ErrorCode am_proxy_register_source(GVariant *source_data, int *source){
- assert(!am_route_bus);
- guint16 ret = UNABLE_SEND;
+ assert(am_route_bus != NULL);
+ guint16 ret = 0, g_source = 0;
ErrorCode ec;
GError *err = NULL;
audiomanager_routinginterface_call_register_source_sync(
am_route_bus,
source_data,
- source,
+ &g_source,
&ret,
NULL, &err);
g_variant_unref(source_data);
+ *source = (int)g_source;
ec = check_send_error(err, ret);
return ec;
}
@@ -424,11 +425,11 @@ ErrorCode am_proxy_deregister_source(int source){
if(is_range_over_guint16(source) == OUT_RANGE){
return OUT_RANGE;
}
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_route_bus);
+ assert(am_route_bus != NULL);
audiomanager_routinginterface_call_deregister_source_sync(
am_route_bus,
(guint16)source,
@@ -440,21 +441,22 @@ ErrorCode am_proxy_deregister_source(int source){
}
ErrorCode am_proxy_register_domain(GVariant* domain_data, int *domain){
- guint16 ret = UNABLE_SEND;
+ guint16 ret = 0, g_domain = 0;
ErrorCode ec;
GError *err = NULL;
- assert(!am_route_bus);
+ assert(am_route_bus != NULL);
audiomanager_routinginterface_call_register_domain_sync(
am_route_bus,
domain_data,
SOUND_MANAGER_BUS_NAME,
SOUND_MANAGER_PATH,
SOUND_MANAGER_RETURN_INTERFACE,
- domain, &ret,
+ &g_domain, &ret,
NULL, &err);
g_variant_unref(domain_data);
+ *domain = (int)g_domain;
ec = check_send_error(err, ret);
return ec;
}
@@ -564,7 +566,7 @@ ErrorCode initialize_proxy(){
NULL,
NULL
);
- return (am_cmd_bus && am_route_bus) ? OK : UNABLE_SEND;
+ return (!am_cmd_bus || !am_route_bus) ? OK : UNABLE_SEND;
}
void close_proxy(){
@@ -573,13 +575,13 @@ void close_proxy(){
}
void set_event_callback(const am_event* callback){
- assert(!am_cmd_bus);
- assert(!am_route_bus);
+ assert(am_cmd_bus != NULL);
+ assert(am_route_bus != NULL);
/* initialize signal from audio manager command interface */
_am_event.on_main_connection_state_changed = callback->on_main_connection_state_changed;
_am_event.on_new_main_connection = callback->on_new_main_connection;
_am_event.on_removed_main_connection = callback->on_removed_main_connection;
- _am_event.on_set_routing_ready = callback->on_removed_main_connection;
+ _am_event.on_set_routing_ready = callback->on_set_routing_ready;
_am_event.on_set_routing_rundown = callback->on_set_routing_rundown;
_am_event.on_sink_mute_state_changed = callback->on_sink_mute_state_changed;
_am_event.on_volume_changed = callback->on_volume_changed;
@@ -646,5 +648,5 @@ ErrorCode open_soundmanager_interface(const am_instruction *callback){
}
void close_soundmanager_inerface(){
- g_dbus_interface_skeleton_unexport(sm_adapter);
+ g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(sm_adapter));
}