korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-10 05:23:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

audio: Trivial function renames

Browse Source 
Rename functions to be consistent with the rest of the code.
This commit is contained in:
Mikel Astiz 2012-11-15 08:27:33 +01:00 committed by Luiz Augusto von Dentz
parent 89949e2e58
commit ec34a253d2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
profiles/audio/device.c
View File

@ -203,7 +203,7 @@ static void disconnect_cb(struct btd_device *btd_dev, gboolean removal,
avrcp_disconnect(dev);
if (dev->sink && priv->sink_state != SINK_STATE_DISCONNECTED)
sink_shutdown(dev->sink);
sink_disconnect(dev->sink);
else
priv->disconnecting = FALSE;
}
@ -390,7 +390,7 @@ static DBusMessage *dev_disconnect(DBusConnection *conn, DBusMessage *msg,
}
if (dev->sink && priv->sink_state != SINK_STATE_DISCONNECTED)
sink_shutdown(dev->sink);
sink_disconnect(dev->sink);
else {
dbus_message_unref(priv->dc_req);
priv->dc_req = NULL;

10
profiles/audio/sink.c
View File

@ -390,7 +390,7 @@ gboolean sink_setup_stream(struct sink *sink, struct avdtp *session)
return TRUE;
}
static DBusMessage *sink_connect(DBusConnection *conn,
static DBusMessage *connect_sink(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct audio_device *dev = data;
@ -423,7 +423,7 @@ static DBusMessage *sink_connect(DBusConnection *conn,
return NULL;
}
static DBusMessage *sink_disconnect(DBusConnection *conn,
static DBusMessage *disconnect_sink(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct audio_device *device = data;
@ -489,8 +489,8 @@ static DBusMessage *sink_get_properties(DBusConnection *conn,
}
static const GDBusMethodTable sink_methods[] = {
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, sink_connect) },
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, sink_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, connect_sink) },
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, disconnect_sink) },
{ GDBUS_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
sink_get_properties) },
@ -604,7 +604,7 @@ gboolean sink_new_stream(struct audio_device *dev, struct avdtp *session,
return TRUE;
}
gboolean sink_shutdown(struct sink *sink)
gboolean sink_disconnect(struct sink *sink)
{
if (!sink->session)
return FALSE;

2
profiles/audio/sink.h
View File

@ -46,4 +46,4 @@ sink_state_t sink_get_state(struct audio_device *dev);
gboolean sink_new_stream(struct audio_device *dev, struct avdtp *session,
struct avdtp_stream *stream);
gboolean sink_setup_stream(struct sink *sink, struct avdtp *session);
gboolean sink_shutdown(struct sink *sink);
gboolean sink_disconnect(struct sink *sink);

10
profiles/audio/source.c
View File

@ -379,7 +379,7 @@ gboolean source_setup_stream(struct source *source, struct avdtp *session)
return TRUE;
}
static DBusMessage *source_connect(DBusConnection *conn,
static DBusMessage *connect_source(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct audio_device *dev = data;
@ -412,7 +412,7 @@ static DBusMessage *source_connect(DBusConnection *conn,
return NULL;
}
static DBusMessage *source_disconnect(DBusConnection *conn,
static DBusMessage *disconnect_source(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct audio_device *device = data;
@ -478,8 +478,8 @@ static DBusMessage *source_get_properties(DBusConnection *conn,
}
static const GDBusMethodTable source_methods[] = {
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, source_connect) },
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, source_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, connect_source) },
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, disconnect_source) },
{ GDBUS_METHOD("GetProperties",
NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
source_get_properties) },
@ -593,7 +593,7 @@ gboolean source_new_stream(struct audio_device *dev, struct avdtp *session,
return TRUE;
}
gboolean source_shutdown(struct source *source)
gboolean source_disconnect(struct source *source)
{
if (!source->stream)
return FALSE;

2
profiles/audio/source.h
View File

@ -47,4 +47,4 @@ source_state_t source_get_state(struct audio_device *dev);
gboolean source_new_stream(struct audio_device *dev, struct avdtp *session,
struct avdtp_stream *stream);
gboolean source_setup_stream(struct source *source, struct avdtp *session);
gboolean source_shutdown(struct source *source);
gboolean source_disconnect(struct source *source);