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

Commit 91e2c7d2 authored Nov 18, 2011 by Marco Nelissen

status_t != bool

b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e

parent fd8f534c

media/libmedia/MediaScannerClient.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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		// save the strings for later so they can be used for native encoding detection
	mNames->push_back(name);		mNames->push_back(name);
	mValues->push_back(value);		mValues->push_back(value);
	return true;		return OK;
	}		}
	// else fall through		// else fall through
	}		}

media/libstagefright/StagefrightMediaScanner.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -94,7 +94,7 @@ static MediaScanResult HandleMIDI(
	char buffer[20];		char buffer[20];
	sprintf(buffer, "%ld", temp);		sprintf(buffer, "%ld", temp);
	status_t status = client->addStringTag("duration", buffer);		status_t status = client->addStringTag("duration", buffer);
	if (status) {		if (status != OK) {
	return MEDIA_SCAN_RESULT_ERROR;		return MEDIA_SCAN_RESULT_ERROR;
	}		}
	return MEDIA_SCAN_RESULT_OK;		return MEDIA_SCAN_RESULT_OK;
	@@ -178,7 +178,7 @@ MediaScanResult StagefrightMediaScanner::processFileInternal(
	const char *value;		const char *value;
	if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) {		if ((value = mRetriever->extractMetadata(kKeyMap[i].key)) != NULL) {
	status = client.addStringTag(kKeyMap[i].tag, value);		status = client.addStringTag(kKeyMap[i].tag, value);
	if (status) {		if (status != OK) {
	return MEDIA_SCAN_RESULT_ERROR;		return MEDIA_SCAN_RESULT_ERROR;
	}		}
	}		}