AvInputStream: refactoring

Clement Champetier · Clement Champetier · commit 67a54722ec49 · 2014-06-02T11:04:21.000+02:00
Use reference instead of pointer in the constructor.
diff --git a/src/AvTranscoder/AvInputStream.cpp b/src/AvTranscoder/AvInputStream.cpp
@@ -29,9 +29,9 @@ AvInputStream::AvInputStream( )
 {
 }
 
-AvInputStream::AvInputStream( InputFile* inputFile, const size_t streamIndex )
+AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 		: InputStream( )
-		, m_inputFile( inputFile )
+		, m_inputFile( &inputFile )
 		, m_packetDuration( 0 )
 		, m_streamIndex( streamIndex )
 		, m_bufferized( false )
diff --git a/src/AvTranscoder/AvInputStream.hpp b/src/AvTranscoder/AvInputStream.hpp
@@ -13,7 +13,7 @@ class AvExport AvInputStream : public InputStream
 public:
 	AvInputStream( );
 
-	AvInputStream( InputFile* inputFile, const size_t streamIndex );
+	AvInputStream( InputFile& inputFile, const size_t streamIndex );
 	~AvInputStream( );
 
 	AvInputStream( const AvInputStream& inputStream )
diff --git a/src/AvTranscoder/InputFile.cpp b/src/AvTranscoder/InputFile.cpp
@@ -49,7 +49,7 @@ InputFile::InputFile( const std::string& filename )
 
 	for( size_t streamIndex = 0; streamIndex < m_formatContext->nb_streams; ++streamIndex )
 	{
-		m_inputStreams.push_back( new AvInputStream( this, streamIndex ) );
+		m_inputStreams.push_back( new AvInputStream( *this, streamIndex ) );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ AvInputStream::AvInputStream( )`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`32`		`-AvInputStream::AvInputStream( InputFile* inputFile, const size_t streamIndex )`
	`32`	`+AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )`
`33`	`33`	`: InputStream( )`
`34`		`- , m_inputFile( inputFile )`
	`34`	`+ , m_inputFile( &inputFile )`
`35`	`35`	`, m_packetDuration( 0 )`
`36`	`36`	`, m_streamIndex( streamIndex )`
`37`	`37`	`, m_bufferized( false )`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ InputFile::InputFile( const std::string& filename )`
`49`	`49`
`50`	`50`	`for( size_t streamIndex = 0; streamIndex < m_formatContext->nb_streams; ++streamIndex )`
`51`	`51`	`{`
`52`		`- m_inputStreams.push_back( new AvInputStream( this, streamIndex ) );`
	`52`	`+ m_inputStreams.push_back( new AvInputStream( *this, streamIndex ) );`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`