[Gnash-commit] gnash ./ChangeLog server/ASSound.cpp server/Glo...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/07 12:19:06

Modified files:
        .              : ChangeLog 
        server         : ASSound.cpp Global.cpp Makefile.am 
                         MovieClipLoader.cpp action.cpp button.cpp 
                         font.cpp fontlib.cpp impl.cpp morph2.cpp 
                         movie_definition.h shape.cpp sound.cpp 
                         sprite_definition.cpp sprite_definition.h 
                         styles.cpp text.cpp 
Added files:
        server         : MovieClip.cpp MovieClip.h 
Removed files:
        server         : Movie.cpp Movie.h 

Log message:
        renamed Movie.{h,cpp} to MovieClip.{h,cpp}

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.266&tr2=1.267&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ASSound.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Global.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClip.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClip.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClipLoader.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/button.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/font.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/fontlib.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/morph2.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_definition.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shape.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sound.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_definition.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_definition.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/styles.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.266 gnash/ChangeLog:1.267
--- gnash/ChangeLog:1.266       Sun May  7 12:02:39 2006
+++ gnash/ChangeLog     Sun May  7 12:19:06 2006
@@ -1,5 +1,6 @@
 2006-05-07 Sandro Santilli <address@hidden>
 
+       * renamed Movie.{h,cpp} to MovieClip.{h,cpp}
        * server/Makefile.am, server/Movie.cpp, server/Movie.h,
        server/Sprite.cpp, server/Sprite.h,
        server/impl.cpp, server/impl.h,
Index: gnash/server/ASSound.cpp
diff -u gnash/server/ASSound.cpp:1.2 gnash/server/ASSound.cpp:1.3
--- gnash/server/ASSound.cpp:1.2        Sun May  7 12:02:39 2006
+++ gnash/server/ASSound.cpp    Sun May  7 12:19:06 2006
@@ -22,7 +22,6 @@
 
 #include "log.h"
 #include "ASSound.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 namespace gnash {
Index: gnash/server/Global.cpp
diff -u gnash/server/Global.cpp:1.5 gnash/server/Global.cpp:1.6
--- gnash/server/Global.cpp:1.5 Sun May  7 12:02:39 2006
+++ gnash/server/Global.cpp     Sun May  7 12:19:06 2006
@@ -36,7 +36,7 @@
 #include "Math.h"
 #include "Mouse.h"
 #include "MovieClipLoader.h"
-#include "Movie.h" // for movieclip_init
+#include "MovieClip.h" 
 #include "movie_definition.h"
 #include "NetConnection.h"
 #include "NetStream.h"
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.31 gnash/server/Makefile.am:1.32
--- gnash/server/Makefile.am:1.31       Sun May  7 12:02:39 2006
+++ gnash/server/Makefile.am    Sun May  7 12:19:06 2006
@@ -140,7 +140,7 @@
         impl.cpp         \
         morph2.cpp       \
        network.cpp      \
-       Movie.cpp        \
+       MovieClip.cpp    \
         render.cpp       \
         shape.cpp        \
        shm.cpp          \
@@ -169,7 +169,7 @@
        morph2.h        \
        morph.h         \
        MovieClipLoader.h       \
-       Movie.h         \
+       MovieClip.h             \
        movie_definition.h      \
        movie_def_impl.h        \
        movie_interface.h       \
Index: gnash/server/MovieClipLoader.cpp
diff -u gnash/server/MovieClipLoader.cpp:1.16 
gnash/server/MovieClipLoader.cpp:1.17
--- gnash/server/MovieClipLoader.cpp:1.16       Sun May  7 12:02:39 2006
+++ gnash/server/MovieClipLoader.cpp    Sun May  7 12:19:06 2006
@@ -62,7 +62,6 @@
 #endif
 #endif
 #include "MovieClipLoader.h"
