[Gnash-commit] gnash ChangeLog doc/C/gnashrc.xml gui/Player.cp...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/01 15:01:56

Modified files:
        .              : ChangeLog 
        doc/C          : gnashrc.xml 
        gui            : Player.cpp 
        libbase        : rc.cpp rc.h 
        testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
                * libbase/rc.{cpp,h}: Add a "StartStopped" variable, to
                  have the gui start in "stop" mode.
                * doc/C/gnashrc.xml: document the new "StartStopped" variable.
                * gui/Player.cpp (init_gui): set the Gui to "stop" if requested
                  by the user (trough gnashrc)
                * testsuite/libbase/: TCXXRc.cpp, gnashrc.in: test 
"StartStopped"
                  variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3434&r2=1.3435
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/gnashrc.xml?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3434
retrieving revision 1.3435
diff -u -b -r1.3434 -r1.3435
--- ChangeLog   1 Jun 2007 11:53:18 -0000       1.3434
+++ ChangeLog   1 Jun 2007 15:01:53 -0000       1.3435
@@ -1,5 +1,15 @@
 2007-06-01 Sandro Santilli <address@hidden>
 
+       * libbase/rc.{cpp,h}: Add a "StartStopped" variable, to
+         have the gui start in "stop" mode.
+       * doc/C/gnashrc.xml: document the new "StartStopped" variable.
+       * gui/Player.cpp (init_gui): set the Gui to "stop" if requested
+         by the user (trough gnashrc)
+       * testsuite/libbase/: TCXXRc.cpp, gnashrc.in: test "StartStopped"
+         variable.
+
+2007-06-01 Sandro Santilli <address@hidden>
+
        * server/asobj/NetStream.{cpp,h}: split processStatusNotifications
          so that onStatus handler call is performed while the statusMutex
          is NOT locked, to prevent attempts to lock the mutex again while

Index: doc/C/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/gnashrc.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- doc/C/gnashrc.xml   26 May 2007 17:08:48 -0000      1.8
+++ doc/C/gnashrc.xml   1 Jun 2007 15:01:54 -0000       1.9
@@ -170,6 +170,16 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term>StartStopped</term>
+       <listitem>
+         <para>
+           Set to ``on'' to have the GUI start in "stop" mode. This is useful 
in particular
+           for the plugin, so you have to explicitly start any movie on a 
webpage. Off by default.
+         </para>
+       </listitem>
+      </varlistentry>
+
    </variablelist>
 
   <para>

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gui/Player.cpp      1 Jun 2007 11:02:17 -0000       1.53
+++ gui/Player.cpp      1 Jun 2007 15:01:55 -0000       1.54
@@ -202,11 +202,19 @@
        if ( do_render )
        {
                _gui.reset(new GUI_CLASS(windowid, scale, do_loop, bit_depth));
+
+               RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+               if ( rcfile.startStopped() )
+               {
+                       _gui->stop();
+               }
+
        }
        else
        {
                _gui.reset(new NullGui(do_loop));
        }
+
 }
 
 movie_definition* 

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/rc.cpp      25 May 2007 16:32:38 -0000      1.24
+++ libbase/rc.cpp      1 Jun 2007 15:01:55 -0000       1.25
@@ -60,7 +60,8 @@
                            _localhost_only(false),
                            _sound(true),
                            _plugin_sound(true),
-                          _extensionsEnabled(false)
+                          _extensionsEnabled(false),
+                          _startStopped(false)
 {
 //    GNASH_REPORT_FUNCTION;
     loadFiles();
@@ -189,6 +190,7 @@
                 extractSetting(&_verboseASCodingErrors, 
"ASCodingErrorsVerbosity", variable, value);
                 extractSetting(&_verboseMalformedSWF, "MalformedSWFVerbosity", 
variable, value);
                 extractSetting(&_extensionsEnabled, "EnableExtensions", 
variable, value);
+                extractSetting(&_startStopped, "StartStopped", variable, 
value);
                 
                 extractNumber(&_delay, "delay", variable, value);
                 extractNumber(&_verbosity, "verbosity", variable, value);

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/rc.h        28 May 2007 15:41:02 -0000      1.18
+++ libbase/rc.h        1 Jun 2007 15:01:55 -0000       1.19
@@ -68,7 +68,12 @@
     void showMalformedSWFErrors(bool value);
 
     bool enableExtensions() const { return _extensionsEnabled; }
-    //void enableExtension(bool mode) { _extensionsEnabled=mode; }
+
+    /// Return true if user is willing to start the gui in "stop" mode
+    //
+    /// defaults to false.
+    ///
+    bool startStopped() const { return _startStopped; }
     
     int verbosityLevel() const { return _verbosity; }
     void verbosityLevel(int value) { _verbosity = value; }
@@ -139,7 +144,9 @@
     bool _sound;               // whether sound is enable or not
     bool _plugin_sound;                // whether sound is desired for the 
plugin
 
-    bool _extensionsEnabled;
+    bool _extensionsEnabled;   // wheter to scan plugin path for extensions
+
+    bool _startStopped;                // whether to start the gui in "stop" 
mode
 };
 
 //extern DSOEXPORT RcInitFile rcfile;

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/libbase/TCXXRc.cpp        28 May 2007 15:41:11 -0000      1.11
+++ testsuite/libbase/TCXXRc.cpp        1 Jun 2007 15:01:55 -0000       1.12
@@ -158,6 +158,12 @@
         runtest.fail ("enableExtensions");
     }
 
+    if (rc.startStopped() == 1) {
+        runtest.pass ("startStopped");
+    } else {
+        runtest.fail ("startStopped");
+    }
+
     std::vector<std::string> whitelist = rc.getWhiteList();
     if (whitelist.size()) {
         if ((whitelist[0] == "www.doonesbury.com")

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libbase/gnashrc.in        25 May 2007 16:12:58 -0000      1.4
+++ testsuite/libbase/gnashrc.in        1 Jun 2007 15:01:55 -0000       1.5
@@ -42,3 +42,6 @@
 
 # Enable extensions
 set enableExtensions on
+
+# Start the gui in STOP mode
+set startStopped on