FileProperties: only access to const list of properties

Clement Champetier · Clement Champetier · commit 44595a085460 · 2015-04-22T09:46:07.000+02:00
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -140,18 +140,6 @@ size_t FileProperties::getPacketSize() const
 	return _avFormatContext->packet_size;
 }
 
-VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex )
-{
-	for( std::vector< VideoProperties >::iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )
-	{
-		if( it->getStreamIndex() == streamIndex )
-			return *it;
-	}
-	std::string msg( "no video properties correspond to stream at index " );
-	msg += streamIndex;
-	throw std::runtime_error( msg );
-}
-
 const avtranscoder::VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const
 {
 	for( std::vector< VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )
@@ -164,18 +152,6 @@ const avtranscoder::VideoProperties& FileProperties::getVideoPropertiesWithStrea
 	throw std::runtime_error( msg );
 }
 
-AudioProperties& FileProperties::getAudioPropertiesWithStreamIndex( const size_t streamIndex )
-{
-	for( std::vector< AudioProperties >::iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )
-	{
-		if( it->getStreamIndex() == streamIndex )
-			return *it;
-	}
-	std::string msg( "no audio properties correspond to stream at index " );
-	msg += streamIndex;
-	throw std::runtime_error( msg );
-}
-
 const avtranscoder::AudioProperties& FileProperties::getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const
 {
 	for( std::vector< AudioProperties >::const_iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -60,32 +60,22 @@ class AvExport FileProperties
 
 	//@{
 	// @brief Get the properties with the indicated stream index
-	avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex );
-	avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex );
+	const avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const;
+	const avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const;
 	//@}
 
 	//@{
 	// @brief Get the list of properties for a given type (video, audio...)
-	std::vector< avtranscoder::VideoProperties >& getVideoProperties() { return  _videoStreams; }
-	std::vector< avtranscoder::AudioProperties >& getAudioProperties() { return  _audioStreams; }
-	std::vector< avtranscoder::DataProperties >& getDataProperties() { return  _dataStreams; }
-	std::vector< avtranscoder::SubtitleProperties >& getSubtitleProperties() { return  _subtitleStreams; }
-	std::vector< avtranscoder::AttachementProperties >& getAttachementProperties() { return  _attachementStreams; }
-	std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() { return  _unknownStreams; }
-	//@}
-
-#ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_avFormatContext; }
-
-	const avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const;
-	const avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const;
-
 	const std::vector< avtranscoder::VideoProperties >& getVideoProperties() const  { return  _videoStreams; }
 	const std::vector< avtranscoder::AudioProperties >& getAudioProperties() const  { return  _audioStreams; }
 	const std::vector< avtranscoder::DataProperties >& getDataProperties() const  { return  _dataStreams; }
 	const std::vector< avtranscoder::SubtitleProperties >& getSubtitleProperties() const  { return  _subtitleStreams; }
 	const std::vector< avtranscoder::AttachementProperties >& getAttachementProperties() const  { return  _attachementStreams; }
 	const std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() const  { return  _unknownStreams; }
+	//@}
+
+#ifndef SWIG
+	const AVFormatContext& getAVFormatContext() { return *_avFormatContext; }
 #endif
 
 	PropertyVector getPropertiesAsVector() const;  ///< Return all file properties as a vector (name of property: value)
