[Gnash-commit] gnash ChangeLog utilities/processor.cpp [release_0_7_2]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/03 07:39:39

Modified files:
        .              : ChangeLog 
        utilities      : processor.cpp 

Log message:
        * utilities/processor.cpp: drop support for multiple input files (due
        to weakness of libserver due to unwrapped globals - namely base_url);
        properly set base url.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.53&r2=1.1412.2.54
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.1&r2=1.29.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.53
retrieving revision 1.1412.2.54
diff -u -b -r1.1412.2.53 -r1.1412.2.54
--- ChangeLog   3 Nov 2006 06:15:31 -0000       1.1412.2.53
+++ ChangeLog   3 Nov 2006 07:39:39 -0000       1.1412.2.54
@@ -1,4 +1,11 @@
-2006-11-02 Hiroyuki Ikezoe <address@hidden>
+2006-11-03 Sandro Santilli <address@hidden>
+
+       * utilities/processor.cpp: drop support for multiple
+         input files (due to weakness of libserver due to 
+         unwrapped globals - namely base_url); properly
+         set base url.
+
+2006-11-03 Hiroyuki Ikezoe <address@hidden>
 
        * backend/sound_handler_gst.cpp: fix to critical error
          exposed by playing samples/sound1.swf

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -b -r1.29.2.1 -r1.29.2.2
--- utilities/processor.cpp     30 Oct 2006 14:28:55 -0000      1.29.2.1
+++ utilities/processor.cpp     3 Nov 2006 07:39:39 -0000       1.29.2.2
@@ -17,7 +17,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.29.2.1 2006/10/30 14:28:55 rsavoye Exp $ */
+/* $Id: processor.cpp,v 1.29.2.2 2006/11/03 07:39:39 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -173,8 +173,20 @@
         
     std::vector<movie_data>    data;
 
+    if (infiles.size() > 1)
+    {
+       // this is due to set_base_url setting, only allowed once
+       fprintf(stderr, "Multiple input files not supported.\n");
+       usage(argv[0]);
+       dbglogfile.removeLog();
+       exit(1);
+    }
+
     // Play through all the movies.
     for (int i = 0, n = infiles.size(); i < n; i++) {
+
+        set_base_url(URL(infiles[i]));
+
        gnash::movie_definition*        m = play_movie(infiles[i]);
        if (m == NULL) {
            if (s_stop_on_errors) {
@@ -323,7 +335,7 @@
     printf(
        "gprocessor -- an SWF preprocessor for Gnash.\n"
        "\n"
-       "usage: %s [options] [swf files to process...]\n"
+       "usage: %s [options] <file>\n"
        "\n"
        "Preprocesses the given SWF movie files.  Optionally write preprocessed 
shape\n"
        "and font data to cache files, so the associated SWF files can be 
loaded\n"