[Gnash-commit] gnash ChangeLog server/gnash.h server/parser/bi...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/29 15:40:45

Modified files:
        .              : ChangeLog 
        server         : gnash.h 
        server/parser  : bitmap_character_def.h character_def.h 
                         movie_def_impl.cpp 
        server/vm      : action.cpp 

Log message:
                * server/vm/action.cpp: register_component is not the way to
                  register extensions.
                * server/parser/character_def.cpp: drop unused forward 
declaration.
                * server/parser/movie_def_impl.cpp: drop progress_callback 
related
                  stuff.
                * server/parser/bitmap_character_def.cpp: add forward 
declaration
                  dropped from gnash.h
                * server/gnash.h: drop unused global callback functions, 
unnecessary
                  forward declarations and some other useless code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6763&r2=1.6764
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/character_def.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6763
retrieving revision 1.6764
diff -u -b -r1.6763 -r1.6764
--- ChangeLog   29 May 2008 15:34:22 -0000      1.6763
+++ ChangeLog   29 May 2008 15:40:43 -0000      1.6764
@@ -1,5 +1,17 @@
 2008-05-29 Benjamin Wolsey <address@hidden>
 
+       * server/vm/action.cpp: register_component is not the way to
+         register extensions.
+       * server/parser/character_def.cpp: drop unused forward declaration.
+       * server/parser/movie_def_impl.cpp: drop progress_callback related
+         stuff.
+       * server/parser/bitmap_character_def.cpp: add forward declaration
+         dropped from gnash.h
+       * server/gnash.h: drop unused global callback functions, unnecessary
+         forward declarations and some other useless code.
+
+2008-05-29 Benjamin Wolsey <address@hidden>
+
        * server/asobj/string.cpp: last commit was the wrong version of
          string.cpp.
 

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/gnash.h      28 May 2008 08:37:13 -0000      1.123
+++ server/gnash.h      29 May 2008 15:40:44 -0000      1.124
@@ -26,8 +26,7 @@
 #include "dsodefs.h"
 
 #include <memory> // for auto_ptr
-#include <string>   // for movie_definition* 
create_movie(std::auto_ptr<tu_file>
-                                       // in, const std::string& url);
+#include <string>
 
 // FIXME: The local usage of these constants should probably be renamed in this
 // file because they conflict with definitions in the system header files. 
Luckily
@@ -36,7 +35,7 @@
 #undef INVALID
 #undef ESCAPE
 
-class tu_file; // for file_opener_callback typedef
+class tu_file;
 
 namespace gnash {
        class sprite_instance; // for fscommand_callback typedef
@@ -47,10 +46,7 @@
                class sound_handler; // for set_sound_handler
        }
 }
-// @@ forward decl to avoid including base/image.h; TODO change the
-// render_handler interface to not depend on these classes at all.
-namespace image { class image_base; class rgb; class rgba; }
-namespace jpeg { class input; }
+
 
 namespace gnash {
 
@@ -80,15 +76,6 @@
 /// Return base url
 DSOEXPORT const gnash::URL& get_base_url();
 
-/// Signature of file opener callback function
-typedef tu_file* (*file_opener_callback)(const URL& url);
-
-/// Signature of progress callback function
-typedef void (*progress_callback)(unsigned int loaded_bytes, unsigned int 
total_bytes);
-
-/// Register a callback for displaying SWF load progress.
-void    register_progress_callback(progress_callback progress_handle);
-
 /// Signature of fscommand callback function
 typedef void (*fscommand_callback)(sprite_instance* movie,
                                                const std::string& command, 
const std::string& arg);
@@ -97,40 +84,12 @@
 typedef std::string (*interfaceEventCallback)(const std::string& event,
                                               const std::string& arg);
 
-/// Use this to register gnash extension
-//
-/// WARNING: does not convert name, make sure to pass a lowercase
-///          name if SWF version is < 7 ! It seems currently no code
-///          calls this function..
-///
-///
-class as_value; // for the following typedef
-class fn_call; // for the following typedef
-typedef as_value (*as_c_function_ptr)(const fn_call& fn); // original typedef 
is in as_value.h ...
-void register_component(const std::string& name, as_c_function_ptr handler);
-
-
 // Some helpers that may or may not be compiled into your
 // version of the library, depending on platform etc.
 DSOEXPORT render_handler*   create_render_handler_xbox();
 DSOEXPORT render_handler*   create_render_handler_ogl(bool init = true);
 //DSOEXPORT render_handler* create_render_handler_cairo(void* cairohandle);
 
-/// For caching precomputed stuff.  Generally of
-/// interest to gnash_processor and programs like it.
-class cache_options
-{
-public:
-    bool    m_include_font_bitmaps;
-    
-    cache_options()
-        :
-        m_include_font_bitmaps(true)
-        {
-        }
-};
-
-
 /// Create a gnash::movie_definition from the given URL.
 //
 /// The URL can correspond to either a JPEG or SWF file.

Index: server/parser/bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/parser/bitmap_character_def.h        21 May 2008 13:24:06 -0000      
1.24
+++ server/parser/bitmap_character_def.h        29 May 2008 15:40:44 -0000      
1.25
@@ -30,6 +30,7 @@
 #include <memory> // for auto_ptr
 
 namespace image {
+       class rgba;
        class rgb;
 }
 

Index: server/parser/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/character_def.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/character_def.h       29 Apr 2008 11:29:04 -0000      1.18
+++ server/parser/character_def.h       29 May 2008 15:40:44 -0000      1.19
@@ -29,7 +29,6 @@
 
 namespace gnash {
        class character;
-       class cache_options;
        class matrix;
        class rect;
 }

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/parser/movie_def_impl.cpp    29 May 2008 08:45:56 -0000      1.110
+++ server/parser/movie_def_impl.cpp    29 May 2008 15:40:44 -0000      1.111
@@ -189,19 +189,6 @@
 
 
 //
-// progress callback stuff
-//
-progress_callback      s_progress_function = NULL;
-
-// Host calls this to register a function for progress bar handling
-// during loading movies.
-void
-register_progress_callback(progress_callback progress_handle)
-{
-    s_progress_function = progress_handle;
-}
-
-//
 // movie_def_impl
 //
 
@@ -626,12 +613,6 @@
 
 parse_tag:
 
-               if (s_progress_function != NULL)
-                {
-                       s_progress_function((boost::uint32_t)str.get_position(),
-                               _swf_end_pos);
-                }
-
                if (tag_type == SWF::END)
                 {
                        if ((unsigned int) str.get_position() != _swf_end_pos)

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/vm/action.cpp        24 May 2008 13:41:10 -0000      1.38
+++ server/vm/action.cpp        29 May 2008 15:40:45 -0000      1.39
@@ -43,13 +43,6 @@
 // action stuff
 //
 
-
-void register_component(const std::string& name, as_c_function_ptr handler)
-{
-       as_object* global = VM::get().getGlobal();
-       global->set_member(VM::get().getStringTable().find(name), handler);
-}
-
 //
 // Function/method dispatch.
 //