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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/02 09:31:49

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 

Log message:
        * gui/Player.cpp (Player::run): read from stdin when infile == "-"

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.980&r2=1.981
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.980
retrieving revision 1.981
diff -u -b -r1.980 -r1.981
--- ChangeLog   2 Oct 2006 09:13:21 -0000       1.980
+++ ChangeLog   2 Oct 2006 09:31:49 -0000       1.981
@@ -1,5 +1,6 @@
 2006-10-02 Sandro Santilli  <address@hidden>
 
+       * gui/Player.cpp (Player::run): read from stdin when infile == "-"
        * server/impl.cpp, server/gnash.h: exposed a create_movie(tu_file*,
          std::string&) function to let callers use arbitrary data sources
          for movie loading.

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/Player.cpp      29 Sep 2006 10:35:11 -0000      1.9
+++ gui/Player.cpp      2 Oct 2006 09:31:49 -0000       1.10
@@ -73,6 +73,7 @@
 #include "URL.h"
 #include "rc.h"
 #include "GnashException.h"
+#include "noseek_fd_adapter.h"
 
 #include "log.h"
 #include <iostream>
@@ -130,7 +131,6 @@
        return oldscale;
 }
 
-
 int
 Player::run(int argc, char* argv[], const char* infile, const char* url)
 {
@@ -194,6 +194,7 @@
     if ( _baseurl.empty() )
     {
        if ( url ) _baseurl = url;
+       else if ( ! strcmp(infile, "-") ) _baseurl = URL("./").str();
        else _baseurl = infile;
     }
     gnash::set_base_url(URL(_baseurl));
@@ -229,7 +230,20 @@
     gnash::movie_definition *md;
  
     try {
+       if ( ! strcmp(infile, "-") )
+       {
+               // Make up an url for the main movie
+               if ( ! url )
+               {
+                       url = _baseurl.c_str();
+               }
+               tu_file* in = noseek_fd_adapter::make_stream(fileno(stdin));
+               md = gnash::create_movie(in, std::string(url));
+       }
+       else
+       {
       md = gnash::create_library_movie(URL(infile), url);
+       }
     } catch (const GnashException& er) {
       fprintf(stderr, "%s\n", er.what());
       md = NULL;