[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/19 10:57:32

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp as_environment.h 

Log message:
                * server/as_environment.{cpp,h} (get_version):
                  simplified and clarified dox.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1966&r2=1.1967
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -b -r1.1966 -r1.1967
--- ChangeLog   18 Dec 2006 20:51:01 -0000      1.1966
+++ ChangeLog   19 Dec 2006 10:57:32 -0000      1.1967
@@ -1,3 +1,8 @@
+2006-12-19 Sandro Santilli <address@hidden>
+
+       * server/as_environment.{cpp,h} (get_version):
+         simplified and clarified dox.
+
 2006-12-18  Rob Savoye  <address@hidden>
 
        * gui/Player.h, Player.cpp: Start adding support for playing

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/as_environment.cpp   18 Dec 2006 15:51:35 -0000      1.43
+++ server/as_environment.cpp   19 Dec 2006 10:57:32 -0000      1.44
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.43 2006/12/18 15:51:35 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.44 2006/12/19 10:57:32 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -522,12 +522,7 @@
 int
 as_environment::get_version() const
 {
-       assert(m_target);
-       sprite_instance* si=m_target->get_root_movie();
-       assert(si);
-       movie_definition* md=si->get_movie_definition();
-       assert(md);
-       return md->get_version();
+       return VM::get().getSWFVersion();
 }
 
 void

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/as_environment.h     15 Dec 2006 00:06:02 -0000      1.32
+++ server/as_environment.h     19 Dec 2006 10:57:32 -0000      1.33
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: as_environment.h,v 1.32 2006/12/15 00:06:02 strk Exp $ */
+/* $Id: as_environment.h,v 1.33 2006/12/19 10:57:32 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -265,10 +265,9 @@
 
        /// Return the SWF version we're running for.
        //
-       /// TODO: check what to return when playing multiple
-       /// movies with different versions: should we always
-       /// return version of the topmost (first-loaded) movie
-       /// or of the target (as I think we're doing now) ?
+       /// NOTE: this is the version encoded in the first loaded
+       ///       movie, and cannot be changed during play even if
+       ///       replacing the root movie with an externally loaded one.
        ///
        int get_version() const;