[Gnash-commit] gnash gui/gui.cpp server/impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/17 13:32:53

Modified files:
        gui            : gui.cpp 
        server         : impl.cpp 

Log message:
        Ooops.. fixes for last two commits

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.72&r2=1.73

Patches:
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gui/gui.cpp 17 Nov 2006 13:16:59 -0000      1.47
+++ gui/gui.cpp 17 Nov 2006 13:32:53 -0000      1.48
@@ -54,7 +54,7 @@
     _height(0),
     _xscale(1.0f),
     _yscale(1.0f),
-    _depth(16)
+    _depth(16),
     _interval(0),
     _renderer(NULL),
     _redraw_flag(true)

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/impl.cpp     17 Nov 2006 13:19:43 -0000      1.72
+++ server/impl.cpp     17 Nov 2006 13:32:53 -0000      1.73
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.cpp,v 1.72 2006/11/17 13:19:43 strk Exp $ */
+/* $Id: impl.cpp,v 1.73 2006/11/17 13:32:53 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,25 +31,19 @@
 #include <pthread.h>
 #endif
 
-//#include <zlib.h>
-
 #include "tu_file.h"
 #include "utility.h"
 #include "action.h"
-//#include "button.h"
 #include "impl.h"
 #include "font.h"
 #include "fontlib.h"
 #include "log.h"
-//#include "morph2.h"
 #include "render.h"
 #include "shape.h"
-//#include "stream.h"
 #include "styles.h"
 #include "dlist.h"
 #include "timers.h"
 #include "image.h"
-//#include "jpeg.h"
 #include "zlib_adapter.h"
 #include "sprite_definition.h"
 #include "movie_def_impl.h"
@@ -398,18 +392,6 @@
        return m.release();
 }
 
-movie_definition*
-create_movie(const URL& url, const char* reset_url)
-{
-       return create_movie(const URL& url, const char* reset_url, true)
-}
-
-movie_definition*
-create_movie(tu_file* in, const std::string& url)
-{
-       return create_movie(const URL& url, url, true)
-}
-
 static movie_definition*
 create_movie(tu_file* in, const std::string& url, bool startLoaderThread)
 {
@@ -424,7 +406,11 @@
 
        if ( type == "jpeg" )
        {
-               ret = create_jpeg_movie(in, url, startLoaderThread);
+               if ( startLoaderThread == false )
+               {
+                       log_warning("Requested to keep from completely loading 
a movie, but the movie in question is a jpeg, for which we don't have the 
concept of a 'loading thread'");
+               }
+               ret = create_jpeg_movie(in, url);
        }
        else if ( type == "swf" )
        {
@@ -502,6 +488,18 @@
 
 }
 
+movie_definition*
+create_movie(const URL& url, const char* reset_url)
+{
+       return create_movie(url, reset_url, true);
+}
+
+movie_definition*
+create_movie(tu_file* in, const std::string& url)
+{
+       return create_movie(in, url, true);
+}
+
 
 bool   s_no_recurse_while_loading = false;     // @@ TODO get rid of this; 
make it the normal mode.
 
@@ -675,7 +673,7 @@
        boost::intrusive_ptr<movie_definition>  m;
        if ( s_movie_library.get(cache_label, &m) )
            {
-               log_msg(" movie already in library");
+               log_msg(" movie %s already in library", cache_label.c_str());
                // Return cached movie.
                // m->add_ref(); let caller add the ref, if needed
                return m.get();