[Gnash-commit] gnash ChangeLog libbase/rc.cpp libbase/rc.h

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/12/18 16:34:33

Modified files:
        .              : ChangeLog 
        libbase        : rc.cpp rc.h 

Log message:
        * libbase/rc.{h,cpp}: add settings to gnashrc.
        - Override System.capabilities.os: "set flashSystemOS The OS SUPER 
PREMIUM EDITION"
        - Override System.capabilities.manufacturer: "set 
flashSystemManufacturer Gnash Linux";
        - Maximum movie library size: "set movieLibraryLimit 3" (defaults to 8, 
not yet used). I haven't looked into how to use this (except that the 
MovieLibrary appears to be constructed before the RcFile), but it can be 
retrieved using RcInitFile::getMovieLibraryLimit()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5207&r2=1.5208
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5207
retrieving revision 1.5208
diff -u -b -r1.5207 -r1.5208
--- ChangeLog   18 Dec 2007 15:02:23 -0000      1.5207
+++ ChangeLog   18 Dec 2007 16:34:32 -0000      1.5208
@@ -1,3 +1,13 @@
+2007-12-18 Benjamin Wolsey <address@hidden>
+
+       * libbase/rc.{h,cpp}: add settings to gnashrc. Override
+         System.capabilities.os: "set flashSystemOS The OS SUPER PREMIUM
+         EDITION";
+         Override System.capabilities.manufacturer: "set 
flashSystemManufacturer
+         Gnash Linux";
+         Maximum movie library size: "set movieLibraryLimit 3"
+         (defaults to 8, not yet used).
+       
 2007-12-18 Sandro Santilli <address@hidden>
 
        * gui/gtk.cpp (run): set interval timeout here rather then on

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- libbase/rc.cpp      12 Dec 2007 18:19:27 -0000      1.46
+++ libbase/rc.cpp      18 Dec 2007 16:34:33 -0000      1.47
@@ -60,6 +60,7 @@
 
 
 RcInitFile::RcInitFile() : _delay(0),
+                          _movieLibraryLimit(8),
                            _debug(false),
                            _debugger(false),
                            _verbosity(-1),
@@ -70,17 +71,17 @@
                                DEFAULT_FLASH_REV_NUMBER ",0"),
                            _flashSystemOS(), 
                            _flashSystemManufacturer("Gnash 
"DEFAULT_FLASH_SYSTEM_OS),
-                           _actiondump(false),
-                           _parserdump(false),
+                           _actionDump(false),
+                           _parserDump(false),
                           _verboseASCodingErrors(false),
                           _verboseMalformedSWF(false),
-                           _splash_screen(true),
-                           _localdomain_only(false),
-                           _localhost_only(false),
+                           _splashScreen(true),
+                           _localdomainOnly(false),
+                           _localhostOnly(false),
                            _log("gnash-dbg.log"),
-                          _writelog(false),
+                          _writeLog(false),
                            _sound(true),
-                           _plugin_sound(true),
+                           _pluginSound(true),
                           _extensionsEnabled(false),
                           _startStopped(false),
                           _insecureSSL(false),
@@ -368,6 +369,16 @@
                     continue;
                 }
 
