[Gnash-commit] /srv/bzr/gnash/trunk r12369: Make list of available media handlers in --help string consistent with other multi-choices and show the default.

[Sandro Santilli]

------------------------------------------------------------
revno: 12369
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-12 23:50:47 +0200
message:
  Make list of available media handlers in --help string consistent with other 
multi-choices and show the default.
modified:
  gui/gnash.cpp

=== modified file 'gui/gnash.cpp'
--- a/gui/gnash.cpp     2010-08-05 16:54:13 +0000
+++ b/gui/gnash.cpp     2010-08-12 21:50:47 +0000
@@ -24,8 +24,10 @@
 
 #include <string>
 #include <iostream>
+#include <iterator>
 #include <ios>
 #include <boost/format.hpp>
+#include <boost/algorithm/string/join.hpp>
 #include <cstdlib>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -88,9 +90,8 @@
 static void
 usage()
 {
-    std::ostringstream handlers;
-    gnash::media::MediaFactory::instance().listKeys(
-            std::ostream_iterator<std::string>(handlers, " "));
+    std::vector<std::string> handlers;
+    gnash::media::MediaFactory::instance().listKeys(back_inserter(handlers));
 
     cout << _("Usage: gnash [options] movie_file.swf\n")
     << "\n"
@@ -126,8 +127,9 @@
     << _("                           1 enable rendering, disable sound\n") 
     << _("                           2 enable sound, disable rendering\n") 
     << _("                           3 enable rendering and sound 
(default)\n") 
-    << _("  -M,  --media < ") << handlers.str() << ">\n"
-    << _("                           The media handler to use\n")
+    << _("  -M,  --media <") << boost::join(handlers, "|") << ">\n"
+    << _("                           The media handler to use")
+    << " (default " << handlers.front() << ")\n"
     // Only list the renderers that were configured in for this build
     << _("  -R,  --renderer <")
 #ifdef RENDERER_OPENGL