-//#include "Movie.h" // for movie_definition::create_instance, to be renamed
 #include "movie_definition.h"
 #include "log.h"
 #include "tu_file.h"
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.66 gnash/server/action.cpp:1.67
--- gnash/server/action.cpp:1.66        Sun May  7 12:02:39 2006
+++ gnash/server/action.cpp     Sun May  7 12:19:06 2006
@@ -19,7 +19,6 @@
 #include "tu_random.h"
 
 #include "gstring.h"
-//#include "Movie.h" // for movie_definition::create_instance
 #include "movie_definition.h"
 #include "MovieClipLoader.h"
 #include "Function.h"
Index: gnash/server/button.cpp
diff -u gnash/server/button.cpp:1.11 gnash/server/button.cpp:1.12
--- gnash/server/button.cpp:1.11        Sun May  7 12:02:39 2006
+++ gnash/server/button.cpp     Sun May  7 12:19:06 2006
@@ -12,11 +12,10 @@
 #include "render.h"
 #include "sound.h"
 #include "stream.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 
-/*
+/** \page buttons Buttons and mouse behaviour
 
 Observations about button & mouse behavior
 
Index: gnash/server/font.cpp
diff -u gnash/server/font.cpp:1.8 gnash/server/font.cpp:1.9
--- gnash/server/font.cpp:1.8   Sun May  7 12:02:39 2006
+++ gnash/server/font.cpp       Sun May  7 12:19:06 2006
@@ -12,7 +12,6 @@
 #include "log.h"
 #include "shape.h"
 #include "tu_file.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 namespace gnash {
Index: gnash/server/fontlib.cpp
diff -u gnash/server/fontlib.cpp:1.7 gnash/server/fontlib.cpp:1.8
--- gnash/server/fontlib.cpp:1.7        Sun May  7 12:02:39 2006
+++ gnash/server/fontlib.cpp    Sun May  7 12:19:06 2006
@@ -17,7 +17,6 @@
 #include "styles.h"
 #include "tesselate.h"
 #include "render.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.28 gnash/server/impl.cpp:1.29
--- gnash/server/impl.cpp:1.28  Sun May  7 12:02:39 2006
+++ gnash/server/impl.cpp       Sun May  7 12:19:06 2006
@@ -70,7 +70,6 @@
 //#include "Sprite.h"
 #include "sprite_definition.h"
 #include "Function.h"
-//#include "Movie.h"
 #include "movie_def_impl.h"
 #include "swf.h"
 
Index: gnash/server/morph2.cpp
diff -u gnash/server/morph2.cpp:1.7 gnash/server/morph2.cpp:1.8
--- gnash/server/morph2.cpp:1.7 Sun May  7 12:02:39 2006
+++ gnash/server/morph2.cpp     Sun May  7 12:19:06 2006
@@ -8,7 +8,6 @@
 
 #include "morph2.h"
 #include "stream.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 
Index: gnash/server/movie_definition.h
diff -u gnash/server/movie_definition.h:1.1 gnash/server/movie_definition.h:1.2
--- gnash/server/movie_definition.h:1.1 Sun May  7 12:02:39 2006
+++ gnash/server/movie_definition.h     Sun May  7 12:19:06 2006
@@ -35,6 +35,26 @@
 // 
 //
 
+
+/// \page movie SWF Movies
+///
+/// SWF Movies definitions are created by reading an SWF stream.
+/// Gnash doesn't play SWF Movie definitions, but instances.
+/// So you can play the same SWF file (Movie definiton) using
+/// multiple instances.
+///
+/// A Movie definition is defined by the gnash::movie_definition class.
+/// A Movie instance is defined by the gnash::movie_interface class.
+/// 
+/// A Movie instance exposes the ActionScript
+/// Object base interface (gnash::as_object_interface),
+/// thus it can manage gnash::as_value members.
+///
+/// The implementation of SWF parsing for a Movie definition
+/// is found in gnash::movie_def_impl::read.
+///
+
+
 #ifndef GNASH_MOVIE_DEFINITION_H
 #define GNASH_MOVIE_DEFINITION_H
 
Index: gnash/server/shape.cpp
diff -u gnash/server/shape.cpp:1.14 gnash/server/shape.cpp:1.15
--- gnash/server/shape.cpp:1.14 Wed Apr 26 02:20:07 2006
+++ gnash/server/shape.cpp      Sun May  7 12:19:06 2006
@@ -13,7 +13,7 @@
 #include "render.h"
 #include "stream.h"
 #include "tesselate.h"
-#include "Movie.h"
+#include "movie_definition.h" // TODO: check if really needed
 
 #include "tu_file.h"
 
@@ -751,8 +751,10 @@
 //
 
 
-static void    read_fill_styles(std::vector<fill_style>* styles, stream* in, 
int tag_type, movie_definition* m)
-    // Read fill styles, and push them onto the given style array.
+// Read fill styles, and push them onto the given style array.
+static void
+read_fill_styles(std::vector<fill_style>* styles, stream* in,
+               int tag_type, movie_definition* m)
 {
     assert(styles);
 
@@ -775,7 +777,8 @@
 }
 
 
-static void    read_line_styles(std::vector<line_style>* styles, stream* in, 
int tag_type)
+static void
+read_line_styles(std::vector<line_style>* styles, stream* in, int tag_type)
     // Read line styles and push them onto the back of the given array.
 {
     // Get the count.
@@ -819,7 +822,9 @@
 }
 
 
-void   shape_character_def::read(stream* in, int tag_type, bool with_style, 
movie_definition* m)
+void
+shape_character_def::read(stream* in, int tag_type, bool with_style,
+       movie_definition* m)
 {
     if (with_style) {
        m_bound.read(in);
Index: gnash/server/sound.cpp
diff -u gnash/server/sound.cpp:1.4 gnash/server/sound.cpp:1.5
--- gnash/server/sound.cpp:1.4  Sun May  7 12:02:39 2006
+++ gnash/server/sound.cpp      Sun May  7 12:19:06 2006
@@ -10,7 +10,6 @@
 #include "stream.h"
 #include "impl.h"
 #include "log.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 namespace gnash {
Index: gnash/server/sprite_definition.cpp
diff -u gnash/server/sprite_definition.cpp:1.1 
gnash/server/sprite_definition.cpp:1.2
--- gnash/server/sprite_definition.cpp:1.1      Sat May  6 22:10:47 2006
+++ gnash/server/sprite_definition.cpp  Sun May  7 12:19:06 2006
@@ -46,11 +46,8 @@
 #include <pthread.h>
 #endif
 
-//#include "log.h" 
-//#include "gnash.h"
 #include "sprite_instance.h"
 #include "sprite_definition.h"
-#include "Movie.h" 
 
 #include <vector>
 #include <string>
Index: gnash/server/sprite_definition.h
diff -u gnash/server/sprite_definition.h:1.2 
gnash/server/sprite_definition.h:1.3
--- gnash/server/sprite_definition.h:1.2        Sun May  7 12:02:39 2006
+++ gnash/server/sprite_definition.h    Sun May  7 12:19:06 2006
@@ -44,9 +44,7 @@
 
 #include <vector>
 
-//#include "Movie.h"
 #include "movie_definition.h"
-//#include "dlist.h" // display_list 
 #include "stream.h"
 #include "log.h"
 
Index: gnash/server/styles.cpp
diff -u gnash/server/styles.cpp:1.8 gnash/server/styles.cpp:1.9
--- gnash/server/styles.cpp:1.8 Sun May  7 12:02:39 2006
+++ gnash/server/styles.cpp     Sun May  7 12:19:06 2006
@@ -11,7 +11,6 @@
 #include "log.h"
 #include "render.h"
 #include "stream.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 namespace gnash {
Index: gnash/server/text.cpp
diff -u gnash/server/text.cpp:1.13 gnash/server/text.cpp:1.14
--- gnash/server/text.cpp:1.13  Sun May  7 12:02:39 2006
+++ gnash/server/text.cpp       Sun May  7 12:19:06 2006
@@ -17,7 +17,6 @@
 #include "render.h"
 #include "textformat.h"
 #include "text.h"
-//#include "Movie.h"
 #include "movie_definition.h"
 
 namespace gnash {