diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-01 20:30:37 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-01 20:30:37 +0100 |
| commit | cce56ab34398ba60e4e8fe2838bf305fd81f3460 (patch) | |
| tree | e73c83f455a73ff1ce2e130459e501b3a73576c7 | |
| parent | e00833399f8ccbaca8bda14b6cffa13cfde91865 (diff) | |
revise form factor list a bit, simplify and use singular everywhere
| -rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 4 | ||||
| -rw-r--r-- | src/pulse/proplist.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 7855c2ef..6b522200 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -811,8 +811,8 @@ const char*pa_bluetooth_get_form_factor(uint32_t class) { [1] = "headset", [2] = "hands-free", [4] = "microphone", - [5] = "external-speakers", - [6] = "headphones", + [5] = "speaker", + [6] = "headphone", [7] = "portable", [8] = "car", [10] = "hifi" diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h index 15711c9a..d87c9f9b 100644 --- a/src/pulse/proplist.h +++ b/src/pulse/proplist.h @@ -165,7 +165,7 @@ PA_C_DECL_BEGIN /** For devices: device class. One of "sound", "modem", "monitor", "filter" */ #define PA_PROP_DEVICE_CLASS "device.class" -/** For devices: form factor if applicable. One of "internal-speakers", "external-speakers", "handset", "tv-capture", "webcam", "microphone", "headset", "headphones", "hands-free", "car", "hifi", "computer", "portable" */ +/** For devices: form factor if applicable. One of "internal", "speaker", "handset", "tv", "webcam", "microphone", "headset", "headphone", "hands-free", "car", "hifi", "computer", "portable" */ #define PA_PROP_DEVICE_FORM_FACTOR "device.form_factor" /** For devices: connector of the device if applicable. One of "isa", "pci", "usb", "firewire", "bluetooth" */ |