[Gnash-commit] [SCM] Gnash branch, master, updated. 8cccfd1cc7fb22a727332ffcf6b91a80b7375477

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  8cccfd1cc7fb22a727332ffcf6b91a80b7375477 (commit)
      from  d1a5bd694abcccf8dbb3c0b1b0fb630fc05d089e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=8cccfd1cc7fb22a727332ffcf6b91a80b7375477


commit 8cccfd1cc7fb22a727332ffcf6b91a80b7375477
Author: Sandro Santilli <address@hidden>
Date:   Tue Aug 24 22:04:24 2010 +0200

    Drop more ifdefs, make --renderer help string (in --help) consistent with 
the rest of option lists.

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 787f84a..64cee24 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -28,6 +28,8 @@
 #include <ios>
 #include <boost/format.hpp>
 #include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include <cstdlib>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -93,6 +95,10 @@ usage()
     std::vector<std::string> handlers;
     gnash::media::MediaFactory::instance().listKeys(back_inserter(handlers));
 
+    std::vector<std::string> renderers;
+    boost::split(renderers, RENDERER_CONFIG,
+        boost::is_any_of(" "), boost::token_compress_on);
+
     cout << _("Usage: gnash [options] movie_file.swf\n")
     << "\n"
     << _("Plays a SWF (Shockwave Flash) movie\n")
@@ -129,20 +135,10 @@ usage()
     << _("                           3 enable rendering and sound 
(default)\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
-     << _(" opengl")
-#endif
-#ifdef RENDERER_CAIRO
-     << _(" cairo")
-#endif
-#ifdef RENDERER_AGG
-    << _(" agg > (default: agg)\n")
-#else
-    << " >\n"
-#endif
+    << " (default: " << handlers.front() << ")\n"
+    << _("  -R,  --renderer <") << boost::join(renderers, "|") << ">\n"
+    << _("                           The renderer to use")
+    << " (default: agg)\n"
     << _("  -t,  --timeout <sec>     Exit after the specified number of "
             "seconds\n") 
     << _("  -u,  --real-url <url>    Set \"real\" URL of the movie\n") 

-----------------------------------------------------------------------

Summary of changes:
 gui/gnash.cpp |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash