AudioProperties: add private function to refactore try/catch of getPropertiesAsMap

Clement Champetier · Clement Champetier · commit c7c0c56747d5 · 2015-03-17T14:22:11.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -199,22 +199,22 @@ PropertiesMap AudioProperties::getPropertiesAsMap() const
 {
 	PropertiesMap dataMap;
 
-	detail::add( dataMap, "streamId", getStreamId() );
-	detail::add( dataMap, "codecId", getCodecId() );
-	detail::add( dataMap, "codecName", getCodecName() );
-	detail::add( dataMap, "codecLongName", getCodecLongName() );
-	detail::add( dataMap, "sampleFormatName", getSampleFormatName() );
-	detail::add( dataMap, "sampleFormatLongName", getSampleFormatLongName() );
-	detail::add( dataMap, "sampleRate", getSampleRate() );
-	detail::add( dataMap, "bitRate", getBitRate() );
-	detail::add( dataMap, "nbSamples", getNbSamples() );
-	detail::add( dataMap, "channels", getChannels() );
-	detail::add( dataMap, "channelLayout", getChannelLayout() );
-	detail::add( dataMap, "channelName", getChannelName() );
-	detail::add( dataMap, "channelDescription", getChannelDescription() );
-	detail::add( dataMap, "ticksPerFrame", getTicksPerFrame() );
-	detail::add( dataMap, "timeBase", getTimeBase() );
-	detail::add( dataMap, "duration", getDuration() );
+	addProperty( dataMap, "streamId", &AudioProperties::getStreamId );
+	addProperty( dataMap, "codecId", &AudioProperties::getCodecId );
+	addProperty( dataMap, "codecName", &AudioProperties::getCodecName );
+	addProperty( dataMap, "codecLongName", &AudioProperties::getCodecLongName );
+	addProperty( dataMap, "sampleFormatName", &AudioProperties::getSampleFormatName );
+	addProperty( dataMap, "sampleFormatLongName", &AudioProperties::getSampleFormatLongName );
+	addProperty( dataMap, "sampleRate", &AudioProperties::getSampleRate );
+	addProperty( dataMap, "bitRate", &AudioProperties::getBitRate );
+	addProperty( dataMap, "nbSamples", &AudioProperties::getNbSamples );
+	addProperty( dataMap, "channels", &AudioProperties::getChannels );
+	addProperty( dataMap, "channelLayout", &AudioProperties::getChannelLayout );
+	addProperty( dataMap, "channelName", &AudioProperties::getChannelName );
+	addProperty( dataMap, "channelDescription", &AudioProperties::getChannelDescription );
+	addProperty( dataMap, "ticksPerFrame", &AudioProperties::getTicksPerFrame );
+	addProperty( dataMap, "timeBase", &AudioProperties::getTimeBase );
+	addProperty( dataMap, "duration", &AudioProperties::getDuration );
 
 	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
 	{
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -44,6 +44,22 @@ class AvExport AudioProperties
 
 	PropertiesMap getPropertiesAsMap() const;  ///< Return all audio properties as a map (name of property: value)
 
+private:
+#ifndef SWIG
+	template<typename T>
+	void addProperty( PropertiesMap& dataMap, const std::string& key, T (AudioProperties::*getter)(void) const ) const
+	{
+		try
+		{
+		    detail::add( dataMap, key, (this->*getter)() );
+		}
+		catch( const std::exception& e )
+		{
+		    detail::add( dataMap, key, e.what() );
+		}
+	}
+#endif
+
 private:
 	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
 	AVCodecContext* _codecContext;  ///< Has link (no ownership)
