mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce typedef for pa_bt_audio_state and use it everywhere

Browse source
This commit is contained in:
Lennart Poettering 2009-03-30 20:55:10 +02:00
parent 1390564227
commit 91355a1ce5
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/bluetooth/bluetooth-util.c
View file

@ -42,18 +42,17 @@ struct pa_bluetooth_discovery {
static void get_properties_reply(DBusPendingCall *pending, void *userdata); static void get_properties_reply(DBusPendingCall *pending, void *userdata);
static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_discovery *y, pa_bluetooth_device *d, DBusMessage *m, DBusPendingCallNotifyFunction func); static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_discovery *y, pa_bluetooth_device *d, DBusMessage *m, DBusPendingCallNotifyFunction func);
static enum pa_bt_audio_state pa_bt_audio_state_from_string(const char* value) { static pa_bt_audio_state_t pa_bt_audio_state_from_string(const char* value) {
pa_assert(value); pa_assert(value);
if (pa_streq(value, "disconnected")) { if (pa_streq(value, "disconnected"))
return PA_BT_AUDIO_STATE_DISCONNECTED; return PA_BT_AUDIO_STATE_DISCONNECTED;
} else if (pa_streq(value, "connecting")) { else if (pa_streq(value, "connecting"))
return PA_BT_AUDIO_STATE_CONNECTING; return PA_BT_AUDIO_STATE_CONNECTING;
} else if (pa_streq(value, "connected")) { else if (pa_streq(value, "connected"))
return PA_BT_AUDIO_STATE_CONNECTED; return PA_BT_AUDIO_STATE_CONNECTED;
} else if (pa_streq(value, "playing")) { else if (pa_streq(value, "playing"))
return PA_BT_AUDIO_STATE_PLAYING; return PA_BT_AUDIO_STATE_PLAYING;
}
return PA_BT_AUDIO_STATE_INVALID; return PA_BT_AUDIO_STATE_INVALID;
} }

10
src/modules/bluetooth/bluetooth-util.h
View file

@ -54,14 +54,14 @@ struct pa_bluetooth_uuid {
}; };
/* This enum is shared among Audio, Headset, and AudioSink, although not all values are acceptable in all profiles */ /* This enum is shared among Audio, Headset, and AudioSink, although not all values are acceptable in all profiles */
enum pa_bt_audio_state { typedef enum pa_bt_audio_state {
PA_BT_AUDIO_STATE_INVALID = -1, PA_BT_AUDIO_STATE_INVALID = -1,
PA_BT_AUDIO_STATE_DISCONNECTED, PA_BT_AUDIO_STATE_DISCONNECTED,
PA_BT_AUDIO_STATE_CONNECTING, PA_BT_AUDIO_STATE_CONNECTING,
PA_BT_AUDIO_STATE_CONNECTED, PA_BT_AUDIO_STATE_CONNECTED,
PA_BT_AUDIO_STATE_PLAYING, PA_BT_AUDIO_STATE_PLAYING,
PA_BT_AUDIO_STATE_LAST PA_BT_AUDIO_STATE_LAST
}; } pa_bt_audio_state_t;
struct pa_bluetooth_device { struct pa_bluetooth_device {
pa_bool_t dead; pa_bool_t dead;
@ -80,13 +80,13 @@ struct pa_bluetooth_device {
int trusted; int trusted;
/* Audio state */ /* Audio state */
int audio_state; pa_bt_audio_state_t audio_state;
/* AudioSink state */ /* AudioSink state */
int audio_sink_state; pa_bt_audio_state_t audio_sink_state;
/* Headset state */ /* Headset state */
int headset_state; pa_bt_audio_state_t headset_state;
}; };
pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core); pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *core);