+                if (noCaseCompare(variable, "flashSystemOS")) {
+                    _flashSystemOS = value;
+                    continue;
+                }
+
+                if (noCaseCompare(variable, "flashSystemManufacturer")) {
+                    _flashSystemManufacturer = value;
+                    continue;
+                }
+
                 if (noCaseCompare(variable, "debuglog")) {
                     expandPath (value);
                     _log = value;
@@ -395,20 +406,20 @@
                 }
 
                if (noCaseCompare(action , "set") ) {
-                     extractSetting(&_splash_screen, "splash_screen", variable,
+                     extractSetting(&_splashScreen, "splash_screen", variable,
                                value);
-                     extractSetting(&_localhost_only, "localhost", variable,
+                     extractSetting(&_localhostOnly, "localhost", variable,
                                value);
-                     extractSetting(&_localdomain_only, "localdomain", 
variable,
+                     extractSetting(&_localdomainOnly, "localdomain", variable,
                                value);
                      extractSetting(&_insecureSSL, "InsecureSSL", variable,
                                value);
                      extractSetting(&_debugger, "debugger", variable, value);
-                     extractSetting(&_actiondump, "actionDump", variable, 
value);
-                     extractSetting(&_parserdump, "parserDump", variable, 
value);
-                     extractSetting(&_writelog, "writelog", variable, value);
+                     extractSetting(&_actionDump, "actionDump", variable, 
value);
+                     extractSetting(&_parserDump, "parserDump", variable, 
value);
+                     extractSetting(&_writeLog, "writelog", variable, value);
                      extractSetting(&_sound, "sound", variable, value);
-                     extractSetting(&_plugin_sound, "pluginsound", variable, 
value);
+                     extractSetting(&_pluginSound, "pluginsound", variable, 
value);
                      extractSetting(&_verboseASCodingErrors,
                                "ASCodingErrorsVerbosity", variable, value);
                      extractSetting(&_verboseMalformedSWF, 
"MalformedSWFVerbosity",
@@ -419,6 +430,7 @@
 
                      extractDouble(_streamsTimeout, "StreamsTimeout", 
variable, value);
                 
+                     extractNumber(&_movieLibraryLimit, "movieLibraryLimit", 
variable, value);                
                      extractNumber(&_delay, "delay", variable, value);
                      extractNumber(&_verbosity, "verbosity", variable, value);
                }
@@ -450,26 +462,26 @@
 void
 RcInitFile::useSplashScreen(bool value)
 {
-    _splash_screen = value;
+    _splashScreen = value;
 }
 
 void
 RcInitFile::useLocalDomain(bool value)
 {
-    _localdomain_only = value;
+    _localdomainOnly = value;
 }
 
 void
 RcInitFile::useLocalHost(bool value)
 {
-    _localhost_only = value;
+    _localhostOnly = value;
 }
 
 void
 RcInitFile::useActionDump(bool value)
 {
 //    GNASH_REPORT_FUNCTION;
-    _actiondump = value;
+    _actionDump = value;
     if (value) {
         _verbosity++;
     }
@@ -491,7 +503,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     
-    _parserdump = value;
+    _parserDump = value;
     if (value) {
         _verbosity++;
     }
@@ -502,7 +514,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     
-    _writelog = value;
+    _writeLog = value;
 }
 
 void
@@ -514,27 +526,27 @@
          << ((_debugger)?"enabled":"disabled") << endl;
     cerr << "\tVerbosity Level: " << _verbosity << endl;
     cerr << "\tDump ActionScript processing: "
-         << ((_actiondump)?"enabled":"disabled") << endl;
+         << ((_actionDump)?"enabled":"disabled") << endl;
     cerr << "\tDump parser info: "
-         << ((_parserdump)?"enabled":"disabled") << endl;
+         << ((_parserDump)?"enabled":"disabled") << endl;
     cerr << "\tActionScript coding errors verbosity: "
          << ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
     cerr << "\tMalformed SWF verbosity: "
          << ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
     cerr << "\tUse Splash Screen: "
-         << ((_splash_screen)?"enabled":"disabled") << endl;
+         << ((_splashScreen)?"enabled":"disabled") << endl;
     cerr << "\tUse Local Domain Only: "
-         << ((_localdomain_only)?"enabled":"disabled") << endl;
+         << ((_localdomainOnly)?"enabled":"disabled") << endl;
     cerr << "\tUse Localhost Only: "
-         << ((_localhost_only)?"enabled":"disabled") << endl;
+         << ((_localhostOnly)?"enabled":"disabled") << endl;
     cerr << "\tWrite Debug Log To Disk: "
-         << ((_writelog)?"enabled":"disabled") << endl;
+         << ((_writeLog)?"enabled":"disabled") << endl;
     cerr << "\tAllow insecure SSL connections: "
          << ((_insecureSSL)?"yes":"no") << endl;
     cerr << "\tEnable sound: "
          << ((_sound)?"enabled":"disabled") << endl;
     cerr << "\tEnable Plugin sound: "
-         << ((_plugin_sound)?"enabled":"disabled") << endl;
+         << ((_pluginSound)?"enabled":"disabled") << endl;
     cerr << "\tEnable Extensions: "
          << ((_extensionsEnabled)?"enabled":"disabled") << endl;
     if (_log.size()) {

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libbase/rc.h        12 Dec 2007 23:56:29 -0000      1.35
+++ libbase/rc.h        18 Dec 2007 16:34:33 -0000      1.36
@@ -42,21 +42,23 @@
     bool parseFile(const std::string& filespec);
     bool updateFile(const std::string& filespec);
     
-    bool useSplashScreen() const { return _splash_screen; }
+    bool useSplashScreen() const { return _splashScreen; }
     void useSplashScreen(bool value);
 
-    bool useActionDump() const { return _actiondump; }
+    bool useActionDump() const { return _actionDump; }
     void useActionDump(bool value);
 
-    bool useParserDump() const { return _parserdump; }
+    bool useParserDump() const { return _parserDump; }
     void useParserDump(bool value);
 
-    bool useWriteLog() const { return _writelog; }
+    bool useWriteLog() const { return _writeLog; }
     void useWriteLog(bool value);
 
     int getTimerDelay() const { return _delay; }
     void setTimerDelay(int x) { _delay = x; }
 
+    int getMovieLibraryLimit() const { return _movieLibraryLimit; }
+
     bool showASCodingErrors() const { return _verboseASCodingErrors; }
     void showASCodingErrors(bool value);
 
@@ -89,13 +91,13 @@
 
     // strk: I'd drop this, and allow an -f switch to select
     //       the gnashrc file to use instead
-    bool usePluginSound() const { return _plugin_sound; }
-    void usePluginSound(bool value) { _plugin_sound = value; }
+    bool usePluginSound() const { return _pluginSound; }
+    void usePluginSound(bool value) { _pluginSound = value; }
 
-    bool useLocalDomain() const { return _localdomain_only; }
+    bool useLocalDomain() const { return _localdomainOnly; }
     void useLocalDomain(bool value);
     
-    bool useLocalHost() const { return _localhost_only; }
+    bool useLocalHost() const { return _localhostOnly; }
     void useLocalHost(bool value);
 
     const std::vector<std::string>& getWhiteList() const { return _whitelist; }
@@ -141,6 +143,7 @@
 
 private:
     int  _delay;                // the timer delay
+    int  _movieLibraryLimit;    // max number of movie clips to store in the 
library
     bool _debug;                // enable debugging of this class
     bool _debugger;             // enable the Flash movie debugger
     int  _verbosity;
@@ -151,8 +154,8 @@
     std::string  _flashSystemManufacturer;     // String to pass as
                                                // 
System.capabilities.manufacturer
                                                // in Actionscript
-    bool _actiondump;           // enable dumping actionscript classes
-    bool _parserdump;           // enable dumping parser data
+    bool _actionDump;           // enable dumping actionscript classes
+    bool _parserDump;           // enable dumping parser data
 
     /// Enable ActionScript errors verbosity
     bool _verboseASCodingErrors;
@@ -162,20 +165,20 @@
     
     
     // End user Features
-    bool _splash_screen;        // display a splash screen when
+    bool _splashScreen;        // display a splash screen when
                                 // loading a movie
     // Security Features
-    bool _localdomain_only;     // only access network resources for
+    bool _localdomainOnly;     // only access network resources for
                                 // the local domain
-    bool _localhost_only;       // only access network resources 
+    bool _localhostOnly;       // only access network resources 
     std::vector<std::string> _whitelist; // domains we allow
     std::vector<std::string> _blacklist; // domains we don't allow
     std::string _log;           // the name of the debug log
-    bool _writelog;             // enable writing the debug log to disk
+    bool _writeLog;             // enable writing the debug log to disk
     std::string _wwwroot;       // the root path for the streaming server
     int _retries;               // the number of retries for a thread
     bool _sound;               // whether sound is enable or not
-    bool _plugin_sound;                // whether sound is desired for the 
plugin
+    bool _pluginSound;         // whether sound is desired for the plugin
 
     bool _extensionsEnabled;   // whether to scan plugin path for extensions