diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 16:21:31 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 16:21:31 -0800 |
| commit | 716f60ce605131429dc9efe8f351f0da0c8cc8c2 (patch) | |
| tree | 3df7d23d035fa5fa3fbbb3ca95e3221cd43ee613 | |
| parent | 7b76ed693e42caea0c5f1bcbe7059c580e9cb314 (diff) | |
| parent | e2ec61b23b6da2f6f0796939c3e00aa77bf17569 (diff) | |
| download | frameworks_base-716f60ce605131429dc9efe8f351f0da0c8cc8c2.zip frameworks_base-716f60ce605131429dc9efe8f351f0da0c8cc8c2.tar.gz frameworks_base-716f60ce605131429dc9efe8f351f0da0c8cc8c2.tar.bz2 | |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
| -rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 1629e9f..8426ee7 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -127,10 +127,11 @@ status_t StagefrightMediaScanner::processFile( || !strcasecmp(extension, ".rtttl") || !strcasecmp(extension, ".rtx") || !strcasecmp(extension, ".ota")) { - return HandleMIDI(path, &client); - } - - if (mRetriever->setDataSource(path) == OK + status_t status = HandleMIDI(path, &client); + if (status != OK) { + return status; + } + } else if (mRetriever->setDataSource(path) == OK && mRetriever->setMode( METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) { const char *value; |