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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/23 15:01:40

Modified files:
        .              : ChangeLog 
Added files:
        gui            : Player.h Player.cpp 

Log message:
        new class to simplify player startup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.901&r2=1.902
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -b -r1.901 -r1.902
--- ChangeLog   23 Sep 2006 11:20:55 -0000      1.901
+++ ChangeLog   23 Sep 2006 15:01:40 -0000      1.902
@@ -1,5 +1,6 @@
 2006-09-23 Sandro Santilli  <address@hidden>
 
+       * gui/Player.{h,cpp}: new class to simplify player startup.
        * gui/gnash.cpp, gui/sdl.cpp: moved parsing of -c switch from
          gnash to sdl gui.
 

Index: gui/Player.h
===================================================================
RCS file: gui/Player.h
diff -N gui/Player.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gui/Player.h        23 Sep 2006 15:01:40 -0000      1.1
@@ -0,0 +1,148 @@
+// 
+//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
+//
+
+#ifndef _PLAYER_H_
+#define _PLAYER_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+//#include "tu_config.h" // do we need this ??
+
+#include "gnash.h"
+
+#include <string>
+#include <map>
+
+// Forward declarations
+namespace gnash
+{
+       class movie_interface;
+}
+
+
+namespace gnash
+{
+
+/// This class is an attempt at simplifying the code required
+/// to simply start the flash player. The idea was to use it
+/// from the plugin so we can set callback for getUrl and fs_commands
+/// w/out the need of using FIFOs or sockets or whatever else.
+///
+class Player
+{
+public:
+
+       Player();
+
+       ~Player() {}
+
+       int run(int argc, char* argv[],
+               const char* infile, const char* url=NULL);
+
+       float setScale(float s);
+
+       // milliseconds per frame
+       void setDelay(unsigned int d) { delay=d; }
+
+       void setWidth(size_t w) { width=w; }
+       size_t getWidth() { return width; }
+
+       void setHeight(size_t h) { height=h; }
+       size_t getHeight() { return height; }
+
+       void setWindowId(unsigned long x) { windowid=x; }
+
+       void setDoLoop(bool b) { do_loop=b; }
+
+       void setDoRender(bool b) { do_render=b; }
+
+       void setDoSound(bool b) { do_sound=b; }
+
+       float setExitTimeout(float n) {
+               float old_timeout = exit_timeout;
+               exit_timeout = n;
+               return old_timeout;
+       }
+
+       int setBitDepth(int depth) {
+               int old=bit_depth;
+               bit_depth=depth;
+               return old;
+       }
+
+       void setParam(std::string& name, std::string& value) {
+               params[name] = value;
+       }
+       
+private:
+       static void setFlashVars(movie_interface& m, const std::string& varstr);
+
+       static void fs_callback(movie_interface* movie,
+                       const char* command, const char* args);
+
+       // Movie parameters (for -P)
+       std::map<std::string, std::string> params;
+
+       unsigned int bit_depth;
+
+       // the scale at which to play 
+       float scale;
+
+       unsigned int delay;
+
+       size_t width;
+
+       size_t height;
+
+       unsigned long windowid;
+
+       bool do_loop;
+
+       bool do_render;
+
+       bool do_sound;
+
+       float exit_timeout;
+};
+
+ 
+} // end of gnash namespace
+
+// end of _PLAYER_H_
+#endif

