FileProperties: all getters throw exception when can't access data

Clement Champetier · Clement Champetier · commit 9a4c4556f003 · 2015-03-17T14:37:37.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -21,21 +21,21 @@ FileProperties::FileProperties( const FormatContext& formatContext )
 std::string FileProperties::getFilename() const
 {
 	if( ! _formatContext || ! _formatContext->filename )
-		return "unknown file name";
+		throw std::runtime_error( "unknown file name" );
 	return _formatContext->filename;
 }
 
 std::string FileProperties::getFormatName() const
 {
 	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->name )
-		return "unknown format name";
+		throw std::runtime_error( "unknown format name");
 	return _formatContext->iformat->name;
 }
 
 std::string FileProperties::getFormatLongName() const
 {
 	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->long_name )
-		return "unknown format long name";
+		throw std::runtime_error( "unknown format long name");
 	return _formatContext->iformat->long_name;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,21 @@ FileProperties::FileProperties( const FormatContext& formatContext )`
`21`	`21`	`std::string FileProperties::getFilename() const`
`22`	`22`	`{`
`23`	`23`	`if( ! _formatContext \|\| ! _formatContext->filename )`
`24`		`- return "unknown file name";`
	`24`	`+ throw std::runtime_error( "unknown file name" );`
`25`	`25`	`return _formatContext->filename;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`std::string FileProperties::getFormatName() const`
`29`	`29`	`{`
`30`	`30`	`if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->name )`
`31`		`- return "unknown format name";`
	`31`	`+ throw std::runtime_error( "unknown format name");`
`32`	`32`	`return _formatContext->iformat->name;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`std::string FileProperties::getFormatLongName() const`
`36`	`36`	`{`
`37`	`37`	`if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->long_name )`
`38`		`- return "unknown format long name";`
	`38`	`+ throw std::runtime_error( "unknown format long name");`
`39`	`39`	`return _formatContext->iformat->long_name;`
`40`	`40`	`}`
`41`	`41`