[Gnash-commit] gnash/server action.cpp action.h impl.h

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/09/11 14:24:52

Modified files:
        server         : action.cpp action.h impl.h 

Log message:
        loadMovie() should be compatible with Flash

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- action.cpp  28 Aug 2006 11:14:20 -0000      1.99
+++ action.cpp  11 Sep 2006 14:24:52 -0000      1.100
@@ -170,12 +170,9 @@
        s_global->set_member(name, handler);
 }
 
-#define EXTERN_MOVIE
-       
-#ifdef EXTERN_MOVIE
 void
 attach_extern_movie(const char* c_url,
-               const sprite_instance* target,
+               const movie* target,
                const movie* root_movie)
 {
        URL url(c_url);
@@ -245,14 +242,11 @@
                clip_depth);
        }
 }
-#endif // EXTERN_MOVIE
-
 
 //
 // Function/method dispatch.
 //
 
-
 as_value
 call_method(
     const as_value& method,

Index: action.h
===================================================================
RCS file: /sources/gnash/gnash/server/action.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- action.h    26 Aug 2006 13:09:53 -0000      1.41
+++ action.h    11 Sep 2006 14:24:52 -0000      1.42
@@ -280,6 +280,8 @@
        /// Returns M_INVALID_MEMBER if there's no match.
        as_standard_member      get_standard_member(const tu_stringi& name);
 
+       void attach_extern_movie(const char* c_url,     const movie* target, 
const movie* root_movie);
+
 }      // end namespace gnash
 
 

Index: impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- impl.h      26 Aug 2006 13:09:53 -0000      1.34
+++ impl.h      11 Sep 2006 14:24:52 -0000      1.35
@@ -79,7 +79,7 @@
 void save_extern_movie(movie_interface* m);
 
 
-//v for extern movies
+// for extern movies
 
 movie_interface *create_library_movie_inst(movie_definition* md);