Merge pull request #3 from jusa/i9305-fix

[droid-sink] Workaround use OUT_SPEAKER as default device.
2014-02-23 11:53:47 +00:00 · 2014-02-23 13:34:11 +02:00 · 2014-02-22 18:47:36 +00:00 · 2014-02-22 18:35:56 +00:00
2 changed files with 7 additions and 4 deletions
--- a/src/droid/droid-sink.c
+++ b/src/droid/droid-sink.c
@ -835,7 +835,9 @@ pa_sink *pa_droid_sink_new(pa_module *m,
    };

    /* Default routing */
-    dev_out = AUDIO_DEVICE_OUT_DEFAULT;
+    /* dev_out = AUDIO_DEVICE_OUT_DEFAULT; */
+    /* FIXME use something else than OUT_DEFAULT for i9305 to get initial audio working. */
+    dev_out = AUDIO_DEVICE_OUT_SPEAKER;

    if ((tmp = pa_modargs_get_value(ma, "output_devices", NULL))) {
        audio_devices_t tmp_dev;
--- a/src/droid/droid-util.c
+++ b/src/droid/droid-util.c
@ -752,7 +752,7 @@ static void add_o_ports(pa_droid_mapping *am) {

        if (devices & cur_device) {

-            pa_assert_se(pa_droid_output_port_name(cur_device, &name));
+            pa_droid_output_port_name(cur_device, &name);

            if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {

@ -769,7 +769,7 @@ static void add_o_ports(pa_droid_mapping *am) {

    /* Combo devices, route to multiple routing targets simultaneously. */
    if (am->output->devices & combo_devices) {
-        pa_assert_se(pa_droid_output_port_name(combo_devices, &name));
+        pa_droid_output_port_name(combo_devices, &name);
        if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
            p = create_o_port(am, combo_devices, name, NULL);
            /* Reset priority to default. */
@ -783,6 +783,7 @@ static void add_o_ports(pa_droid_mapping *am) {
    }

    if (!(p = pa_hashmap_get(am->profile_set->all_ports, PA_DROID_OUTPUT_PARKING))) {
+        pa_log_debug("  New output port %s", PA_DROID_OUTPUT_PARKING);
        /* Create parking port for output mapping to be used when audio_mode_t changes. */
        p = create_o_port(am, 0, PA_DROID_OUTPUT_PARKING, "Parking port");
        /* Reset priority to half of default */
@ -814,7 +815,7 @@ static void add_i_ports(pa_droid_mapping *am) {

        if (devices & cur_device) {

-            pa_assert_se(pa_droid_input_port_name(cur_device, &name));
+            pa_droid_input_port_name(cur_device, &name);

            if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) {
                pa_log_debug("  New input port %s", name);
Author	SHA1	Message	Date
Simonas Leleiva	dccef3aef6	Merge pull request #3 from jusa/i9305-fix [droid-sink] Workaround use OUT_SPEAKER as default device.	2014-02-23 11:53:47 +00:00
Juho Hämäläinen	7183df5788	[droid-sink] Workaround use OUT_SPEAKER as default device. AUDIO_DEVICE_OUT_DEFAULT is defined as AUDIO_DEVICE_BIT_DEFAULT instead of real output device. Use OUT_SPEAKER as default output so that default opens working routing.	2014-02-23 13:34:11 +02:00
David Greaves	7f5649c442	Merge pull request #2 from sledges/i9305-fix fix i9305	2014-02-22 18:47:36 +00:00
Simonas Leleiva	0fad8598a6	Revert "[util] Add asserts to port name lookups." This reverts commit `140fbea03f`. There is some bug in source port lookup with i9305 hal headers, which results in bad ports. but doesn't prevent sink usage.	2014-02-22 18:35:56 +00:00