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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/02/11 08:13:06

Modified files:
        .              : ChangeLog 
        libbase        : rc.cpp rc.h 
        testsuite/libbase: gnashrc.in 

Log message:
                * libbase/rc.{h,cpp}: use boost/cstdint for uint32_t. Cast SHM 
key 
                  to key_t only at return. Use 'splashScreen', not 
splash_screen in
                  the rcfile for naming consistency. It's as yet unused, so 
shouldn't
                  cause any problems.
                * testsuite/libbase/gnashrc.in: change test to use splashScreen.
        
        I have a feeling libbase won't build under w32 or other non-UNIX-like 
systems becase of the <sys/shm.h> include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5609&r2=1.5610
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5609
retrieving revision 1.5610
diff -u -b -r1.5609 -r1.5610
--- ChangeLog   10 Feb 2008 21:12:24 -0000      1.5609
+++ ChangeLog   11 Feb 2008 08:13:05 -0000      1.5610
@@ -1,3 +1,11 @@
+2008-02-11 Benjamin Wolsey <address@hidden>
+
+       * libbase/rc.{h,cpp}: use boost/cstdint for uint32_t. Cast SHM key 
+         to key_t only at return. Use 'splashScreen', not splash_screen in
+         the rcfile for naming consistency. It's as yet unused, so shouldn't
+         cause any problems.
+       * testsuite/libbase/gnashrc.in: change test to use splashScreen.        
  
+
 2008-02-10 Benjamin Wolsey <address@hidden>
 
        * gui/gtk.cpp: Don't use is_muted() to set the 'Sound' menu toggle,

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- libbase/rc.cpp      10 Feb 2008 21:12:25 -0000      1.59
+++ libbase/rc.cpp      11 Feb 2008 08:13:06 -0000      1.60
@@ -452,7 +452,7 @@
                 }
 
                if (noCaseCompare(action , "set") ) {
-                     extractSetting(&_splashScreen, "splash_screen", variable,
+                     extractSetting(&_splashScreen, "splashScreen", variable,
                                value);
                      extractSetting(&_localhostOnly, "localhost", variable,
                                value);
@@ -487,7 +487,7 @@
                                value);
                      extractSetting(&_lctrace, "LCTrace", variable,
                                value);
-                     extractNumber((boost::uint32_t *)&_lcshmkey, "LCShmkey", 
variable, value);
+                     extractNumber(&_lcshmkey, "LCShmkey", variable, value);
                }
             }
         }

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/rc.h        22 Jan 2008 14:53:19 -0000      1.43
+++ libbase/rc.h        11 Feb 2008 08:13:06 -0000      1.44
@@ -29,6 +29,7 @@
 #include <vector>
 #include <iostream>
 #include <sys/shm.h>           // for key_t
+#include <boost/cstdint.hpp>
 
 namespace gnash {
   
@@ -209,7 +210,7 @@
     void setLCTrace(bool x) { _lctrace = x; }
 
     // 
-    key_t getLCShmKey() const { return _lcshmkey; }
+    key_t getLCShmKey() const { return static_cast<key_t>(_lcshmkey); }
     void setLCShmKey(bool x) { _lcshmkey = x; }
     
     void dump();    
@@ -217,10 +218,10 @@
 private:
 
     /// The timer delay
-    uint32_t  _delay;
+    boost::uint32_t  _delay;
 
     /// Max number of movie clips to store in the library      
-    uint32_t  _movieLibraryLimit;   
+    boost::uint32_t  _movieLibraryLimit;   
 
     /// Enable debugging of this class
     bool _debug;
@@ -229,7 +230,7 @@
     bool _debugger;
 
     // Level of debugging output
-    uint32_t  _verbosity;
+    boost::uint32_t  _verbosity;
 
     /// Command format to use to open urls
     //
@@ -328,7 +329,7 @@
     
     /// Shared memory segment key (can be set for
     /// compatibility with other players.
-    key_t _lcshmkey;
+    boost::uint32_t _lcshmkey;
 
     // A function only for writing path lists to an outstream.
     void writeList(PathList& list, std::ostream& o);
@@ -347,7 +348,7 @@
     static bool extractSetting(bool *var, const char *pattern,
                         std::string &variable, std::string &value);
     
-    static uint32_t extractNumber(uint32_t *num, const char *pattern,
+    static boost::uint32_t extractNumber(boost::uint32_t *num, const char 
*pattern,
                         std::string &variable, std::string &value);
 
     static void extractDouble(double& out, const char *pattern,

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/libbase/gnashrc.in        5 Jan 2008 10:46:43 -0000       1.14
+++ testsuite/libbase/gnashrc.in        11 Feb 2008 08:13:06 -0000      1.15
@@ -1,5 +1,5 @@
 # Display a splash screen when starting
-set splash_screen on
+set splashScreen on
 
 # Only access remote content from our local domain
 set localdomain on