AudioProperties: renamed getChannels to getNbChannels

Clement Champetier · Clement Champetier · commit b731e3616064 · 2015-12-01T13:41:03.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -109,7 +109,7 @@ size_t AudioProperties::getSampleRate() const
 	return _codecContext->sample_rate;
 }
 
-size_t AudioProperties::getChannels() const 
+size_t AudioProperties::getNbChannels() const 
 {
 	if( ! _codecContext )
 		throw std::runtime_error( "unknown codec context" );
@@ -136,7 +136,7 @@ size_t AudioProperties::getNbSamples() const
 		throw std::runtime_error( "unknown format context" );
 	size_t nbSamples = _formatContext->streams[_streamIndex]->nb_frames;
 	if(nbSamples == 0)
-		nbSamples = getSampleRate() * getChannels() * getDuration();
+		nbSamples = getSampleRate() * getNbChannels() * getDuration();
 	return nbSamples;
 }
 
@@ -160,7 +160,7 @@ PropertyVector AudioProperties::getPropertiesAsVector() const
 	addProperty( data, "sampleRate", &AudioProperties::getSampleRate );
 	addProperty( data, "bitRate", &AudioProperties::getBitRate );
 	addProperty( data, "nbSamples", &AudioProperties::getNbSamples );
-	addProperty( data, "channels", &AudioProperties::getChannels );
+	addProperty( data, "nbChannels", &AudioProperties::getNbChannels );
 	addProperty( data, "channelLayout", &AudioProperties::getChannelLayout );
 	addProperty( data, "channelName", &AudioProperties::getChannelName );
 	addProperty( data, "channelDescription", &AudioProperties::getChannelDescription );
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -20,7 +20,7 @@ class AvExport AudioProperties : public StreamProperties
 	std::string getChannelDescription() const;
 
 	size_t getSampleRate() const;
-	size_t getChannels() const;
+	size_t getNbChannels() const;
 	size_t getBitRate() const;  ///< 0 if unknown
 	size_t getNbSamples() const;
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -428,7 +428,7 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con
 		ss << audioProperties->getSampleRate();
 		profile[ constants::avProfileSampleRate ] = ss.str();
 		ss.str( "" );
-		ss << audioProperties->getChannels();
+		ss << audioProperties->getNbChannels();
 		profile[ constants::avProfileChannel ] = ss.str();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con`
`428`	`428`	`ss << audioProperties->getSampleRate();`
`429`	`429`	`profile[ constants::avProfileSampleRate ] = ss.str();`
`430`	`430`	`ss.str( "" );`
`431`		`- ss << audioProperties->getChannels();`
	`431`	`+ ss << audioProperties->getNbChannels();`
`432`	`432`	`profile[ constants::avProfileChannel ] = ss.str();`
`433`	`433`	`}`
`434`	`434`