[Gnash-commit] [SCM] Gnash branch, master, updated. f3b66b64ed6c2e804f57301cea1e722bd8f5aaa8

[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  f3b66b64ed6c2e804f57301cea1e722bd8f5aaa8 (commit)
       via  e2c24291c780cb02f773ef9ae538130aaa1f59ed (commit)
      from  72ca79255f52a67c5e323abd1b7748a6214b7f7e (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=f3b66b64ed6c2e804f57301cea1e722bd8f5aaa8


commit f3b66b64ed6c2e804f57301cea1e722bd8f5aaa8
Merge: e2c2429 72ca792
Author: Sandro Santilli <address@hidden>
Date:   Sun Dec 19 22:52:51 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=e2c24291c780cb02f773ef9ae538130aaa1f59ed


commit e2c24291c780cb02f773ef9ae538130aaa1f59ed
Author: Sandro Santilli <address@hidden>
Date:   Sun Dec 19 22:52:24 2010 +0100

    Split options in general and "debugging" ones

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 2f760b9..d866c93 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -319,6 +319,48 @@ setupSoundAndRendering(gnash::Player& p, int i)
     }
 }
 
+po::options_description
+getDebuggingOptions(gnash::Player& p)
+{
+    using gnash::Player;
+    using gnash::LogFile;
+    using gnash::RcInitFile;
+
+    po::options_description desc(_("Debugging options"));
+
+    desc.add_options()
+
+    ("verbose,v", accumulator<int>()
+        ->notifier(boost::bind(&LogFile::setVerbosity, &dbglogfile, _1)),
+        _("Produce verbose output"))
+
+    ("writelog,w", po::bool_switch()
+        ->notifier(boost::bind(&RcInitFile::useWriteLog, &rcfile, _1)),
+        _("Produce the disk based debug log"))
+
+#if VERBOSE_ACTION
+    ("verbose-actions,a", po::bool_switch()
+        ->notifier(boost::bind(&LogFile::setActionDump, &dbglogfile, _1)),
+        _("Be (very) verbose about action execution"))
+#endif
+
+#if VERBOSE_PARSE
+    ("verbose-parsing,p", po::bool_switch()
+        ->notifier(boost::bind(&LogFile::setParserDump, &dbglogfile, _1)),
+        _("Be (very) verbose about parsing"))
+#endif
+
+#ifdef GNASH_FPS_DEBUG
+    ("debug-fps,f", po::value<float>()
+        ->notifier(boost::bind(&Player::setFpsPrintTime, &p, _1)),
+        _("Print FPS every num seconds"))
+#endif 
+
+
+    ;
+
+    return desc;
+}
 
 po::options_description
 getSupportedOptions(gnash::Player& p)
@@ -354,22 +396,6 @@ getSupportedOptions(gnash::Player& p)
         ->notifier(boost::bind(&Player::setDelay, &p, _1)),
         _("Number of milliseconds to delay in main loop"))
 
-    ("verbose,v", accumulator<int>()
-        ->notifier(boost::bind(&LogFile::setVerbosity, &dbglogfile, _1)),
-        _("Produce verbose output"))
-
-#if VERBOSE_ACTION
-    ("verbose-actions,a", po::bool_switch()
-        ->notifier(boost::bind(&LogFile::setActionDump, &dbglogfile, _1)),
-        _("Be (very) verbose about action execution"))
-#endif
-
-#if VERBOSE_PARSE
-    ("verbose-parsing,p", po::bool_switch()
-        ->notifier(boost::bind(&LogFile::setParserDump, &dbglogfile, _1)),
-        _("Be (very) verbose about parsing"))
-#endif
-
     ("audio-dump,A", po::value<string>()
         ->notifier(boost::bind(&Player::setAudioDumpfile, &p, _1)),
         _("Audio dump file (wave format)"))
@@ -384,10 +410,6 @@ getSupportedOptions(gnash::Player& p)
         ->notifier(boost::bind(&Player::setWindowId, &p, _1)),
         _("X11 Window ID for display"))
 
-    ("writelog,w", po::bool_switch()
-        ->notifier(boost::bind(&RcInitFile::useWriteLog, &rcfile, _1)),
-        _("Produce the disk based debug log"))
-
     ("width,j", po::value<int>()
         ->notifier(boost::bind(&Player::setWidth, &p, _1)),
         _("Set window width"))
@@ -458,12 +480,6 @@ getSupportedOptions(gnash::Player& p)
         + string(" <fd>:<fd>")
         ).c_str())
 
-#ifdef GNASH_FPS_DEBUG
-    ("debug-fps,f", po::value<float>()
-        ->notifier(boost::bind(&Player::setFpsPrintTime, &p, _1)),
-        _("Print FPS every num seconds"))
-#endif 
-
     ("max-advances", po::value<size_t>()
         ->notifier(boost::bind(&Player::setMaxAdvances, &p, _1)),
         _("Exit after specified number of frame advances"))
@@ -494,6 +510,8 @@ getSupportedOptions(gnash::Player& p)
         _("Input files"))
     ;
 
+    desc.add(getDebuggingOptions(p));
+
     return desc;
 }
 

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

Summary of changes:
 gui/gnash.cpp |   70 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
Gnash