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

Commit ee6e3f55 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 2b343b1b: Merge "Add property to ignore audio effects on the platform" into mnc-dev 

* commit '2b343b1b':
  Add property to ignore audio effects on the platform
parents 678afec3 2b343b1b

media/libeffects/factory/EffectsFactory.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 




#include <cutils/misc.h>

#include <cutils/misc.h>

#include <cutils/config_utils.h>

#include <cutils/config_utils.h>

#include <cutils/properties.h>

#include <audio_effects/audio_effects_conf.h>

#include <audio_effects/audio_effects_conf.h>





static list_elem_t *gEffectList; // list of effect_entry_t: all currently created effects

static list_elem_t *gEffectList; // list of effect_entry_t: all currently created effects
@@ -447,13 +448,20 @@ int init() { 
        return 0;

        return 0;

    }

    }





    // ignore effects or not?

    const bool ignoreFxConfFiles = property_get_bool(PROPERTY_IGNORE_EFFECTS, false);



    pthread_mutex_init(&gLibLock, NULL);

    pthread_mutex_init(&gLibLock, NULL);





    if (ignoreFxConfFiles) {

        ALOGI("Audio effects in configuration files will be ignored");

    } else {

        if (access(AUDIO_EFFECT_VENDOR_CONFIG_FILE, R_OK) == 0) {

        if (access(AUDIO_EFFECT_VENDOR_CONFIG_FILE, R_OK) == 0) {

            loadEffectConfigFile(AUDIO_EFFECT_VENDOR_CONFIG_FILE);

            loadEffectConfigFile(AUDIO_EFFECT_VENDOR_CONFIG_FILE);

        } else if (access(AUDIO_EFFECT_DEFAULT_CONFIG_FILE, R_OK) == 0) {

        } else if (access(AUDIO_EFFECT_DEFAULT_CONFIG_FILE, R_OK) == 0) {

            loadEffectConfigFile(AUDIO_EFFECT_DEFAULT_CONFIG_FILE);

            loadEffectConfigFile(AUDIO_EFFECT_DEFAULT_CONFIG_FILE);

        }

        }

    }





    updateNumEffects();

    updateNumEffects();

    gInitDone = 1;

    gInitDone = 1;

media/libeffects/factory/EffectsFactory.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
extern "C" {

extern "C" {

#endif

#endif





#define PROPERTY_IGNORE_EFFECTS "ro.audio.ignore_effects"





typedef struct list_elem_s {

typedef struct list_elem_s {

    void *object;

    void *object;