Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d888a75 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Remove audio route apply for speaker swap"

parents 17a95f52 0921ee76

hal/msm8916/platform.c

+0 −8
Original line number Diff line number Diff line
@@ -7909,7 +7909,6 @@ int platform_set_swap_mixer(struct audio_device *adev, bool swap_channels) 
{

    const char *mixer_ctl_name = "Swap channel";

    struct mixer_ctl *ctl;

    const char *mixer_path;

    struct platform_data *my_data = (struct platform_data *)adev->platform;



    // forced to set to swap, but device not rotated ... ignore set
@@ -7918,13 +7917,6 @@ int platform_set_swap_mixer(struct audio_device *adev, bool swap_channels) 


    ALOGV("%s:", __func__);



    if (swap_channels)

        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);

    else

        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);



    audio_route_apply_and_update_path(adev->audio_route, mixer_path);



    ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);

    if (!ctl) {

        ALOGE("%s: Could not get ctl for mixer cmd - %s",__func__, mixer_ctl_name);

hal/msm8974/platform.c

+0 −8
Original line number Diff line number Diff line
@@ -7775,7 +7775,6 @@ int platform_set_swap_mixer(struct audio_device *adev, bool swap_channels) 
{

    const char *mixer_ctl_name = "Swap channel";

    struct mixer_ctl *ctl;

    const char *mixer_path;

    struct platform_data *my_data = (struct platform_data *)adev->platform;



    // forced to set to swap, but device not rotated ... ignore set
@@ -7784,13 +7783,6 @@ int platform_set_swap_mixer(struct audio_device *adev, bool swap_channels) 


    ALOGV("%s:", __func__);



    if (swap_channels)

        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER_REVERSE);

    else

        mixer_path = platform_get_snd_device_name(SND_DEVICE_OUT_SPEAKER);



    audio_route_apply_and_update_path(adev->audio_route, mixer_path);



    ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);

    if (!ctl) {

        ALOGE("%s: Could not get ctl for mixer cmd - %s",__func__, mixer_ctl_name);