From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 20 Mar 2014 02:06:11 +0000 (+0000)
Subject: Add arguments to --drivers output. Fix misstatement of flag.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=02a94ce58a3cccf8652dcb2822d48866c0a93462;p=freetel-svn-tracking.git

Add arguments to --drivers output. Fix misstatement of flag.


git-svn-id: https://svn.code.sf.net/p/freetel/code@1462 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-server/source/big_main.cpp b/freedv-server/source/big_main.cpp
index cbb2d29e..0c52dc86 100644
--- a/freedv-server/source/big_main.cpp
+++ b/freedv-server/source/big_main.cpp
@@ -36,7 +36,7 @@ static void help(const char * name)
     " [options]\n"
     "\nWhere options are these flags:\n\n"
     "--codec or -c\t\tSelect the voice codec.\n"
-    "--config or -c\t\tPrint the configuration.\n"
+    "--config or -C\t\tPrint the configuration.\n"
     "--drivers or -d\t\tPrint a list of the available device drivers.\n"
     "--framer or -f\t\tSelect the communications protocol framer.\n"
     "--help or -h\t\tPrint this message.\n"
diff --git a/freedv-server/source/driver_manager.cpp b/freedv-server/source/driver_manager.cpp
index 7c82aa3e..a06a80c4 100644
--- a/freedv-server/source/driver_manager.cpp
+++ b/freedv-server/source/driver_manager.cpp
@@ -97,15 +97,20 @@ namespace FreeDV {
   std::ostream &
   DriverManager::print(std::ostream & s) const
   {
-    enumerate(s, "Audio Input", audio_input_drivers) << std::endl;
-    enumerate(s, "Audio Output", audio_output_drivers) << std::endl;
-    enumerate(s, "Codec", codecs) << std::endl;
-    enumerate(s, "Protocol Framer", framers) << std::endl;
-    enumerate(s, "Keying Output", keying_output_drivers) << std::endl;
-    enumerate(s, "Modem", modems) << std::endl;
-    enumerate(s, "PTT Input", ptt_input_drivers) << std::endl;
-    enumerate(s, "Text Input", text_input_drivers) << std::endl;
-    enumerate(s, "User Interface", user_interface_drivers) << std::endl;
+    enumerate(s, "Audio Input (--receiver, --microphone)", audio_input_drivers)
+     << std::endl;
+    enumerate(s, "Audio Output (--transmitter, --loudspeaker)",
+     audio_output_drivers)
+     << std::endl;
+    enumerate(s, "Codec (--codec)", codecs) << std::endl;
+    enumerate(s, "Protocol Framer (--framer)", framers) << std::endl;
+    enumerate(s, "Keying Output (--keying)", keying_output_drivers)
+     << std::endl;
+    enumerate(s, "Modem (--modem)", modems) << std::endl;
+    enumerate(s, "PTT Input (--ptt-digital, --ptt-ssb)", ptt_input_drivers)
+     << std::endl;
+    enumerate(s, "Text Input (--text)", text_input_drivers) << std::endl;
+    enumerate(s, "User Interface (--gui)", user_interface_drivers) << std::endl;
 
     return s;
   }