Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.changes
@@ -1,3 +1,8 @@ +* Thu Mar 17 2016 Juho Hämäläinen <jusa@hilvi.org> - 6.0.46 +- [mako] Fixed non-voicecall inputs. Fixes NEMO#873. +- [sink] Clear extra devices when doing voicecall routings. Fixes MER#1544 +- [util-42] Remove mako hacks as ATOI workaround works as well. + * Fri Feb 26 2016 Juho Hämäläinen <jusa@hilvi.org> - 6.0.45 - [card] Enable module argument for sink silence on resume. MER#1520 - [sink] Add module argument to write silence on resume. Fixes MER#1520
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.spec ^
@@ -5,7 +5,7 @@ Name: pulseaudio-modules-droid Summary: PulseAudio Droid HAL modules -Version: 6.0.45+master.20160312152616.2.g51207d5 +Version: 6.0.46 Release: 1 Group: Multimedia/PulseAudio License: LGPLv2.1+
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/pulseaudio-modules-droid.git</param> <param name="branch">master</param> - <param name="revision"/> + <param name="revision">6.0.46</param> <param name="token"/> <param name="debian"/> <param name="dumb"/>
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-6.0.46.tar.bz2/src/common/droid-util-42.h ^
@@ -139,35 +139,6 @@ }; /* Input devices */ -#ifdef DROID_DEVICE_MAKO -struct string_conversion string_conversion_table_input_device[] = { - { 0x10000, "AUDIO_DEVICE_IN_COMMUNICATION" }, - { 0x20000, "AUDIO_DEVICE_IN_AMBIENT" }, - { 0x40000, "AUDIO_DEVICE_IN_BUILTIN_MIC" }, - { 0x80000, "AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" }, - { 0x100000, "AUDIO_DEVICE_IN_WIRED_HEADSET" }, - { 0x200000, "AUDIO_DEVICE_IN_AUX_DIGITAL" }, - { 0x400000, "AUDIO_DEVICE_IN_VOICE_CALL" }, - { 0x800000, "AUDIO_DEVICE_IN_BACK_MIC" }, - { 0x40000000, "AUDIO_DEVICE_IN_DEFAULT" }, - { 0x80000000, "AUDIO_DEVICE_IN_REMOTE_SUBMIX" }, // What's this really?? - { 0, NULL } -}; - -struct string_conversion string_conversion_table_input_device_fancy[] = { - { 0x10000, "input-communication" }, - { 0x20000, "input-ambient" }, - { 0x40000, "input-builtin_mic" }, - { 0x80000, "input-bluetooth_sco_headset" }, - { 0x100000, "input-wired_headset" }, - { 0x200000, "input-aux_digital" }, - { 0x400000, "input-voice_call" }, - { 0x800000, "input-back_mic" }, - { 0x40000000, "input-default" }, - { 0x80000000, "input-remote_submix" }, - { 0, NULL } -}; -#else struct string_conversion string_conversion_table_input_device[] = { STRING_ENTRY(AUDIO_DEVICE_IN_COMMUNICATION), STRING_ENTRY(AUDIO_DEVICE_IN_AMBIENT), @@ -207,7 +178,6 @@ { AUDIO_DEVICE_IN_DEFAULT, "input-default" }, { 0, NULL } }; -#endif struct string_conversion string_conversion_table_audio_source_fancy[] = { { AUDIO_SOURCE_DEFAULT, "default" },
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-6.0.46.tar.bz2/src/droid/droid-sink.c ^
@@ -193,6 +193,14 @@ return need_update; } +static void clear_extra_devices(struct userdata u) { + pa_assert(u); + pa_assert(u->extra_devices_map); + + pa_hashmap_remove_all(u->extra_devices_map); + u->extra_devices = 0; +} + / Called from main context during voice calls, and from IO context during media operation. / static void do_routing(struct userdata u) { audio_devices_t routing; @@ -200,6 +208,9 @@ pa_assert(u); pa_assert(u->stream); + if (u->use_voice_volume && u->extra_devices) + clear_extra_devices(u); + routing = u->primary_devices \| u->extra_devices; pa_droid_stream_set_output_route(u->stream, routing);