ICodec: suppress swig warning with open method

Clement Champetier · Clement Champetier · commit 6a62af45bde8 · 2015-04-30T15:18:58.000+02:00
* Rename open to openCodec.
* Swig warning 321: 'open' conflicts with a built-in name in python.
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -51,7 +51,7 @@ ICodec::~ICodec()
 	_avCodecContext = NULL;
 }
 
-void ICodec::open()
+void ICodec::openCodec()
 {
 	if( ! _avCodecContext )
 		throw std::runtime_error( "unable to open a codec with no codec context" );
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -36,7 +36,7 @@ class AvExport ICodec
 	virtual ~ICodec() = 0;
 
 	/// Initialize the codec context.
-	void open();
+	void openCodec();
 
 	std::string getCodecName() const;
 	AVCodecID getCodecId() const;
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -52,7 +52,7 @@ AudioDecoder::~AudioDecoder()
 
 void AudioDecoder::setup()
 {
-	_inputStream->getAudioCodec().open();
+	_inputStream->getAudioCodec().openCodec();
 }
 
 bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -50,7 +50,7 @@ VideoDecoder::~VideoDecoder()
 
 void VideoDecoder::setup()
 {
-	_inputStream->getVideoCodec().open();
+	_inputStream->getVideoCodec().openCodec();
 }
 
 bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -37,7 +37,7 @@ AudioEncoder::~AudioEncoder()
 
 void AudioEncoder::setup()
 {
-	_codec.open();
+	_codec.openCodec();
 }
 
 bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -38,7 +38,7 @@ VideoEncoder::~VideoEncoder()
 
 void VideoEncoder::setup()
 {
-	_codec.open();
+	_codec.openCodec();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ICodec::~ICodec()`
`51`	`51`	`_avCodecContext = NULL;`
`52`	`52`	`}`
`53`	`53`
`54`		`-void ICodec::open()`
	`54`	`+void ICodec::openCodec()`
`55`	`55`	`{`
`56`	`56`	`if( ! _avCodecContext )`
`57`	`57`	`throw std::runtime_error( "unable to open a codec with no codec context" );`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ AudioDecoder::~AudioDecoder()`
`52`	`52`
`53`	`53`	`void AudioDecoder::setup()`
`54`	`54`	`{`
`55`		`- _inputStream->getAudioCodec().open();`
	`55`	`+ _inputStream->getAudioCodec().openCodec();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`bool AudioDecoder::decodeNextFrame( Frame& frameBuffer )`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ VideoDecoder::~VideoDecoder()`
`50`	`50`
`51`	`51`	`void VideoDecoder::setup()`
`52`	`52`	`{`
`53`		`- _inputStream->getVideoCodec().open();`
	`53`	`+ _inputStream->getVideoCodec().openCodec();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`bool VideoDecoder::decodeNextFrame( Frame& frameBuffer )`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ AudioEncoder::~AudioEncoder()`
`37`	`37`
`38`	`38`	`void AudioEncoder::setup()`
`39`	`39`	`{`
`40`		`- _codec.open();`
	`40`	`+ _codec.openCodec();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ VideoEncoder::~VideoEncoder()`
`38`	`38`
`39`	`39`	`void VideoEncoder::setup()`
`40`	`40`	`{`
`41`		`- _codec.open();`
	`41`	`+ _codec.openCodec();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`