Option: constructor takes a reference of AvOption

Clement Champetier · Clement Champetier · commit fc38ac6314f1 · 2014-10-09T14:47:45.000+02:00
Use only references as parameters to have unified API.
diff --git a/src/AvTranscoder/option/Option.cpp b/src/AvTranscoder/option/Option.cpp
@@ -10,8 +10,8 @@ extern "C" {
 namespace avtranscoder
 {
 
-Option::Option( AVOption* avOption, void* avContext )
-	: _avOption( avOption )
+Option::Option( AVOption& avOption, void* avContext )
+	: _avOption( &avOption )
 	, _avContext( avContext )
 	, _childOptions()
 	, _defaultChildIndex( 0 )
diff --git a/src/AvTranscoder/option/Option.hpp b/src/AvTranscoder/option/Option.hpp
@@ -35,7 +35,7 @@ enum EOptionBaseType
 class Option
 {
 public:
-	Option( AVOption* avOption, void* avContext );
+	Option( AVOption& avOption, void* avContext );
 	~Option() {}
 	
 	EOptionBaseType getType() const;
diff --git a/src/AvTranscoder/option/context.cpp b/src/AvTranscoder/option/context.cpp
@@ -47,7 +47,7 @@ void Context::loadOptions( void* av_class, int req_flags )
 			continue;
 		}
 
-		Option option( const_cast<AVOption*>( avOption ), av_class );
+		Option option( *const_cast<AVOption*>( avOption ), av_class );
 
 		if( option.getType() == eOptionBaseTypeChild )
 		{

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ enum EOptionBaseType`
`35`	`35`	`class Option`
`36`	`36`	`{`
`37`	`37`	`public:`
`38`		`- Option( AVOption* avOption, void* avContext );`
	`38`	`+ Option( AVOption& avOption, void* avContext );`
`39`	`39`	`~Option() {}`
`40`	`40`
`41`	`41`	`EOptionBaseType getType() const;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void Context::loadOptions( void* av_class, int req_flags )`
`47`	`47`	`continue;`
`48`	`48`	`}`
`49`	`49`
`50`		`- Option option( const_cast<AVOption*>( avOption ), av_class );`
	`50`	`+ Option option( const_cast<AVOption>( avOption ), av_class );`
`51`	`51`
`52`	`52`	`if( option.getType() == eOptionBaseTypeChild )`
`53`	`53`	`{`