mediaProperty: remove default constructors of Properties

Clement Champetier · Clement Champetier · commit 2918b40fbd85 · 2014-11-17T14:38:04.000+01:00
Need to add directives in SWIG interface to explicitly remove vector's
methods which need the default constructor.
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp
@@ -3,11 +3,6 @@
 namespace avtranscoder
 {
 
-AttachementProperties::AttachementProperties()
-	: _formatContext( NULL )
-	, _streamId( 0 )
-{}
-
 AttachementProperties::AttachementProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp
@@ -14,7 +14,6 @@ namespace avtranscoder
 class AvExport AttachementProperties
 {
 public:
-	AttachementProperties();
 	AttachementProperties( const AVFormatContext* formatContext, const size_t index );
 
 	size_t getStreamId() const { return _streamId; }
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -11,12 +11,6 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioProperties::AudioProperties()
-	: _formatContext( NULL )
-	, _codecContext( NULL )
-	, _streamId( 0 )
-{}
-
 AudioProperties::AudioProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _codecContext( formatContext->streams[index]->codec )
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -19,7 +19,6 @@ namespace avtranscoder
 class AvExport AudioProperties
 {
 public:
-	AudioProperties();
 	AudioProperties( const AVFormatContext* formatContext, const size_t index );
 
 	std::string getCodecName() const;
diff --git a/src/AvTranscoder/mediaProperty/DataProperties.cpp b/src/AvTranscoder/mediaProperty/DataProperties.cpp
@@ -12,11 +12,6 @@ extern "C" {
 namespace avtranscoder
 {
 
-DataProperties::DataProperties()
-	: _formatContext( NULL )
-	, _streamId( 0 )
-{}
-
 DataProperties::DataProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp
@@ -14,7 +14,6 @@ namespace avtranscoder
 class AvExport DataProperties
 {
 public:
-	DataProperties();
 	DataProperties( const AVFormatContext* formatContext, const size_t index );
 
 	size_t getStreamId() const { return _streamId; }
diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.cpp
@@ -3,11 +3,6 @@
 namespace avtranscoder
 {
 
-SubtitleProperties::SubtitleProperties()
-	: _formatContext( NULL )
-	, _streamId( 0 )
-{}
-
 SubtitleProperties::SubtitleProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp
@@ -14,7 +14,6 @@ namespace avtranscoder
 class AvExport SubtitleProperties
 {
 public:
-	SubtitleProperties();
 	SubtitleProperties( const AVFormatContext* formatContext, const size_t index );
 
 	size_t getStreamId() const { return _streamId; }
diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.cpp b/src/AvTranscoder/mediaProperty/UnknownProperties.cpp
@@ -3,11 +3,6 @@
 namespace avtranscoder
 {
 
-UnknownProperties::UnknownProperties()
-	: _formatContext( NULL )
-	, _streamId( 0 )
-{}
-
 UnknownProperties::UnknownProperties( const AVFormatContext* formatContext, const size_t index )
 	: _formatContext( formatContext )
 	, _streamId( index )
diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp
@@ -14,7 +14,6 @@ namespace avtranscoder
 class AvExport UnknownProperties
 {
 public:
-	UnknownProperties();
 	UnknownProperties( const AVFormatContext* formatContext, const size_t index );
 
 	size_t getStreamId() const { return _streamId; }
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -19,16 +19,6 @@ extern "C" {
 namespace avtranscoder
 {
 
-VideoProperties::VideoProperties()
-	: _formatContext( NULL )
-	, _codecContext( NULL )
-	, _pixFmt( NULL )
-	, _streamId( 0 )
-	, _isInterlaced( false )
-	, _isTopFieldFirst( false )
-	, _gopStructure()
-{}
-
 VideoProperties::VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level )
 	: _formatContext( formatContext )
 	, _codecContext( formatContext->streams[index]->codec )
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -29,7 +29,6 @@ struct AvExport Channel
 class AvExport VideoProperties
 {
 public:
-	VideoProperties();
 	VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
 
 	std::string getCodecName() const;
diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.i b/src/AvTranscoder/mediaProperty/mediaProperty.i
@@ -13,6 +13,22 @@ using namespace avtranscoder;
 %}
 
 namespace std {
+
+// Allow vector of object with no default constructor
+%ignore vector< avtranscoder::VideoProperties >::vector(size_type); 
+%ignore vector< avtranscoder::VideoProperties >::resize;
+%ignore vector< avtranscoder::AudioProperties >::vector(size_type); 
+%ignore vector< avtranscoder::AudioProperties >::resize;
+%ignore vector< avtranscoder::DataProperties >::vector(size_type); 
+%ignore vector< avtranscoder::DataProperties >::resize;
+%ignore vector< avtranscoder::SubtitleProperties >::vector(size_type); 
+%ignore vector< avtranscoder::SubtitleProperties >::resize;
+%ignore vector< avtranscoder::AttachementProperties >::vector(size_type); 
+%ignore vector< avtranscoder::AttachementProperties >::resize;
+%ignore vector< avtranscoder::UnknownProperties >::vector(size_type); 
+%ignore vector< avtranscoder::UnknownProperties >::resize;
+
+// Create instantiations of a template classes
 %template(VideoVector)        vector< avtranscoder::VideoProperties >;
 %template(AudioVector)        vector< avtranscoder::AudioProperties >;
 %template(DataVector)         vector< avtranscoder::DataProperties >;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ namespace avtranscoder`
`14`	`14`	`class AvExport AttachementProperties`
`15`	`15`	`{`
`16`	`16`	`public:`
`17`		`- AttachementProperties();`
`18`	`17`	`AttachementProperties( const AVFormatContext* formatContext, const size_t index );`
`19`	`18`
`20`	`19`	`size_t getStreamId() const { return _streamId; }`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ namespace avtranscoder`
`19`	`19`	`class AvExport AudioProperties`
`20`	`20`	`{`
`21`	`21`	`public:`
`22`		`- AudioProperties();`
`23`	`22`	`AudioProperties( const AVFormatContext* formatContext, const size_t index );`
`24`	`23`
`25`	`24`	`std::string getCodecName() const;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ struct AvExport Channel`
`29`	`29`	`class AvExport VideoProperties`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`		`- VideoProperties();`
`33`	`32`	`VideoProperties( const AVFormatContext* formatContext, const size_t index, IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );`
`34`	`33`
`35`	`34`	`std::string getCodecName() const;`