[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/gnash.cpp libbase/rc.h plug...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/gnash.cpp libbase/rc.h plug... |
Date: |
Thu, 09 Nov 2006 17:03:48 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/11/09 17:03:48
Modified files:
. : ChangeLog
gui : gnash.cpp
libbase : rc.h
plugin/klash : klash.cpp
utilities : parser.cpp processor.cpp
Log message:
* gui/gnash.cpp, libbase/rc.h, plugin/klash/klash.cpp,
utilities/parser.cpp, utilities/processor.cpp:
Reverted privatization of RcFile.loadFiles().
We actually want to keep control of that call, at
least for the unit testing...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1576&r2=1.1577
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1576
retrieving revision 1.1577
diff -u -b -r1.1576 -r1.1577
--- ChangeLog 9 Nov 2006 16:31:50 -0000 1.1576
+++ ChangeLog 9 Nov 2006 17:03:47 -0000 1.1577
@@ -1,5 +1,13 @@
2006-11-09 Sandro Santilli <address@hidden>
+ * gui/gnash.cpp, libbase/rc.h, plugin/klash/klash.cpp,
+ utilities/parser.cpp, utilities/processor.cpp:
+ Reverted privatization of RcFile.loadFiles().
+ We actually want to keep control of that call, at
+ least for the unit testing...
+
+2006-11-09 Sandro Santilli <address@hidden>
+
* plugin/klash/klash.cpp, utilities/: parser.cpp, processor.cpp:
remove explicit rcfile.loadFiles() call.
* libbase/rc.cpp: set pluginSound on by default
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gui/gnash.cpp 9 Nov 2006 16:12:43 -0000 1.56
+++ gui/gnash.cpp 9 Nov 2006 17:03:47 -0000 1.57
@@ -313,6 +313,8 @@
{
gnash::Player player;
+ rcfile.loadFiles();
+
parseCommandLine(argc, argv, player);
// No file name was supplied
Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/rc.h 9 Nov 2006 16:12:43 -0000 1.9
+++ libbase/rc.h 9 Nov 2006 17:03:47 -0000 1.10
@@ -37,6 +37,8 @@
RcInitFile();
~RcInitFile();
+ bool loadFiles();
+
bool parseFile(std::string filespec);
bool updateFile(std::string filespec);
@@ -92,8 +94,6 @@
private:
- bool loadFiles();
-
int _delay; // the timer delay
bool _debug; // enable debugging of this class
bool _debugger; // enable the Flash movie debugger
Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- plugin/klash/klash.cpp 9 Nov 2006 16:31:50 -0000 1.21
+++ plugin/klash/klash.cpp 9 Nov 2006 17:03:48 -0000 1.22
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: klash.cpp,v 1.21 2006/11/09 16:31:50 strk Exp $ */
+/* $Id: klash.cpp,v 1.22 2006/11/09 17:03:48 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -279,6 +279,9 @@
dbglogfile.setWriteDisk(false);
+ rcfile.loadFiles();
+// rcfile.dump();
+
if (rcfile.useWriteLog()) {
dbglogfile.setWriteDisk(true);
}
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- utilities/parser.cpp 9 Nov 2006 16:31:50 -0000 1.27
+++ utilities/parser.cpp 9 Nov 2006 17:03:48 -0000 1.28
@@ -16,7 +16,7 @@
//
//
-/* $Id: parser.cpp,v 1.27 2006/11/09 16:31:50 strk Exp $ */
+/* $Id: parser.cpp,v 1.28 2006/11/09 17:03:48 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -625,6 +625,7 @@
std::vector<const char*> infiles;
+ rcfile.loadFiles();
if (rcfile.verbosityLevel() > 0) {
dbglogfile.setVerbosity(rcfile.verbosityLevel());
}
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- utilities/processor.cpp 9 Nov 2006 16:31:50 -0000 1.32
+++ utilities/processor.cpp 9 Nov 2006 17:03:48 -0000 1.33
@@ -17,7 +17,7 @@
//
//
-/* $Id: processor.cpp,v 1.32 2006/11/09 16:31:50 strk Exp $ */
+/* $Id: processor.cpp,v 1.33 2006/11/09 17:03:48 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -108,6 +108,8 @@
std::vector<const char*> infiles;
+ rcfile.loadFiles();
+
if (rcfile.verbosityLevel() > 0) {
dbglogfile.setVerbosity(rcfile.verbosityLevel());
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/gnash.cpp libbase/rc.h plug...,
Sandro Santilli <=