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

Commit 4d2bf460 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "AudioParameter: add functions for working with parameter keys"

parents 430fffce aad28fc2

include/media/AudioParameter.h

+5 −1
Original line number Diff line number Diff line
@@ -75,10 +75,12 @@ public: 


    static const char * const valueListSeparator;



    String8 toString() const;

    String8 toString() const { return toStringImpl(true); }

    String8 keysToString() const { return toStringImpl(false); }



    status_t add(const String8& key, const String8& value);

    status_t addInt(const String8& key, const int value);

    status_t addKey(const String8& key);

    status_t addFloat(const String8& key, const float value);



    status_t remove(const String8& key);
@@ -93,6 +95,8 @@ public: 
private:

    String8 mKeyValuePairs;

    KeyedVector <String8, String8> mParameters;



    String8 toStringImpl(bool useValues) const;

};



};  // namespace android

media/libmedia/AudioParameter.cpp

+10 −3
Original line number Diff line number Diff line
@@ -83,15 +83,17 @@ AudioParameter::~AudioParameter() 
    mParameters.clear();

}



String8 AudioParameter::toString() const

String8 AudioParameter::toStringImpl(bool useValues) const

{

    String8 str = String8("");



    size_t size = mParameters.size();

    for (size_t i = 0; i < size; i++) {

        str += mParameters.keyAt(i);

        if (useValues) {

            str += "=";

            str += mParameters.valueAt(i);

        }

        if (i < (size - 1)) str += ";";

    }

    return str;
@@ -108,6 +110,11 @@ status_t AudioParameter::add(const String8& key, const String8& value) 
    }

}



status_t AudioParameter::addKey(const String8& key)

{

    return add(key, String8());

}



status_t AudioParameter::addInt(const String8& key, const int value)

{

    char str[12];