[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp li...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/09 16:12:43

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp gnash.cpp 
        libbase        : rc.cpp rc.h 
        plugin         : plugin.cpp 

Log message:
                * libbase/rc.h: loadFiles() made private
                * libbase/rc.cpp: call loadFiles from  constructor
                * gui/Player.cpp (init_sound): don't call rcfile.loadFile();    
                  don't use rcfile for setting sound config, trust class user
                  for that.
                * gui/gnash.cpp (parseCommandLine): use rcfile for sound
                  setting only if no -r switch is given
                * plugin/plugin.cpp: don't use any -r switch so that config
                  file completely drive the run.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1573&r2=1.1574
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1573
retrieving revision 1.1574
diff -u -b -r1.1573 -r1.1574
--- ChangeLog   9 Nov 2006 15:32:43 -0000       1.1573
+++ ChangeLog   9 Nov 2006 16:12:43 -0000       1.1574
@@ -1,5 +1,17 @@
 2006-11-09 Sandro Santilli <address@hidden>
 
+       * libbase/rc.h: loadFiles() made private
+       * libbase/rc.cpp: call loadFiles from  constructor
+       * gui/Player.cpp (init_sound): don't call rcfile.loadFile();
+         don't use rcfile for setting sound config, trust class user
+         for that.
+       * gui/gnash.cpp (parseCommandLine): use rcfile for sound
+         setting only if no -r switch is given
+       * plugin/plugin.cpp: don't use any -r switch so that config
+         file completely drive the run.
+
+2006-11-09 Sandro Santilli <address@hidden>
+
        * libbase/rc.cpp: rc file parsing made case-insensitive.
        * server/font.cpp (readDefineFont2): allow seek-back in stream
          while reading shape glyphs (fixes bug #16311).

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gui/Player.cpp      29 Oct 2006 18:34:10 -0000      1.24
+++ gui/Player.cpp      9 Nov 2006 16:12:43 -0000       1.25
@@ -128,7 +128,7 @@
 Player::init_logfile()
 {
     dbglogfile.setWriteDisk(false);
-    rcfile.loadFiles();
+//    rcfile.loadFiles();
 //    rcfile.dump();
 
     if (rcfile.useWriteLog()) {
@@ -166,15 +166,6 @@
 Player::init_sound()
 {
     if (do_sound) {
-        if (windowid) {
-            do_sound = rcfile.usePluginSound();
-        }
-        else {
-            do_sound = rcfile.useSound();
-        }
-    }
-
-    if (do_sound) {
 #ifdef SOUND_SDL
         _sound_handler.reset( gnash::create_sound_handler_sdl() );
 #elif defined(SOUND_GST)

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gui/gnash.cpp       6 Nov 2006 19:35:06 -0000       1.55
+++ gui/gnash.cpp       9 Nov 2006 16:12:43 -0000       1.56
@@ -21,6 +21,7 @@
 
 #include "Player.h"
 #include "log.h" // for dbglogfile (I hate this)
+#include "rc.h" // for use of rcfile 
 
 #if defined(_WIN32) || defined(WIN32)
         #include "getopt_win32.h"
@@ -133,6 +134,9 @@
 static void
 parseCommandLine(int argc, char* argv[], gnash::Player& player)
 {
+    bool specified_rendering_flag=false;
+    bool called_by_plugin=false;
+
     int c = 0;
     // scan for the two main long GNU options
     for (; c < argc; c++) {
@@ -217,6 +221,8 @@
               break;
           case 'r':
        {
+              specified_rendering_flag=true;
+
               long int render_arg = strtol(optarg, NULL, 0);
               switch (render_arg) {
                 case 0:
@@ -274,6 +280,15 @@
        }
     }
 
+    if ( ! specified_rendering_flag ) {
+       log_msg("no rendering flags specified, using rcfile");
+        if ( called_by_plugin ) {
+            player.setDoSound( rcfile.usePluginSound() );
+        } else {
+            player.setDoSound( rcfile.useSound() );
+        }
+    }
+
     // get the file name from the command line
     while (optind < argc) {
 

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/rc.cpp      9 Nov 2006 15:32:43 -0000       1.13
+++ libbase/rc.cpp      9 Nov 2006 16:12:43 -0000       1.14
@@ -56,7 +56,7 @@
                            _plugin_sound(false)
 {
 //    GNASH_REPORT_FUNCTION;
-//    loadFiles();
+    loadFiles();
 }
 
 RcInitFile::~RcInitFile()

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/rc.h        29 Oct 2006 18:34:11 -0000      1.8
+++ libbase/rc.h        9 Nov 2006 16:12:43 -0000       1.9
@@ -37,7 +37,6 @@
     RcInitFile();
     ~RcInitFile();
 
-    DSOEXPORT bool loadFiles();
     bool parseFile(std::string filespec);
     bool updateFile(std::string filespec);
     
@@ -92,6 +91,9 @@
     void dump();
     
 private:
+
+    bool loadFiles();
+
     int  _delay;                // the timer delay
     bool _debug;                // enable debugging of this class
     bool _debugger;             // enable the Flash movie debugger

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- plugin/plugin.cpp   29 Oct 2006 18:34:16 -0000      1.65
+++ plugin/plugin.cpp   9 Nov 2006 16:12:43 -0000       1.66
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: plugin.cpp,v 1.65 2006/10/29 18:34:16 rsavoye Exp $ */
+/* $Id: plugin.cpp,v 1.66 2006/11/09 16:12:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -642,8 +642,10 @@
 
     size_t argc = 0;
     argv[argc++] = const_cast<char*>( procname.c_str() );
-    argv[argc++] = "-r";
-    argv[argc++] = "3";
+    // don't specify rendering flags, so that the rcfile
+    // will control that 
+    //argv[argc++] = "-r";
+    //argv[argc++] = "3";
     argv[argc++] = "-v";
     argv[argc++] = "-x";
     argv[argc++] = xid;