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

Commit 6d7deae9 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "libeffects: fix enum conversion warnings." am: bb38f906 

am: 8639a4b6

Change-Id: Ib1c9f91d1e4b1de800186b0b807c8b081f224c15
parents f68051a6 8639a4b6

media/libeffects/lvm/lib/Bass/src/LVDBE_Control.c

+2 −2
Original line number Diff line number Diff line
@@ -334,10 +334,10 @@ LVDBE_ReturnStatus_en LVDBE_Control(LVDBE_Handle_t hInstance, 
                     pParams);                          /* New parameters */



        LVC_Mixer_SetTimeConstant(&pBypassMixer_Instance->MixerStream[0],

            LVDBE_BYPASS_MIXER_TC,pParams->SampleRate,2);

            LVDBE_BYPASS_MIXER_TC,(LVM_Fs_en)pParams->SampleRate,2);



        LVC_Mixer_SetTimeConstant(&pBypassMixer_Instance->MixerStream[1],

            LVDBE_BYPASS_MIXER_TC,pParams->SampleRate,2);

            LVDBE_BYPASS_MIXER_TC,(LVM_Fs_en)pParams->SampleRate,2);





    }

media/libeffects/lvm/lib/Bass/src/LVDBE_Init.c

+2 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance, 
    pBypassMixer_Instance->MixerStream[0].CallbackSet=0;

    LVC_Mixer_Init(&pBypassMixer_Instance->MixerStream[0],0,0);

    LVC_Mixer_SetTimeConstant(&pBypassMixer_Instance->MixerStream[0],

        LVDBE_BYPASS_MIXER_TC,pInstance->Params.SampleRate,2);

        LVDBE_BYPASS_MIXER_TC,(LVM_Fs_en)pInstance->Params.SampleRate,2);

    /*

     * Setup the mixer gain for the unprocessed path

     */
@@ -280,8 +280,7 @@ LVDBE_ReturnStatus_en LVDBE_Init(LVDBE_Handle_t *phInstance, 
    pBypassMixer_Instance->MixerStream[1].CallbackSet=0;

    LVC_Mixer_Init(&pBypassMixer_Instance->MixerStream[1],0x00007FFF,0x00007FFF);

    LVC_Mixer_SetTimeConstant(&pBypassMixer_Instance->MixerStream[1],

        LVDBE_BYPASS_MIXER_TC,pInstance->Params.SampleRate,2);

        LVDBE_BYPASS_MIXER_TC,(LVM_Fs_en)pInstance->Params.SampleRate,2);



    return(LVDBE_SUCCESS);

}