[Gnash-commit] gnash ChangeLog plugin/klash/klash.cpp server/a...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/21 20:13:26

Modified files:
        .              : ChangeLog 
        plugin/klash   : klash.cpp 
        server/asobj   : Makefile.am 

Log message:
                * plugin/klash/klash.cpp: fixed after movie_interface and
                  movie deprecation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1694&r2=1.1695
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -b -r1.1694 -r1.1695
--- ChangeLog   21 Nov 2006 19:26:35 -0000      1.1694
+++ ChangeLog   21 Nov 2006 20:13:26 -0000      1.1695
@@ -1,5 +1,7 @@
 2006-11-21 Sandro Santilli <address@hidden>
 
+       * plugin/klash/klash.cpp: fixed after movie_interface and
+         movie deprecation.
        * testsuite/actionscript.all/dejagnu_so_init.as:
          fix information about *which* version of Ming contains
          the bug preventing proper load of Dejagnu.swf lib.

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- plugin/klash/klash.cpp      14 Nov 2006 08:18:51 -0000      1.24
+++ plugin/klash/klash.cpp      21 Nov 2006 20:13:26 -0000      1.25
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: klash.cpp,v 1.24 2006/11/14 08:18:51 strk Exp $ */
+/* $Id: klash.cpp,v 1.25 2006/11/21 20:13:26 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,13 +40,14 @@
 
 #include "gnash.h"
 #include "log.h"
-//#include "tu_opengl.h"
 #include "utility.h"
 #include "container.h"
 #include "tu_file.h"
 #include "tu_types.h"
 #include "xmlsocket.h"
 #include "movie_definition.h"
+#include "sprite_instance.h"
+#include "movie_root.h"
 #include "URL.h"
 #include "rc.h"
 
@@ -227,7 +228,7 @@
 // 0
 
 static void
-fs_callback(gnash::movie_interface* movie, const char* command, const char* 
args)
+fs_callback(gnash::sprite_instance* movie, const char* command, const char* 
args)
 // For handling notification callbacks from ActionScript.
 {
     log_msg("fs_callback: '");
@@ -512,7 +513,7 @@
         fprintf(stderr, "error: can't create a movie from '%s'\n", infiles[0]);
         exit(1);
     }
-    gnash::movie_interface*    m = create_library_movie_inst(md);
+    gnash::sprite_instance* m = create_library_movie_inst(md);
     if (m == NULL) {
         fprintf(stderr, "error: can't create movie instance\n");
         exit(1);
@@ -560,20 +561,20 @@
         QApplication::eventLoop()->processEvents(QEventLoop::AllEvents, 3);
         switch (movie_menu_state) {
           case PLAY_MOVIE:
-              m->set_play_state(gnash::movie_interface::PLAY);
+              m->set_play_state(gnash::sprite_instance::PLAY);
               break;
               // Control-R restarts the movie
           case RESTART_MOVIE:
               m->restart();
               break;
           case STOP_MOVIE:
-              m->set_play_state(gnash::movie_interface::STOP);
+              m->set_play_state(gnash::sprite_instance::STOP);
               break; 
           case PAUSE_MOVIE:
-              if (m->get_play_state() == gnash::movie_interface::STOP) {
-                  m->set_play_state(gnash::movie_interface::PLAY);
+              if (m->get_play_state() == gnash::sprite_instance::STOP) {
+                  m->set_play_state(gnash::sprite_instance::PLAY);
               } else {
-                  m->set_play_state(gnash::movie_interface::STOP);
+                  m->set_play_state(gnash::sprite_instance::STOP);
               }
               break;
               // go backward one frame
@@ -603,10 +604,12 @@
         m = gnash::get_current_root();
         gnash::delete_unused_root();
         
-        m->set_display_viewport(0, 0, width, height);
-        m->set_background_alpha(s_background ? 1.0f : 0.05f);
+       movie_root* root = dynamic_cast<movie_root*>(m);
+       assert(root);
+        root->set_display_viewport(0, 0, width, height);
+        root->set_background_alpha(s_background ? 1.0f : 0.05f);
         
-        m->notify_mouse_state(mouse_x, mouse_y, mouse_buttons);
+        root->notify_mouse_state(mouse_x, mouse_y, mouse_buttons);
         
         m->advance(delta_t *speed_scale);
 

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/Makefile.am    14 Nov 2006 11:12:07 -0000      1.17
+++ server/asobj/Makefile.am    21 Nov 2006 20:13:26 -0000      1.18
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.17 2006/11/14 11:12:07 strk Exp $
+# $Id: Makefile.am,v 1.18 2006/11/21 20:13:26 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -39,6 +39,7 @@
        $(DMALLOC_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(LIBXML_CFLAGS) \
+       $(FFMPEG_CFLAGS) \
        $(NULL)
 
 #        $(ZLIB_CFLAGS) \
@@ -114,7 +115,8 @@
 
 libgnashasobjs_la_LIBADD = \
        $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libbase/libgnashbase.la
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(FFMPEG_LIBS)
 
 libgnashasobjs_la_LDFLAGS = -avoid-version