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

Commit a6581813 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Adding support for the '.mxmf' MIDI file extension."

parents f8be8c0c 8d30cc86

media/libstagefright/StagefrightMediaScanner.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ static bool FileHasAcceptableExtension(const char *extension) { 
        ".mp3", ".mp4", ".m4a", ".3gp", ".3gpp", ".3g2", ".3gpp2",

        ".mp3", ".mp4", ".m4a", ".3gp", ".3gpp", ".3g2", ".3gpp2",

        ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac",

        ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac",

        ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",

        ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",

        ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac"

        ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac", ".mxmf",

    };

    };

    static const size_t kNumValidExtensions =

    static const size_t kNumValidExtensions =

        sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);

        sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);
@@ -124,7 +124,8 @@ status_t StagefrightMediaScanner::processFile( 
            || !strcasecmp(extension, ".xmf")

            || !strcasecmp(extension, ".xmf")

            || !strcasecmp(extension, ".rtttl")

            || !strcasecmp(extension, ".rtttl")

            || !strcasecmp(extension, ".rtx")

            || !strcasecmp(extension, ".rtx")

            || !strcasecmp(extension, ".ota")) {

            || !strcasecmp(extension, ".ota")

            || !strcasecmp(extension, ".mxmf")) {

        status_t status = HandleMIDI(path, &client);

        status_t status = HandleMIDI(path, &client);

        if (status != OK) {

        if (status != OK) {

            return status;

            return status;