diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 16:56:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 16:56:49 -0800 |
| commit | 8577676b0f9247f994ca00bc59fdbcd1318e32b6 (patch) | |
| tree | 8c83ce69ddc29ba46426f9bd074415a188b860bc /media/libstagefright/StagefrightMediaScanner.cpp | |
| parent | 5b12af0ea4b98ad60bc066bceb8504d16fcca41d (diff) | |
| parent | 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 (diff) | |
| download | frameworks_av-8577676b0f9247f994ca00bc59fdbcd1318e32b6.zip frameworks_av-8577676b0f9247f994ca00bc59fdbcd1318e32b6.tar.gz frameworks_av-8577676b0f9247f994ca00bc59fdbcd1318e32b6.tar.bz2 | |
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
Diffstat (limited to 'media/libstagefright/StagefrightMediaScanner.cpp')
| -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 0f6af28..86e0e73 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; |