[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/Makefile.am server/parse...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/Makefile.am server/parse... |
|
Date: |
Tue, 21 Nov 2006 08:12:01 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/11/21 08:12:01
Modified files:
. : ChangeLog
server : Makefile.am
server/parser : bitmap_character_def.h
Removed files:
server : movie.h movie_interface.h
Log message:
* server/: Makefile.am, movie.h, movie_interface.h,
server/parser/bitmap_character_def.h: removed
obsoleted movie.h and movie_interface.h files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1685&r2=1.1686
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie.h?cvsroot=gnash&r1=1.27&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_interface.h?cvsroot=gnash&r1=1.19&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1685
retrieving revision 1.1686
diff -u -b -r1.1685 -r1.1686
--- ChangeLog 21 Nov 2006 00:25:46 -0000 1.1685
+++ ChangeLog 21 Nov 2006 08:12:01 -0000 1.1686
@@ -1,5 +1,11 @@
2006-11-20 Sandro Santilli <address@hidden>
+ * server/: Makefile.am, movie.h, movie_interface.h,
+ server/parser/bitmap_character_def.h: removed
+ obsoleted movie.h and movie_interface.h files.
+
+2006-11-20 Sandro Santilli <address@hidden>
+
* gui/Player.cpp, gui/Player.h, gui/gui.cpp,
gui/gui.h, server/action.cpp, server/action.h,
server/as_object.h, server/button_character_instance.cpp,
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/Makefile.am 14 Nov 2006 11:12:07 -0000 1.87
+++ server/Makefile.am 21 Nov 2006 08:12:01 -0000 1.88
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.87 2006/11/14 11:12:07 strk Exp $
+# $Id: Makefile.am,v 1.88 2006/11/21 08:12:01 strk Exp $
AUTOMAKE_OPTIONS =
@@ -118,8 +118,6 @@
Global.h \
gnash.h \
impl.h \
- movie.h \
- movie_interface.h \
movie_root.h \
Property.h \
PropertyList.h \
Index: server/parser/bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/bitmap_character_def.h 11 Nov 2006 22:44:54 -0000
1.11
+++ server/parser/bitmap_character_def.h 21 Nov 2006 08:12:01 -0000
1.12
@@ -32,7 +32,6 @@
#include "container.h"
#include "utility.h"
#include "smart_ptr.h"
-//#include "movie_interface.h"
#include <cstdarg>
#include <cassert>
Index: server/movie.h
===================================================================
RCS file: server/movie.h
diff -N server/movie.h
--- server/movie.h 21 Nov 2006 00:25:46 -0000 1.27
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,485 +0,0 @@
-//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-//
-//
-//
-
-#ifndef GNASH_MOVIE_H
-#define GNASH_MOVIE_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gnash.h"
-#include "types.h"
-#include "log.h"
-#include "container.h"
-#include "utility.h"
-#include "smart_ptr.h"
-#include "movie_interface.h" // for inheritance
-#include "matrix.h" // for return of get_world_matrix
-
-#include <cstdarg>
-#include <cassert>
-
-namespace gnash {
-
-class movie_root;
-class swf_event;
-class event_id;
-
-#if 0
-
-/// \brief
-/// @@@ To be obsoleted. This class is only confusing.
-class movie : public movie_interface
-{
-public:
- virtual bool can_handle_mouse_event()
- {
- return false;
- }
-
- virtual void set_extern_movie(movie_interface* /* m */)
- {
- }
-
- virtual movie_interface *get_extern_movie()
- {
- return NULL;
- }
-
- virtual movie_definition *get_movie_definition()
- {
- return NULL;
- }
-
- virtual movie_root *get_root()
- {
- return NULL;
- }
-
- virtual movie_interface *get_root_interface()
- {
- return NULL;
- }
-
- virtual sprite_instance *get_root_movie()
- {
- return NULL;
- }
-
- virtual float get_pixel_scale() const
- {
- return 1.0f;
- }
-
- virtual character *get_character(int /* id */)
- {
- return NULL;
- }
-
- virtual matrix get_world_matrix() const
- {
- return matrix::identity;
- }
-
- virtual cxform get_world_cxform() const
- {
- return cxform::identity;
- }
-
- //
- // display-list management.
- //
-
- virtual execute_tag *find_previous_replace_or_add_tag(
- int /* current_frame */,
- int /* depth */,
- int /* id */)
- {
- return NULL;
- }
-
- virtual character* add_display_object(
- uint16_t /* character_id */ ,
- const char* /* name */ ,
- const std::vector<swf_event*>& /* event_handlers */ ,
- uint16_t /* depth */ ,
- bool /* replace_if_depth_is_occupied */ ,
- const cxform& /* color_transform */ ,
- const matrix& /* mat */ ,
- float /* ratio */ ,
- uint16_t /* clip_depth */)
- {
- return NULL;
- }
-
- virtual void move_display_object(
- uint16_t /* depth */ ,
- bool /* use_cxform */ ,
- const cxform& /* color_transform */ ,
- bool /* use_matrix */ ,
- const matrix& /* mat */ ,
- float /* ratio */ ,
- uint16_t /* clip_depth */ )
- {
- }
-
- virtual void replace_display_object(
- uint16_t /* character_id */ ,
- const char* /* name */ ,
- uint16_t /* depth */ ,
- bool /* use_cxform */ ,
- const cxform& /* color_transform */ ,
- bool /* use_matrix */ ,
- const matrix& /* mat */ ,
- float /* ratio */ ,
- uint16_t /* clip_depth */ )
- {
- }
-
- virtual void replace_display_object(
- character* /* ch */ ,
- const char* /* name */ ,
- uint16_t /* depth */ ,
- bool /* use_cxform */ ,
- const cxform& /* color_transform */ ,
- bool /* use_matrix */ ,
- const matrix& /* mat */ ,
- float /* ratio */ ,
- uint16_t /* clip_depth */ )
- {
- }
-
- virtual void remove_display_object(uint16_t /*depth*/, int /*id*/)
- {
- }
-
- virtual void set_background_color(const rgba& /*color*/)
- {
- }
-
- virtual void set_background_alpha(float /*alpha*/)
- {
- }
-
- virtual float get_background_alpha() const
- {
- return 1.0f;
- }
-
- virtual void set_display_viewport(int /*x0*/, int /*y0*/,
- int /*width*/, int /*height*/)
- {
- }
-
- virtual void add_action_buffer(action_buffer* /*a*/)
- {
- assert(0);
- }
-
- virtual void goto_frame(size_t /*target_frame_number*/)
- {
- assert(0);
- }
-
- virtual bool goto_labeled_frame(const char* /*label*/)
- {
- assert(0);
- return false;
- }
-
- virtual void set_play_state(play_state /*s*/)
- {
- }
-
- virtual play_state get_play_state() const
- {
- assert(0);
- return STOP;
- }
-
- // derived from movie_interface, see dox in movie_interface.h
- virtual bool notify_mouse_moved(int /*x*/, int /*y*/)
- {
-// GNASH_REPORT_FUNCTION;
- return false; // guess it's going to be overrided anyway
- }
-
- // derived from movie_interface, see dox in movie_interface.h
- virtual bool notify_mouse_clicked(bool /*mouse_pressed*/, int /*mask*/)
- {
-// GNASH_REPORT_FUNCTION;
- return false; // guess it's going to be overrided anyway
- }
-
- /// \brief
- /// The host app uses this to tell the movie where the
- /// user's mouse pointer is.
- virtual void notify_mouse_state(int /*x*/, int /*y*/, int /*buttons*/)
- {
-// GNASH_REPORT_FUNCTION;
- }
-
- /// \brief
- /// Use this to retrieve the last state of the mouse, as set via
- /// notify_mouse_state().
- virtual void get_mouse_state(int* /*x*/, int* /*y*/, int* /*buttons*/)
- {
- assert(0);
- }
-
- virtual void get_drag_state(drag_state* /* st */)
- {
- assert(0);
- // *st = drag_state();
- }
-
- virtual void set_drag_state(const drag_state& /* st */ )
- {
- assert(0);
- }
-
- virtual void stop_drag()
- {
- assert(0);
- }
-
- // External
- virtual void set_variable(const char* /* path_to_var */,
- const char* /* new_value */)
- {
- assert(0);
- }
-
- // External
- virtual void set_variable(const char* /* path_to_var */,
- const wchar_t* /* new_value */)
- {
- assert(0);
- }
-
- // External
- virtual const char* get_variable(const char* /* path_to_var */ ) const
- {
- assert(0);
- return "";
- }
-
- virtual void * get_userdata()
- {
- assert(0);
- return NULL;
- }
-
- virtual void set_userdata(void *)
- {
- assert(0);
- }
-
- // External
- virtual bool has_looped() const
- {
- // @@ why true ? shouldn't we assert(0) instead ?
- return true;
- }
-
-
- //
- // Mouse/Button interface.
- //
-
- virtual movie* get_topmost_mouse_entity(float /* x */, float /* y */)
- {
- return NULL;
- }
-
- virtual bool get_track_as_menu() const
- {
- return false;
- }
-
- virtual void on_button_event(const event_id& id)
- {
- on_event(id);
- }
-
-
- //
- // ActionScript.
- //
-
-
- /// ActionScript event handler. Returns true if a handler was called.
- //
- /// Must be overridden or will always return false.
- ///
- virtual bool on_event(const event_id& /* id */)
- {
- return false;
- }
-
- virtual void get_url(const char* /* url */)
- {
-// GNASH_REPORT_FUNCTION;
- }
-
-
- int add_interval_timer(void* /* timer */)
- {
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
- return -1; // ???
- }
-
- void clear_interval_timer(int /* x */)
- {
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
- }
-
- virtual void do_something(void* /* timer */)
- {
- log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
- }
-
- /// \brief
- /// Special event handler; sprites also execute their frame1
- /// actions on this event.
- //
- ///
-
-// virtual void on_event_load()
-// {
-// on_event(event_id::LOAD);
-// }
-
-#if 0
- // as_object_interface stuff
- virtual void set_member(
- const tu_stringi& /* name */,
- const as_value& /* val */ )
- {
- assert(0);
- }
-
- virtual bool get_member(
- const tu_stringi& /* name */,
- as_value* /* val */ )
- {
- assert(0);
- return false;
- }
-#endif
-
-
- virtual void call_frame_actions(const as_value& /* frame_spec */)
- {
- assert(0);
- }
-
- virtual float get_timer() const
- {
- return 0.0f;
- }
-
- virtual movie* to_movie()
- {
- return this;
- }
-
-#if 0
- virtual void clone_display_object(
- const std::string& /* name */,
- const std::string& /* newname */,
- uint16_t /* depth */ )
- {
- assert(0);
- }
-#endif
-
- virtual void remove_display_object(const tu_string& /* name */)
- {
- assert(0);
- }
-
- // Forward vararg call to version taking va_list.
- virtual const char* call_method(
- const char* method_name,
- const char* method_arg_fmt, ...)
- {
- va_list args;
- va_start(args, method_arg_fmt);
- const char* result = call_method_args(method_name, method_arg_fmt,
args);
- va_end(args);
-
- return result;
- }
-
- /// Override this if you implement call_method.
- virtual const char* call_method_args(
- const char* /* method_name */,
- const char* /* method_arg_fmt */,
- va_list /* args */)
- {
- assert(0);
- return NULL;
- }
-
- virtual void execute_frame_tags(
- size_t /* frame */, bool /* state_only = false */)
- {
- }
-
- // External.
- virtual void attach_display_callback(
- const char* /* path_to_object */,
- void (* /*callback*/)(void*),
- void* /* user_ptr */)
- {
- assert(0);
- }
-
- // Override me to provide this functionality.
- virtual void set_display_callback(
- void (* /*callback*/ )(void*),
- void* /* user_ptr */)
- {
- }
-
- // Set the current m_sound_stream_id - override to provide this
- virtual void set_sound_stream_id(int /*id*/){ }
-
- // Get the current m_sound_stream_id - override to provide this
- virtual int get_sound_stream_id() { return -1;}
-
-
-};
-
-#endif
-
-
-} // end namespace gnash
-
-
-#endif // GNASH_MOVIE_H
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
Index: server/movie_interface.h
===================================================================
RCS file: server/movie_interface.h
diff -N server/movie_interface.h
--- server/movie_interface.h 21 Nov 2006 00:25:46 -0000 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,226 +0,0 @@
-//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-//
-//
-
-/* $Id: movie_interface.h,v 1.19 2006/11/21 00:25:46 strk Exp $ */
-
-
-#ifndef GNASH_MOVIE_INTERFACE_H
-#define GNASH_MOVIE_INTERFACE_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include <cctype> // for poxy wchar_t
-#include <cstdarg> // for va_list arg to
movie_interface::call_method_args()
-
-#include "as_object.h" // for inheritance
-#include "rect.h"
-
-// Forward declarations
-namespace gnash {
- class sprite_instance;
-}
-
-namespace gnash {
-
-#if 0
-
-/// An independent stateful live movie. (should be movie_instance?)
-//
-/// This is the client program's interface to an instance of a
-/// movie.
-///
-class movie_interface : public as_object
-{
-
-public:
-
- movie_interface()
- :
- as_object()
- {}
-
- virtual movie_definition* get_movie_definition() = 0;
-
- /// Frame counts in this API are 0-based (unlike ActionScript)
- virtual size_t get_current_frame() const = 0;
- virtual bool has_looped() const = 0;
-
- virtual void restart() = 0;
- virtual void advance(float delta_time) = 0;
- virtual void goto_frame(size_t frame_number) = 0;
- /// Returns true if labeled frame is found.
- virtual bool goto_labeled_frame(const char* label) = 0;
- virtual void display() = 0;
-
- virtual void set_play_state(play_state s) = 0;
- virtual play_state get_play_state() const = 0;
-
- virtual void set_background_color(const rgba& bg_color) = 0;
-
- /// Set to 0 if you don't want the movie to render its
- /// background at all. 1 == full opacity.
- virtual void set_background_alpha(float alpha) = 0;
- virtual float get_background_alpha() const = 0;
-
- /// move/scale the movie...
- virtual void set_display_viewport(int x0, int y0, int w, int h) = 0;
-
- /// \brief
- /// The host app can use this to tell the movie when
- /// user's mouse pointer has moved.
- //
- /// Coordinates are in pixels.
- ///
- /// This function should return TRUE iff any action triggered
- /// by the event requires redraw, see \ref events_handling for
- /// more info.
- ///
- virtual bool notify_mouse_moved(int x, int y) = 0;
-
- /// \brief
- /// The host app can use this to tell the movie when the
- /// user clicked or released the mouse button.
- //
- /// @param mouse_pressed
- /// true if the mouse has been pressed, false if released
- ///
- /// @param mask
- /// ???
- ///
- /// This function should return TRUE iff any action triggered
- /// by the event requires redraw, see \ref events_handling for
- /// more info.
- ///
- virtual bool notify_mouse_clicked(bool mouse_pressed, int mask) = 0;
-
- virtual void notify_mouse_state(int x, int y, int buttons) = 0;
-
- /// Set an ActionScript variable within this movie.
- /// You can use this to set the value of text fields,
- /// ordinary variables, or properties of characters
- /// within the script.
- ///
- /// This version accepts UTF-8
- virtual void set_variable(const char* path_to_var, const char*
new_value) = 0;
- /// This version accepts UCS-2 or UCS-4, depending on sizeof(wchar_t)
- virtual void set_variable(const char* path_to_var, const wchar_t*
new_value) = 0;
- // @@ do we want versions that take a number?
-
- /// Get the value of an ActionScript variable.
- ///
- /// Value is ephemeral & not thread safe!!! Use it or
- /// copy it immediately.
- ///
- /// Returns UTF-8
- virtual const char* get_variable(const char* path_to_var) const = 0;
- // @@ do we want a version that returns a number?
-
- /// ActionScript method call. Return value points to a
- /// static string buffer with the result; caller should
- /// use the value immediately before making more calls
- /// to gnash. NOT THREAD SAFE!!!
- ///
- /// method_name is the name of the method (possibly namespaced).
- ///
- /// method_arg_fmt is a printf-style declaration of
- /// the method call, where the arguments are
- /// represented by { %d, %s, %f, %ls }, followed by the
- /// vararg list of actual arguments.
- ///
- /// E.g.
- ///
- /// m->call_method("path.to.method_name", "%d, %s, %f", i, "hello",
2.7f);
- ///
- /// The format args are a small subset of printf, namely:
- ///
- /// %d -- integer arg
- /// %s -- 0-terminated char* string arg
- /// %ls -- 0-terminated wchar_t* string arg
- /// %f -- float/double arg
- ///
- /// Whitespace and commas in the format string are ignored.
- ///
- /// This is not an ActionScript language parser, it
- /// doesn't recognize expressions or anything tricky.
-#ifdef __GNUC__
- // use the following to catch errors: (only with gcc)
- virtual const char* call_method(const char* method_name, const
char* method_arg_fmt, ...)
- __attribute__((format (printf, 3, 4))) = 0; // "this" is an
implied param, so fmt is 3 and ... is 4!
-#else // not __GNUC__
- virtual const char* call_method(const char* method_name, const
char* method_arg_fmt, ...) = 0;
-#endif // not __GNUC__
- virtual const char* call_method_args(const char* method_name, const
char* method_arg_fmt, va_list args) = 0;
-
-
- /// Make the movie visible/invisible.
- //
- /// An invisible
- /// movie does not advance and does not render.
- virtual void set_visible(bool visible) = 0;
-
- /// Return visibility status.
- virtual bool get_visible() const = 0;
-
- /// Get userdata, that's useful for the fs_command handler.
- virtual void *get_userdata() = 0;
-
- /// Set userdata, that's useful for the fs_command handler.
- virtual void set_userdata(void *) = 0;
-
- /// Display callbacks, for client rendering.
- //
- /// Callback is called after rendering the object
- /// it's attached to.
- ///
- /// Attach NULL to disable the callback.
- virtual void attach_display_callback(const char* path_to_object,
void (*callback)(void* user_ptr), void* user_ptr) = 0;
-
- virtual void get_url(const char *url) = 0;
- virtual int add_interval_timer(void *timer) = 0;
- virtual void clear_interval_timer(int x) = 0;
-
- /// for external movies
- virtual sprite_instance* get_root_movie() = 0;
-
- /// This method must be called whenever the visual aspect of this
- /// character/movie did change.
- /// VERY IMPORTANT!! This function *must* be called *before* the changes are
- /// applied!
- /// TODO: move to character class
- /// Return true if the mouse pointer is over an active entity
- //
- /// @@ shouldn't these be globals instead ? (togheter with
notify_mouse_moved and notify_mouse_clicked)
- virtual bool isMouseOverActiveEntity() const { return false; }
-
-};
-
-#endif
-
-} // namespace gnash
-
-#endif // GNASH_MOVIE_INTERFACE_H
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/Makefile.am server/parse...,
Sandro Santilli <=