diff options
author | Marco Nelissen <marcone@google.com> | 2011-11-18 15:07:21 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 15:07:21 -0800 |
commit | 7ff7821a601a39fffb318e29873957b4a3703c46 (patch) | |
tree | 1e3cbf41ef8ef551d73c5f303739a126301c6f9f /media | |
parent | d8a3cabcb11c02c54b76590e0f60c32b43b9f2fc (diff) | |
parent | d4b22ab4889f9b1885bfc0dc45667c846a171a98 (diff) | |
download | frameworks_base-7ff7821a601a39fffb318e29873957b4a3703c46.zip frameworks_base-7ff7821a601a39fffb318e29873957b4a3703c46.tar.gz frameworks_base-7ff7821a601a39fffb318e29873957b4a3703c46.tar.bz2 |
am d4b22ab4: status_t != bool
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/MediaScannerClient.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/StagefrightMediaScanner.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/MediaScannerClient.cpp b/media/libmedia/MediaScannerClient.cpp index 7a7aeb6..629b165 100644 --- a/media/libmedia/MediaScannerClient.cpp +++ b/media/libmedia/MediaScannerClient.cpp @@ -82,7 +82,7 @@ status_t MediaScannerClient::addStringTag(const char* name, const char* value) // save the strings for later so they can be used for native encoding detection mNames->push_back(name); mValues->push_back(value); - return true; + return OK; } // else fall through } diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index bb6e4cd..2505096 100644 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -94,7 +94,7 @@ static MediaScanResult HandleMIDI( char buffer[20]; sprintf(buffer, "%ld", temp); status_t status = client->addStringTag("duration", buffer); - if (status) { + if (status != OK) { return MEDIA_SCAN_RESULT_ERROR; } return MEDIA_SCAN_RESULT_OK; @@ -178,7 +178,7 @@ MediaScanResult StagefrightMediaScanner::processFileInternal( const char *value; if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) { status = client.addStringTag(kKeyMap[i].tag, value); - if (status) { + if (status != OK) { return MEDIA_SCAN_RESULT_ERROR; } } |