[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp li... [relea
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp li... [release_0_7_2] |
Date: |
Thu, 09 Nov 2006 16:14:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/09 16:14:15
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&only_with_tag=release_0_7_2&r1=1.1412.2.134&r2=1.1412.2.135
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.23.2.4&r2=1.23.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.53.2.3&r2=1.53.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.2&r2=1.11.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.64.2.1&r2=1.64.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.134
retrieving revision 1.1412.2.135
diff -u -b -r1.1412.2.134 -r1.1412.2.135
--- ChangeLog 9 Nov 2006 15:31:16 -0000 1.1412.2.134
+++ ChangeLog 9 Nov 2006 16:14:15 -0000 1.1412.2.135
@@ -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.23.2.4
retrieving revision 1.23.2.5
diff -u -b -r1.23.2.4 -r1.23.2.5
--- gui/Player.cpp 8 Nov 2006 09:06:49 -0000 1.23.2.4
+++ gui/Player.cpp 9 Nov 2006 16:14:15 -0000 1.23.2.5
@@ -132,7 +132,7 @@
Player::init_logfile()
{
dbglogfile.setWriteDisk(false);
- rcfile.loadFiles();
+// rcfile.loadFiles();
// rcfile.dump();
if (rcfile.useWriteLog()) {
@@ -170,15 +170,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.53.2.3
retrieving revision 1.53.2.4
diff -u -b -r1.53.2.3 -r1.53.2.4
--- gui/gnash.cpp 6 Nov 2006 00:52:47 -0000 1.53.2.3
+++ gui/gnash.cpp 9 Nov 2006 16:14:15 -0000 1.53.2.4
@@ -20,6 +20,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"
@@ -130,6 +131,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++) {
@@ -215,6 +219,8 @@
break;
case 'r':
{
+ specified_rendering_flag=true;
+
long int render_arg = strtol(optarg, NULL, 0);
switch (render_arg) {
case 0:
@@ -272,6 +278,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.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- libbase/rc.cpp 9 Nov 2006 15:31:16 -0000 1.11.2.2
+++ libbase/rc.cpp 9 Nov 2006 16:14:15 -0000 1.11.2.3
@@ -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.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- libbase/rc.h 30 Oct 2006 14:28:47 -0000 1.7.2.1
+++ libbase/rc.h 9 Nov 2006 16:14:15 -0000 1.7.2.2
@@ -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.64.2.1
retrieving revision 1.64.2.2
diff -u -b -r1.64.2.1 -r1.64.2.2
--- plugin/plugin.cpp 30 Oct 2006 14:28:47 -0000 1.64.2.1
+++ plugin/plugin.cpp 9 Nov 2006 16:14:15 -0000 1.64.2.2
@@ -17,7 +17,7 @@
//
//
-/* $Id: plugin.cpp,v 1.64.2.1 2006/10/30 14:28:47 rsavoye Exp $ */
+/* $Id: plugin.cpp,v 1.64.2.2 2006/11/09 16:14:15 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;
- [Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp li... [release_0_7_2],
Sandro Santilli <=