[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog server/Sprite.cpp server/netw...
|
From: |
John Gilmore |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog server/Sprite.cpp server/netw... |
|
Date: |
Wed, 05 Apr 2006 04:15:34 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: John Gilmore <address@hidden> 06/04/05 04:15:34
Modified files:
. : ChangeLog
server : Sprite.cpp network.cpp shape.cpp
backend : gnash.cpp
plugin : player.cpp plugin.cpp
Log message:
* server/{Sprite.cpp, network.cpp, shape.cpp}: Lint.
* backend/gnash.cpp: Revise --version and --help for GNU Coding
Standards.
* plugin/player.cpp: Lint.
* plugin/plugin.cpp (PLUGIN_DESCRIPTION): It's the GNU Flash Player.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.201&tr2=1.202&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/network.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/player.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.201 gnash/ChangeLog:1.202
--- gnash/ChangeLog:1.201 Wed Apr 5 00:55:02 2006
+++ gnash/ChangeLog Wed Apr 5 04:15:33 2006
@@ -1,7 +1,12 @@
2006-04-04 John Gilmore <address@hidden>
* README: Add more basic information. Thank contributors.
- * server/xmlsocket.cpp, server/MovieClipLoader.cpp: Lint.
+ * server/{xmlsocket.cpp, MovieClipLoader.cpp, Sprite.cpp,
+ network.cpp, shape.cpp}: Lint.
+ * backend/gnash.cpp: Revise --version and --help for GNU Coding
+ Standards.
+ * plugin/player.cpp: Lint.
+ * plugin/plugin.cpp (PLUGIN_DESCRIPTION): It's the GNU Flash Player.
2006-04-04 Rob Savoye <address@hidden>
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.21 gnash/backend/gnash.cpp:1.22
--- gnash/backend/gnash.cpp:1.21 Tue Apr 4 20:42:56 2006
+++ gnash/backend/gnash.cpp Wed Apr 5 04:15:34 2006
@@ -75,7 +75,8 @@
using namespace std;
using namespace gnash;
-static void usage (const char *);
+static void usage ();
+static void version_and_copyright();
static int runThread(void *nothing);
bool gofast = false; // FIXME: this flag gets set based on
@@ -253,11 +254,13 @@
// scan for the two main long GNU options
for (c=0; c<argc; c++) {
if (strcmp("--help", argv[c]) == 0) {
- usage(argv[0]);
+ version_and_copyright();
+ printf("\n");
+ usage();
exit(0);
}
if (strcmp("--version", argv[c]) == 0) {
- cerr << "Gnash version: " << VERSION << endl;
+ version_and_copyright();
exit(0);
}
}
@@ -268,7 +271,7 @@
while ((c = getopt (argc, argv, "hvaps:cfd:m:x:r:t:b:1ewj:k:")) != -1) {
switch (c) {
case 'h':
- usage (argv[0]);
+ usage ();
break;
case 'v':
dbglogfile.setVerbosity();
@@ -365,7 +368,7 @@
// No file names were supplied
if (infiles.size() == 0) {
printf("no input files\n");
- usage(argv[0]);
+ usage();
exit(1);
}
@@ -1052,49 +1055,57 @@
}
void
-usage(const char*name)
+version_and_copyright()
+{
+ printf (
+"Gnash " VERSION "\n"
+"Copyright (C) 2006 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License. For more information, see the file named COPYING.\n"
+ );
+}
+
+
+void
+usage()
{
printf(
- "gnash -- a standalone Flash player.\n"
- "\n"
- "usage: %s [options] movie_file.swf\n"
- "\n"
- "Plays a SWF (Shockwave Flash) movie using OpenGL"
+ "usage: gnash [options] movie_file.swf\n"
"\n"
+ "Plays a SWF (Shockwave Flash) movie\n"
"options:\n"
"\n"
- " -h Print this info.\n"
+ " -h, --help Print this info.\n"
" -s <factor> Scale the movie up/down by the specified factor\n"
" -c Produce a core file instead of letting SDL trap it\n"
- " -d num Number of milli-seconds to delay in main loop\n"
-// " -a Turn antialiasing on/off. (obsolete)\n"
+ " -d num Number of milliseconds to delay in main loop\n"
" -v Be verbose; i.e. print log messages to stdout\n"
" -va Be verbose about movie Actions\n"
" -vp Be verbose about parsing the movie\n"
- " -m <bias> Specify the texture LOD bias (float, default is -1)\n"
+ " -m <bias> Specify the texture LOD bias (float, default is -1)\n"
" -f Run full speed (no sleep) and log frame rate\n"
// " -e Use SDL Event thread\n"
" -x <ID> X11 Window ID for display\n"
" -w Produce the disk based debug log\n"
" -1 Play once; exit when/if movie reaches the last frame\n"
- " -r <0|1|2> 0 disables renderering & sound (good for batch tests)\n"
+ " -r <0|1|2> 0 disables rendering & sound (good for batch tests)\n"
" 1 enables rendering & sound (default setting)\n"
" 2 enables rendering & disables sound\n"
" -t <sec> Timeout and exit after the specified number of
seconds\n"
" -b <bits> Bit depth of output window (16 or 32, default is 16)\n"
+ " --version Print gnash's version number and exit\n"
"\n"
"keys:\n"
- " CTRL-Q Quit/Exit\n"
- " CTRL-W Quit/Exit\n"
- " ESC Quit/Exit\n"
+ " CTRL-Q, CTRL-W, ESC Quit/Exit\n"
" CTRL-P Toggle Pause\n"
" CTRL-R Restart the movie\n"
" CTRL-[ or kp- Step back one frame\n"
" CTRL-] or kp+ Step forward one frame\n"
- " CTRL-A Toggle antialiasing (doesn't work)\n"
- " CTRL-T Debug. Test the set_variable() function\n"
- " CTRL-G Debug. Test the get_variable() function\n"
- " CTRL-M Debug. Test the call_method() function\n"
- " CTRL-B Toggle background color\n", name
+// " CTRL-A Toggle antialiasing (doesn't work)\n"
+// " CTRL-T Debug. Test the set_variable() function\n"
+// " CTRL-G Debug. Test the get_variable() function\n"
+// " CTRL-M Debug. Test the call_method() function\n"
+ " CTRL-B Toggle background color\n"
);
}
Index: gnash/plugin/player.cpp
diff -u gnash/plugin/player.cpp:1.11 gnash/plugin/player.cpp:1.12
--- gnash/plugin/player.cpp:1.11 Thu Mar 30 01:52:00 2006
+++ gnash/plugin/player.cpp Wed Apr 5 04:15:34 2006
@@ -118,8 +118,8 @@
#define OVERSIZE 1.0f
-static int runThread(void *nothing);
-static int doneYet = 0;
+//static int runThread(void *nothing);
+//static int doneYet = 0;
static float s_scale = 1.0f;
//static bool s_antialiased = false;
@@ -128,9 +128,9 @@
static bool s_background = true;
//static bool s_measure_performance = false;
//static bool s_event_thread = false;
-static bool s_start_waiting = false;
+//static bool s_start_waiting = false;
-static void interupt_handler (int);
+//static void interupt_handler (int);
static void
message_log(const char* message)
@@ -165,7 +165,7 @@
{
// add xt event handler#
- long event_mask =
ExposureMask|KeyPress|KeyRelease|ButtonPress|ButtonRelease;
+// long event_mask =
ExposureMask|KeyPress|KeyRelease|ButtonPress|ButtonRelease;
// Widget xtwidget;
// xtwidget = XtWindowToWidget(gxDisplay, inst->getWindow());
// XtAddEventHandler(xtwidget, event_mask, FALSE,
@@ -298,9 +298,10 @@
float exit_timeout = 0;
bool do_sound = false;
int delay = 100; // was 31
+#ifdef TEST_GRAPHIC
int retries = 0;
+#endif
float tex_lod_bias;
- struct sigaction act;
const char *infile = inst->getFilename();
@@ -410,6 +411,7 @@
// int last_logged_fps = last_ticks;
// Trap ^C so we can kill all the threads
+// struct sigaction act;
// act.sa_handler = interupt_handler;
// sigaction (SIGINT, &act, NULL);
@@ -510,6 +512,7 @@
return 0;
}
+#if 0 /* No longer used? FIXME */
static int
runThread(void *nothing)
{
@@ -571,6 +574,7 @@
return 0;
}
+#endif /* 0 */
void
playerThread(void *arg)
@@ -589,6 +593,7 @@
return;
}
+#if 0
void
interupt_handler (int sig)
{
@@ -596,6 +601,7 @@
exit(-1);
}
+#endif /* 0 */
#ifdef HAVE_GTKGLEXT
static void
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.23 gnash/plugin/plugin.cpp:1.24
--- gnash/plugin/plugin.cpp:1.23 Tue Apr 4 20:42:56 2006
+++ gnash/plugin/plugin.cpp Wed Apr 5 04:15:34 2006
@@ -46,7 +46,7 @@
// plugin version to load.
#define PLUGIN_NAME "Shockwave Flash 8.0"
#define MIME_TYPES_DESCRIPTION MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
-#define PLUGIN_DESCRIPTION "Gnash, a GPL\'d Flash Player. More details at
http://www.gnu.org/software/gnash/";
+#define PLUGIN_DESCRIPTION "Gnash, the GNU Flash Player. More details at
http://www.gnu.org/software/gnash/";
#include <GL/glx.h>
#include <GL/gl.h>
Index: gnash/server/Sprite.cpp
diff -u gnash/server/Sprite.cpp:1.19 gnash/server/Sprite.cpp:1.20
--- gnash/server/Sprite.cpp:1.19 Wed Mar 29 05:42:41 2006
+++ gnash/server/Sprite.cpp Wed Apr 5 04:15:33 2006
@@ -213,8 +213,8 @@
}
else
{
- // I'm courious about when does fn.this_ptr
- // actually has a value!
+ // I'm curious about when does fn.this_ptr
+ // actually have a value!
log_msg("-- %s: this_ptr(%p)!=target(%p) --\n",
__PRETTY_FUNCTION__,
fn.this_ptr, fn.env->get_target());
@@ -230,22 +230,22 @@
tu_string txt_name = fn.arg(0).to_string();
assert(fn.arg(1).get_type()==as_value::NUMBER);
- double txt_depth = fn.arg(1).to_number();
+ //double txt_depth = fn.arg(1).to_number();
assert(fn.arg(2).get_type()==as_value::NUMBER);
- double txt_x = fn.arg(2).to_number();
+ //double txt_x = fn.arg(2).to_number();
assert(fn.arg(3).get_type()==as_value::NUMBER);
- double txt_y = fn.arg(3).to_number();
+ //double txt_y = fn.arg(3).to_number();
assert(fn.arg(4).get_type()==as_value::NUMBER);
- double txt_width = fn.arg(4).to_number();
+ //double txt_width = fn.arg(4).to_number();
assert(fn.arg(5).get_type()==as_value::NUMBER);
- double txt_height = fn.arg(5).to_number();
+ //double txt_height = fn.arg(5).to_number();
- // sprite is oursef, we should add a new
+ // sprite is ourself, we should add a new
// member, named txt_name and being a
// TextField (text_character_def?)
//
Index: gnash/server/network.cpp
diff -u gnash/server/network.cpp:1.6 gnash/server/network.cpp:1.7
--- gnash/server/network.cpp:1.6 Thu Mar 30 19:12:53 2006
+++ gnash/server/network.cpp Wed Apr 5 04:15:34 2006
@@ -116,8 +116,8 @@
int on, type;
int retries = 0;
const struct hostent *host;
- struct in_addr *thisaddr, newaddr;
- in_addr_t nodeaddr, netaddr;
+ struct in_addr *thisaddr;
+ in_addr_t nodeaddr;
host = gethostbyname("localhost");
thisaddr = reinterpret_cast<struct in_addr *>(host->h_addr_list[0]);
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.12 gnash/server/shape.cpp:1.13
--- gnash/server/shape.cpp:1.12 Thu Mar 30 19:12:53 2006
+++ gnash/server/shape.cpp Wed Apr 5 04:15:34 2006
@@ -175,7 +175,6 @@
// x_intercept = x0 + (x1 - x0) * (y - y0) / dy;
float x_intercept_times_dy = x0 * dy + (x1 - x0) * (y - y0);
- float x_times_dy = x * dy;
// text x_intercept > x
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog server/Sprite.cpp server/netw...,
John Gilmore <=