avprocessor: add option verbose

Clement Champetier · Clement Champetier · commit 411a41e93fb4 · 2015-01-29T11:45:16.000+01:00
diff --git a/app/avProcessor/avProcessor.cpp b/app/avProcessor/avProcessor.cpp
@@ -20,7 +20,7 @@ static const std::string dummyAudioCodec = "pcm_s16le";
 
 static bool useVideoGenerator = false;
 
-bool verbose = false;
+static bool verbose = false;
 
 void parseConfigFile( const std::string& configFilename, avtranscoder::Transcoder& transcoder )
 {
@@ -96,7 +96,7 @@ int main( int argc, char** argv )
 {
 	std::string help;
 	help += "Usage\n";
-	help += "\tavprocessor CONFIG.TXT OUTPUT_FILE_NAME [--generate-black] [--help]\n";
+	help += "\tavprocessor CONFIG.TXT OUTPUT_FILE_NAME [--generate-black] [--verbose] [--help]\n";
 	help += "CONFIG.TXT\n";
 	help += "\tEach line will be one stream in the output.\n";
 	help += "\tPattern of each line is:\n";
@@ -116,14 +116,18 @@ int main( int argc, char** argv )
 	}
 	for( size_t argument = 0; argument < arguments.size(); ++argument )
 	{
+		if( arguments.at( argument ) == "--help" )
+		{
+			std::cout << help << std::endl;
+			return 0;
+		}
 		if( arguments.at( argument ) == "--generate-black" )
 		{
 			useVideoGenerator = true;
 		}
-		else if( arguments.at( argument ) == "--help" )
+		if( arguments.at( argument ) == "--verbose" )
 		{
-			std::cout << help << std::endl;
-			return 0;
+			verbose = true;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static const std::string dummyAudioCodec = "pcm_s16le";`
`20`	`20`
`21`	`21`	`static bool useVideoGenerator = false;`
`22`	`22`
`23`		`-bool verbose = false;`
	`23`	`+static bool verbose = false;`
`24`	`24`
`25`	`25`	`void parseConfigFile( const std::string& configFilename, avtranscoder::Transcoder& transcoder )`
`26`	`26`	`{`
`@@ -96,7 +96,7 @@ int main( int argc, char** argv )`
`96`	`96`	`{`
`97`	`97`	`std::string help;`
`98`	`98`	`help += "Usage\n";`
`99`		`- help += "\tavprocessor CONFIG.TXT OUTPUT_FILE_NAME [--generate-black] [--help]\n";`
	`99`	`+ help += "\tavprocessor CONFIG.TXT OUTPUT_FILE_NAME [--generate-black] [--verbose] [--help]\n";`
`100`	`100`	`help += "CONFIG.TXT\n";`
`101`	`101`	`help += "\tEach line will be one stream in the output.\n";`
`102`	`102`	`help += "\tPattern of each line is:\n";`
`@@ -116,14 +116,18 @@ int main( int argc, char** argv )`
`116`	`116`	`}`
`117`	`117`	`for( size_t argument = 0; argument < arguments.size(); ++argument )`
`118`	`118`	`{`
	`119`	`+ if( arguments.at( argument ) == "--help" )`
	`120`	`+ {`
	`121`	`+ std::cout << help << std::endl;`
	`122`	`+ return 0;`
	`123`	`+ }`
`119`	`124`	`if( arguments.at( argument ) == "--generate-black" )`
`120`	`125`	`{`
`121`	`126`	`useVideoGenerator = true;`
`122`	`127`	`}`
`123`		`- else if( arguments.at( argument ) == "--help" )`
	`128`	`+ if( arguments.at( argument ) == "--verbose" )`
`124`	`129`	`{`
`125`		`- std::cout << help << std::endl;`
`126`		`- return 0;`
	`130`	`+ verbose = true;`
`127`	`131`	`}`
`128`	`132`	`}`
`129`	`133`