|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -3,6 +3,6 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/multimedia-pulseaudio-modules-droid.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">7fbe5a02270b19e822b489bf2c316809985b87d7</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305-4.0.12.tar.bz2/configure.ac
^
|
| @@ -198,6 +198,8 @@
)
if test "x$droiddevice" = xmako ; then
AC_DEFINE([DROID_DEVICE_MAKO], [1], [Using droid device mako.])
+elif test "x$droiddevice" = xi9305 ; then
+ AC_DEFINE([DROID_DEVICE_I9305], [1], [Using droid device i9305.])
else
AC_DEFINE([DROID_DEVICE_GENERIC], [1], [Using droid device generic.])
fi
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305-4.0.12.tar.bz2/src/droid/droid-sink.c
^
|
| @@ -144,7 +144,7 @@
routing = u->primary_devices | u->extra_devices;
- pa_snprintf(tmp, sizeof(tmp), "routing=%u;", routing);
+ pa_snprintf(tmp, sizeof(tmp), "%s=%u;", AUDIO_PARAMETER_STREAM_ROUTING, routing);
pa_log_debug("set_parameters(): %s", tmp);
pa_droid_hw_module_lock(u->hw_module);
u->stream_out->common.set_parameters(&u->stream_out->common, tmp);
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305-4.0.12.tar.bz2/src/droid/droid-source.c
^
|
| @@ -102,7 +102,11 @@
devlist = pa_list_string_input_device(devices);
pa_assert(devlist);
- pa_snprintf(tmp, sizeof(tmp), "routing=%u", devices);
+#ifdef DROID_DEVICE_I9305
+ pa_snprintf(tmp, sizeof(tmp), "%s=%u", AUDIO_PARAMETER_STREAM_ROUTING, devices & ~AUDIO_DEVICE_BIT_IN);
+#else
+ pa_snprintf(tmp, sizeof(tmp), "%s=%u", AUDIO_PARAMETER_STREAM_ROUTING, devices);
+#endif
pa_log_debug("set_parameters(): %s (%s)", tmp, devlist);
pa_xfree(devlist);
#ifdef DROID_DEVICE_MAKO
@@ -488,7 +492,6 @@
pa_log_info("FIXME: Setting AUDIO_DEVICE_IN_BUILTIN_MIC as initial device.");
dev_in = AUDIO_DEVICE_IN_BUILTIN_MIC;
#endif
- dev_in = AUDIO_DEVICE_IN_DEFAULT;
pa_droid_hw_module_lock(u->hw_module);
ret = u->hw_module->device->open_input_stream(u->hw_module->device,
u->hw_module->stream_in_id++,
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-i9305-4.0.12.tar.bz2/src/droid/droid-util.c
^
|
| @@ -814,6 +814,9 @@
if (devices & cur_device) {
+#ifdef HAL_V2
+ cur_device |= AUDIO_DEVICE_BIT_IN;
+#endif
pa_assert_se(pa_droid_input_port_name(cur_device, &name));
if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
@@ -837,6 +840,10 @@
pa_idxset_put(am->ports, p, NULL);
+#ifdef HAL_V2
+ cur_device &= ~AUDIO_DEVICE_BIT_IN;
+#endif
+
devices &= ~cur_device;
}
}
|
