[Performous-commit] Lasse Karkkainen : Replace mics/pdev command line options with --audio

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: aa42591f3f8fa2dfc4f072e836205f24f6774215

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sun Jul 18 00:51:55 2010 +0300

Replace mics/pdev command line options with --audio

---

 game/main.cc |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index f466381..a297f0d 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -254,8 +254,7 @@ int main(int argc, char** argv) try {
 	std::ios::sync_with_stdio(false);  // We do not use C stdio
 	std::srand(std::time(NULL));
 	// Parse commandline options
-	std::vector<std::string> mics;
-	std::vector<std::string> pdevs;
+	std::vector<std::string> devices;
 	std::vector<std::string> songdirs;
 	namespace po = boost::program_options;
 	po::options_description opt1("Generic options");
@@ -266,10 +265,7 @@ int main(int argc, char** argv) try {
 	  ("songlist", po::value<std::string>(&songlist), "save a list of songs in the specified folder");
 	po::options_description opt2("Configuration options");
 	opt2.add_options()
-	  ("mics", po::value<std::vector<std::string> >(&mics)->composing(), "specify the microphones to use")
-	  ("pdev", po::value<std::vector<std::string> >(&pdevs)->composing(), "specify the playback device")
-	  ("michelp", "detailed help and device list for --mics")
-	  ("pdevhelp", "detailed help and device list for --pdev")
+	  ("audio", po::value<std::vector<std::string> >(&devices)->composing(), "specify an audio device to use")
 	  ("jstest", "utility to get joystick button mappings");
 	po::options_description opt3("Hidden options");
 	opt3.add_options()
@@ -312,8 +308,7 @@ int main(int argc, char** argv) try {
 	}
 	// Override XML config for options that were specified from commandline or performous.conf
 	confOverride(songdirs, "system/path_songs");
-	confOverride(mics, "audio/capture");
-	confOverride(pdevs, "audio/playback");
+	confOverride(devices, "audio/devices");
 	getPaths(); // Initialize paths before other threads start
 	if (vm.count("jstest")) { // Joystick test program
 		std::cout << std::endl << "Joystick utility - Touch your joystick to see buttons here" << std::endl