LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename dbus_call_simple() to dbus_call() and fix input_signature type 

It is not simple because NULL can be supplied for output signature.
In future NULL will be valid for input signature too.
NULL signature means that message is handled externally.
input_signature is const point now. It is not modified.
This commit is contained in:
Nedko Arnaudov 2009-09-05 19:04:56 +03:00
parent 303d802270
commit ceef54d330
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbus/helpers.c
View File

@ -272,12 +272,12 @@ bool dbus_add_dict_entry_bool(DBusMessageIter * dict_iter_ptr, const char * key,
}
bool
dbus_call_simple(
dbus_call(
const char * service,
const char * object,
const char * iface,
const char * method,
char * input_signature,
const char * input_signature,
...)
{
DBusMessageIter iter;
@ -291,7 +291,7 @@ dbus_call_simple(
int type;
DBusSignatureIter sig_iter;
//lash_info("dbus_call_simple('%s', '%s', '%s', '%s')", service, object, iface, method);
//lash_info("dbus_call('%s', '%s', '%s', '%s')", service, object, iface, method);
ret = false;
va_start(ap, input_signature);

2
dbus/helpers.h
View File

@ -42,7 +42,7 @@ bool dbus_maybe_add_dict_entry_string(DBusMessageIter *dict_iter_ptr, const char
bool dbus_add_dict_entry_uint32(DBusMessageIter * dict_iter_ptr, const char * key, dbus_uint32_t value);
bool dbus_add_dict_entry_bool(DBusMessageIter * dict_iter_ptr, const char * key, dbus_bool_t value);
bool dbus_call_simple(const char * service, const char * object, const char * iface, const char * method, char * input_signature, ...);
bool dbus_call(const char * service, const char * object, const char * iface, const char * method, const char * input_signature, ...);
bool
dbus_register_object_signal_handler(

6
graph_proxy.c
View File

@ -238,7 +238,7 @@ static void refresh_internal(struct graph * graph_ptr, bool force)
version = graph_ptr->version;
}
if (!dbus_call_simple(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "GetGraph", "t", &version, NULL, &reply_ptr))
if (!dbus_call(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "GetGraph", "t", &version, NULL, &reply_ptr))
{
lash_error("GetGraph() failed.");
return;
@ -544,7 +544,7 @@ graph_proxy_connect_ports(
uint64_t port1_id,
uint64_t port2_id)
{
if (!dbus_call_simple(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "ConnectPortsByID", "tt", &port1_id, &port2_id, ""))
if (!dbus_call(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "ConnectPortsByID", "tt", &port1_id, &port2_id, ""))
{
lash_error("ConnectPortsByID() failed.");
}
@ -556,7 +556,7 @@ graph_proxy_disconnect_ports(
uint64_t port1_id,
uint64_t port2_id)
{
if (!dbus_call_simple(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "DisconnectPortsByID", "tt", &port1_id, &port2_id, ""))
if (!dbus_call(graph_ptr->service, graph_ptr->object, JACKDBUS_IFACE_PATCHBAY, "DisconnectPortsByID", "tt", &port1_id, &port2_id, ""))
{
lash_error("DisconnectPortsByID() failed.");
}

12
gui/control_proxy.c
View File

@ -67,7 +67,7 @@ static bool control_proxy_is_studio_loaded(bool * present_ptr)
{
dbus_bool_t present;
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "IsStudioLoaded", "", "b", &present))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "IsStudioLoaded", "", "b", &present))
{
return false;
}
@ -119,7 +119,7 @@ bool control_proxy_get_studio_list(void (* callback)(void * context, const char
DBusMessageIter array_iter;
const char * studio_name;
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "GetStudioList", "", NULL, &reply_ptr))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "GetStudioList", "", NULL, &reply_ptr))
{
lash_error("GetStudioList() failed.");
return false;
@ -156,7 +156,7 @@ bool control_proxy_new_studio(const char * studio_name)
studio_name = "";
}
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "NewStudio", "s", &studio_name, ""))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "NewStudio", "s", &studio_name, ""))
{
lash_error("NewStudio() failed.");
return false;
@ -167,7 +167,7 @@ bool control_proxy_new_studio(const char * studio_name)
bool control_proxy_load_studio(const char * studio_name)
{
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "LoadStudio", "s", &studio_name, ""))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "LoadStudio", "s", &studio_name, ""))
{
lash_error("LoadStudio() failed.");
return false;
@ -178,7 +178,7 @@ bool control_proxy_load_studio(const char * studio_name)
bool control_proxy_delete_studio(const char * studio_name)
{
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "DeleteStudio", "s", &studio_name, ""))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "DeleteStudio", "s", &studio_name, ""))
{
lash_error("DeleteStudio() failed.");
return false;
@ -189,7 +189,7 @@ bool control_proxy_delete_studio(const char * studio_name)
bool control_proxy_exit(void)
{
if (!dbus_call_simple(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "Exit", "", ""))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "Exit", "", ""))
{
lash_error("Exit() failed.");
return false;

20
jack_proxy.c
View File

@ -268,7 +268,7 @@ jack_proxy_is_started(
{
dbus_bool_t started;
if (!dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "IsStarted", "", "b", &started))
if (!dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "IsStarted", "", "b", &started))
{
return false;
}
@ -691,19 +691,19 @@ jack_proxy_reset_parameter_value(
bool jack_proxy_start_server(void)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "StartServer", "", "");
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "StartServer", "", "");
}
bool jack_proxy_stop_server(void)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "StopServer", "", "");
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "StopServer", "", "");
}
bool jack_proxy_is_realtime(bool * realtime_ptr)
{
dbus_bool_t realtime;
if (!dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "IsStarted", "", "b", &realtime))
if (!dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "IsStarted", "", "b", &realtime))
{
return false;
}
@ -714,32 +714,32 @@ bool jack_proxy_is_realtime(bool * realtime_ptr)
bool jack_proxy_sample_rate(uint32_t * sample_rate_ptr)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetSampleRate", "", "u", sample_rate_ptr);
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetSampleRate", "", "u", sample_rate_ptr);
}
bool jack_proxy_get_xruns(uint32_t * xruns_ptr)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetXruns", "", "u", xruns_ptr);
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetXruns", "", "u", xruns_ptr);
}
bool jack_proxy_get_dsp_load(double * dsp_load_ptr)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetLoad", "", "d", dsp_load_ptr);
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetLoad", "", "d", dsp_load_ptr);
}
bool jack_proxy_get_buffer_size(uint32_t * size_ptr)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetBufferSize", "", "u", size_ptr);
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "GetBufferSize", "", "u", size_ptr);
}
bool jack_proxy_set_buffer_size(uint32_t size)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "SetBufferSize", "u", &size, "");
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "SetBufferSize", "u", &size, "");
}
bool jack_proxy_reset_xruns(void)
{
return dbus_call_simple(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "ResetXruns", "", "");
return dbus_call(JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, JACKDBUS_IFACE_CONTROL, "ResetXruns", "", "");
}
static

12
studio_proxy.c
View File

@ -149,7 +149,7 @@ void studio_proxy_uninit(void)
bool studio_proxy_get_name(char ** name_ptr)
{
const char * name;
if (!dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "GetName", "", "s", &name))
if (!dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "GetName", "", "s", &name))
{
return false;
}
@ -166,17 +166,17 @@ bool studio_proxy_get_name(char ** name_ptr)
bool studio_proxy_rename(const char * name)
{
return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Rename", "s", &name, "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Rename", "s", &name, "");
}
bool studio_proxy_save(void)
{
return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Save", "", "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Save", "", "");
}
bool studio_proxy_unload(void)
{
return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Unload", "", "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Unload", "", "");
}
void studio_proxy_set_renamed_callback(void (* callback)(const char * new_studio_name))
@ -192,10 +192,10 @@ void studio_proxy_set_startstop_callbacks(void (* started_callback)(void), void
bool studio_proxy_start(void)
{
return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Start", "", "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Start", "", "");
}
bool studio_proxy_stop(void)
{
return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Stop", "", "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Stop", "", "");
}