Index: gui/Player.cpp
===================================================================
RCS file: gui/Player.cpp
diff -N gui/Player.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gui/Player.cpp      23 Sep 2006 15:01:40 -0000      1.1
@@ -0,0 +1,309 @@
+// 
+//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+
+// 
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef USE_KDE
+# ifdef GUI_GTK
+#  include "gtksup.h"
+#  define GUI_CLASS GtkGui
+# elif defined(GUI_SDL)
+#  include "sdlsup.h"
+#  define GUI_CLASS SDLGui
+# endif
+#else
+# ifdef HAVE_KDE
+#  include "kdesup.h"
+#  include <qapplication.h>
+#  define GUI_CLASS KdeGui
+# else
+#  error "KDE development packages not installed!"
+# endif
+#endif
+
+
+#if defined(_WIN32) || defined(WIN32)
+# include "getopt.c"
+#endif
+
+#include "NullGui.h"
+
+#include "gnash.h"
+#include "movie_definition.h"
+#include "sprite_instance.h" // for setting FlashVars
+#include "Player.h"
+
+#include "URL.h"
+#include "rc.h"
+#include "GnashException.h"
+
+#include "log.h"
+#include <iostream>
+
+using namespace std;
+using namespace gnash;
+
+
+
+/*static private*/
+void
+Player::setFlashVars(gnash::movie_interface& m, const string& varstr)
+{
+       gnash::sprite_instance* si = m.get_root_movie();
+       assert(si);
+
+       typedef map<string, string> maptype;
+
+       maptype vars;
+       URL::parse_querystring(varstr, vars);
+
+       for (maptype::const_iterator it=vars.begin(), itEnd=vars.end();
+               it != itEnd; ++it)
+       {
+               const string& name = it->first;
+               const string& val = it->second;
+               si->set_variable(name.c_str(), val.c_str());
+       }
+}
+
+Player::Player()
+       :
+#if defined(RENDERER_CAIRO)
+       bit_depth(32),
+#else
+       bit_depth(16),
+#endif
+       scale(1.0f),
+       delay(0),
+       width(0),
+       height(0),
+       windowid(0),
+       do_loop(true),
+       do_render(true),
+       do_sound(false),
+       exit_timeout(0)
+{
+}
+
+float
+Player::setScale(float newscale)
+{
+       float oldscale=scale;
+       scale=newscale;
+       return oldscale;
+}
+
+
+int
+Player::run(int argc, char* argv[], const char* infile, const char* url)
+{
+    
+    bool background = true;
+    unsigned int  delay = 0;
+#ifdef USE_KDE
+    QApplication *app = new QApplication(argc, argv);
+#else
+    void *app=NULL;
+#endif
+
+    assert(tu_types_validate());
+   
+
+    dbglogfile.setWriteDisk(false);
+    rcfile.loadFiles();
+//    rcfile.dump();
+
+    if (rcfile.useWriteLog()) {
+        dbglogfile.setWriteDisk(true);
+    }
+    
+    if (rcfile.verbosityLevel() > 0) {
+        dbglogfile.setVerbosity(rcfile.verbosityLevel());
+    }
+    
+    if (rcfile.useActionDump()) {
+        dbglogfile.setActionDump(true);
+        dbglogfile.setVerbosity();
+    }
+    
+    if (rcfile.useParserDump()) {
+        dbglogfile.setParserDump(true);
+        dbglogfile.setVerbosity();
+    }
+    
+    if (rcfile.getTimerDelay() > 0) {
+        delay = rcfile.getTimerDelay();
+        dbglogfile << "Timer delay set to " << delay << "milliseconds" << endl;
+    }    
+
+    // Remove the logfile that's created by default, since leaving a short
+    // file is confusing.
+    if (dbglogfile.getWriteDisk() == false) {
+        dbglogfile.removeLog();
+    }
+
+    // No file name was supplied
+    assert (infile);
+
+// we don't need to register a file opener anymore, the
+// default gnash::globals::streamProvider is good enough
+#if 0
+    // strk removed this function..
+    gnash::register_file_opener_callback(file_opener);
+#endif
+    gnash::register_fscommand_callback(fs_callback);
+
+    std::auto_ptr<gnash::sound_handler>  sound;
+
+    if (do_sound) {
+#ifdef SOUND_SDL
+      sound = std::auto_ptr<gnash::sound_handler>
+        (gnash::create_sound_handler_sdl());
+      gnash::set_sound_handler(sound.get());
+#endif
+#ifdef SOUND_GST
+      sound = std::auto_ptr<gnash::sound_handler>
+        (gnash::create_sound_handler_gst());
+      gnash::set_sound_handler(sound.get());
+#endif
+    }
+
+    // Get info about the width & height of the movie.
+    int        movie_version = 0, movie_width = 0, movie_height = 0;
+    float movie_fps = 30.0f;
+
+    try {
+        gnash::get_movie_info(URL(infile), &movie_version, &movie_width,
+            &movie_height, &movie_fps, NULL, NULL);
+    } catch (const GnashException& er) {
+        fprintf(stderr, "%s\n", er.what());
+        movie_version = 0;
+    }
+
+    if (movie_version == 0) {
+      std::cerr << "Error: can't get info about " << infile << "." << endl;
+      return EXIT_FAILURE;
+    }
+
+    if (!width) {
+      width = int(movie_width * scale);
+    }
+    if (!height) {
+      height = int(movie_height * scale);
+    }
+
+    std::auto_ptr<Gui> gui_ptr;
+    if ( do_render )
+    {
+       gui_ptr.reset(new GUI_CLASS(windowid, scale, do_loop, bit_depth));
+
+    }
+    else
+    {
+       gui_ptr.reset(new NullGui);
+    }
+    Gui& gui = *gui_ptr;
+
+    gui.init(argc, &argv);
+
+    gui.createWindow(infile, width, height);
+
+    // Load the actual movie.
+    gnash::movie_definition *md;
+ 
+    try {
+      md = gnash::create_library_movie(URL(infile), url);
+    } catch (const GnashException& er) {
+      fprintf(stderr, "%s\n", er.what());
+      md = NULL;
+    }
+
+    gnash::movie_interface *m = create_library_movie_inst(md);
+    assert(m);
+
+    // Parse parameters
+    for ( map<string,string>::const_iterator it=params.begin(),
+               itEnd=params.end(); it != itEnd; ++it)
+    {
+       // todo: use a case-insensitive string type
+       if ( it->first == "flashvars" || it->first == "FlashVars" )
+       {
+               setFlashVars(*m, it->second);
+               continue;
+       }
+
+       // too much noise...
+        //log_warning("Unused parameter %s = %s",
+       //      it->first.c_str(), it->second.c_str());
+    }
+
+
+    gnash::set_current_root(m);
+
+    m->set_display_viewport(0, 0, width, height);
+    m->set_background_alpha(background ? 1.0f : 0.05f);
+
+    if (!delay) {
+      delay = (unsigned int) (1000 / movie_fps) ; // milliseconds per frame
+    }
+    gui.setCallback(delay);
+
+    if (exit_timeout) {
+      gui.setTimeout((unsigned int)(exit_timeout * 1000));
+    }
+
+    // @@ is it ok for 'app' to be NULL ?
+    // (this would be the case when USE_KDE is not defined)
+    gui.run(app);
+
+    // Clean up as much as possible, so valgrind will help find actual leaks.
+    gnash::clear();
+
+    return EXIT_SUCCESS;
+}
+
+/*static private*/
+void
+Player::fs_callback(gnash::movie_interface* movie, const char* command, const 
char* args)
+// For handling notification callbacks from ActionScript.
+{
+    log_msg("fs_callback(%p): %s %s'", (void*)movie, command, args);
+}
+