[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/action.cpp server/button...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/action.cpp server/button... |
|
Date: |
Sat, 24 Jun 2006 17:56:36 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/06/24 17:56:36
Modified files:
. : ChangeLog
server : action.cpp button.cpp character.h
character_def.h execute_tag.h movie.h
movie_def_impl.h movie_definition.h
movie_root.h sprite_definition.h
server/swf : tag_loaders.cpp
Log message:
changed movie_definition::add_init_action() signature to drop unused
sprite_id parameter; removed compiler warnings about unused parameters.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.429&r2=1.430
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character_def.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_def_impl.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_definition.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_definition.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -b -r1.429 -r1.430
--- ChangeLog 24 Jun 2006 16:04:06 -0000 1.429
+++ ChangeLog 24 Jun 2006 17:56:35 -0000 1.430
@@ -1,12 +1,18 @@
2006-06-24 Sandro Santilli <address@hidden>
+ * server/movie_def_impl.h, server/movie_definition.h,
+ server/sprite_definition.h: changed add_init_action()
+ signature to drop unused sprite_id parameter.
* server/Boolean.cpp, server/Camera.cpp, server/Color.cpp,
server/ContextMenu.cpp, server/CustomActions.cpp
server/Date.cpp, server/Error.cpp, server/ASSound.cpp,
server/Key.cpp, server/LoadVars.cpp, server/LocalConnection.cpp,
server/Microphone.cpp, server/Mouse.cpp, server/NetStream.cpp,
server/Selection.cpp, server/SharedObject.cpp, server/Stage.cpp,
- server/System.cpp, server/TextSnapshot.cpp, server/Video.cpp:
+ server/System.cpp, server/TextSnapshot.cpp, server/Video.cpp,
+ server/action.cpp, server/button.cpp, server/character.h,
+ server/character_def.h, server/execute_tag.h, server/movie.h,
+ server/movie_root.h, server/swf/tag_loaders.cpp:
removed unused parameter warnings.
2006-06-22 Sandro Santilli <address@hidden>
Index: server/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/action.cpp 21 Jun 2006 23:06:41 -0000 1.88
+++ server/action.cpp 24 Jun 2006 17:56:35 -0000 1.89
@@ -483,7 +483,7 @@
void
-event_test(const fn_call& fn)
+event_test(const fn_call& /*fn*/)
{
log_msg("FIXME: %s\n", __FUNCTION__);
}
Index: server/button.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/button.cpp 7 Jun 2006 03:03:21 -0000 1.14
+++ server/button.cpp 24 Jun 2006 17:56:36 -0000 1.15
@@ -779,8 +779,9 @@
// button_record
//
- bool button_record::read(stream* in, int tag_type, movie_definition*
m)
// Return true if we read a record; false if this is a null record.
+ bool button_record::read(stream* in, int tag_type,
+ movie_definition* /*m*/)
{
int flags = in->read_u8();
if (flags == 0)
Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/character.h 19 Jun 2006 14:39:48 -0000 1.3
+++ server/character.h 24 Jun 2006 17:56:36 -0000 1.4
@@ -59,6 +59,7 @@
/// Character is a live, stateful instance of a character_def.
//
/// It represents a single active element in a movie.
+/// Inheritance from movie is an horrible truth!
///
class character : public movie
{
@@ -131,7 +132,7 @@
// is to do "text_character.text = whatever", via
// set_member().
virtual const char* get_text_name() const { return ""; }
- virtual void set_text_value(const char* new_text) { assert(0); }
+ virtual void set_text_value(const char* /*new_text*/) { assert(0); }
virtual matrix get_world_matrix() const
// Get our concatenated matrix (all our ancestor transforms, times our
matrix). Maps
@@ -166,6 +167,7 @@
{
return m_event_handlers.get(id, result);
}
+
void set_event_handler(event_id id, const as_value& method)
{
m_event_handlers[id] = method;
@@ -186,13 +188,21 @@
virtual int get_current_frame() const { assert(0); return 0; }
virtual bool has_looped() const { assert(0); return false; }
virtual void restart() { /*assert(0);*/ }
- virtual void advance(float delta_time) {
+
+ virtual void advance(float /*delta_time*/)
+ {
// printf("%s:\n", __PRETTY_FUNCTION__); // FIXME:
} // for buttons and sprites
- virtual void goto_frame(int target_frame) {}
+
+ virtual void goto_frame(int /*target_frame*/) {}
+
virtual bool get_accept_anim_moves() const { return true; }
- virtual void get_drag_state(drag_state* st) { assert(m_parent);
m_parent->get_drag_state(st); }
+ virtual void get_drag_state(drag_state* st)
+ {
+ assert(m_parent);
+ m_parent->get_drag_state(st);
+ }
virtual void set_visible(bool visible) { m_visible = visible; }
virtual bool get_visible() const { return m_visible; }
Index: server/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/character_def.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/character_def.h 8 May 2006 13:59:07 -0000 1.2
+++ server/character_def.h 24 Jun 2006 17:56:36 -0000 1.3
@@ -66,10 +66,24 @@
virtual ~character_def() {}
- virtual void display(character* instance_info) {}
- virtual bool point_test_local(float x, float y) { return false; }
- virtual float get_height_local() { return 0.0f; }
- virtual float get_width_local() { return 0.0f; }
+ virtual void display(character* /*instance_info*/)
+ {
+ }
+
+ virtual bool point_test_local(float /*x*/, float /*y*/)
+ {
+ return false;
+ }
+
+ virtual float get_height_local()
+ {
+ return 0.0f;
+ }
+
+ virtual float get_width_local()
+ {
+ return 0.0f;
+ }
/// Should stick the result in a smart_ptr immediately.
//
@@ -78,14 +92,23 @@
virtual character* create_character_instance(movie* parent, int id);
// From resource interface.
- virtual character_def* cast_to_character_def() { return this; }
+ virtual character_def* cast_to_character_def()
+ {
+ return this;
+ }
//
// Caching.
//
- virtual void output_cached_data(tu_file* out, const cache_options&
options) {}
- virtual void input_cached_data(tu_file* in) {}
+ virtual void output_cached_data(tu_file* /*out*/,
+ const cache_options& /*options*/)
+ {
+ }
+
+ virtual void input_cached_data(tu_file* /*in*/)
+ {
+ }
};
Index: server/execute_tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/execute_tag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/execute_tag.h 9 May 2006 15:34:16 -0000 1.1
+++ server/execute_tag.h 24 Jun 2006 17:56:36 -0000 1.2
@@ -57,13 +57,32 @@
///
struct execute_tag
{
- virtual ~execute_tag() {}
- virtual void execute(movie* m) {}
- virtual void execute_state(movie* m) {}
- virtual void execute_state_reverse(movie* m, int frame) {
execute_state(m); }
+ virtual ~execute_tag()
+ {
+ }
+
+ virtual void execute(movie* /*m*/)
+ {
+ }
+
+ virtual void execute_state(movie* /*m*/)
+ {
+ }
+
+ // Is the 'frame' arg is really needed ?
+ virtual void execute_state_reverse(movie* m, int frame)
+ {
+ execute_state(m);
+ }
+
virtual bool is_remove_tag() const { return false; }
+
virtual bool is_action_tag() const { return false; }
- virtual uint32 get_depth_id_of_replace_or_add_tag() const { return
static_cast<uint32>(-1); }
+
+ virtual uint32 get_depth_id_of_replace_or_add_tag() const
+ {
+ return static_cast<uint32>(-1);
+ }
};
Index: server/movie.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/movie.h 14 Jun 2006 13:02:50 -0000 1.9
+++ server/movie.h 24 Jun 2006 17:56:36 -0000 1.10
@@ -464,7 +464,7 @@
// External.
virtual void attach_display_callback(
const char* /* path_to_object */,
- void (*callback)(void*),
+ void (* /*callback*/)(void*),
void* /* user_ptr */)
{
assert(0);
Index: server/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_def_impl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/movie_def_impl.h 19 Jun 2006 16:10:48 -0000 1.9
+++ server/movie_def_impl.h 24 Jun 2006 17:56:36 -0000 1.10
@@ -349,7 +349,8 @@
/// currently-loading frame for the first time.
///
/// @@ AFAIK, the sprite_id is totally pointless -- correct?
- void add_init_action(int sprite_id, execute_tag* e)
+ //void add_init_action(int sprite_id, execute_tag* e)
+ void add_init_action(execute_tag* e)
{
assert(e);
m_init_action_list[m_loading_frame].push_back(e);
Index: server/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_definition.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/movie_definition.h 9 May 2006 17:43:38 -0000 1.4
+++ server/movie_definition.h 24 Jun 2006 17:56:36 -0000 1.5
@@ -189,24 +189,49 @@
virtual bool get_labeled_frame(const char* label, int* frame_number)
= 0;
+ //
// For use during creation.
+ //
+
virtual int get_loading_frame() const = 0;
+
virtual void add_character(int id, character_def* ch) = 0;
+
virtual void add_font(int id, font* ch) = 0;
+
virtual font* get_font(int id) = 0;
+
virtual void add_execute_tag(execute_tag* c) = 0;
- virtual void add_init_action(int sprite_id, execute_tag* c) = 0;
+
+ // sprite_id was useless
+ //virtual void add_init_action(int sprite_id, execute_tag* c) = 0;
+ virtual void add_init_action(execute_tag* c) = 0;
+
virtual void add_frame_name(const char* name) = 0;
+
virtual void set_jpeg_loader(jpeg::input* j_in) = 0;
+
virtual jpeg::input* get_jpeg_loader() = 0;
- virtual bitmap_character_def* get_bitmap_character(int character_id)
= 0;
- virtual void add_bitmap_character(int character_id,
bitmap_character_def* ch) = 0;
+
+ virtual bitmap_character_def* get_bitmap_character(int character_id)=0;
+
+ virtual void add_bitmap_character(int character_id,
+ bitmap_character_def* ch) = 0;
+
virtual sound_sample* get_sound_sample(int character_id) = 0;
+
virtual void add_sound_sample(int character_id, sound_sample* sam) =
0;
- virtual void export_resource(const tu_string& symbol, resource* res)
= 0;
- virtual void add_import(const char* source_url, int id, const char*
symbol_name) = 0;
+
+ virtual void export_resource(const tu_string& symbol,
+ resource* res) = 0;
+
+ virtual void add_import(const char* source_url, int id,
+ const char* symbol_name) = 0;
+
virtual void add_bitmap_info(bitmap_info* ch) = 0;
+ // ...
+
virtual create_bitmaps_flag get_create_bitmaps() const = 0;
virtual create_font_shapes_flag get_create_font_shapes() const = 0;
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/movie_root.h 14 Jun 2006 13:02:50 -0000 1.3
+++ server/movie_root.h 24 Jun 2006 17:56:36 -0000 1.4
@@ -89,11 +89,18 @@
~movie_root();
- /// @@ should these delegate to m_movie? Probably...
- virtual void set_member(const tu_stringi& name,
- const as_value& val) {}
- virtual bool get_member(const tu_stringi& name,
- as_value* val) { return false; }
+ /// @@ should these delegate to m_movie?
+ virtual void set_member(
+ const tu_stringi& /*name*/,
+ const as_value& /*val*/)
+ {
+ }
+
+ virtual bool get_member(const tu_stringi& /*name*/,
+ as_value* /*val*/)
+ {
+ return false;
+ }
/// @@ should this return m_movie.get_ptr()?
virtual movie* to_movie() { assert(0); return 0; }
Index: server/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_definition.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/sprite_definition.h 9 May 2006 17:43:38 -0000 1.7
+++ server/sprite_definition.h 24 Jun 2006 17:56:36 -0000 1.8
@@ -103,27 +103,87 @@
virtual int get_loading_frame() const { return m_loading_frame; }
virtual int get_version() const { return
m_movie_def->get_version(); }
- virtual void add_font(int id, font* ch) { log_error("add_font tag
appears in sprite tags!\n"); }
+ virtual void add_font(int /*id*/, font* /*ch*/)
+ {
+ log_error("add_font tag appears in sprite tags! "
+ "Malformed SWF?\n");
+ }
+
virtual font* get_font(int id) { return m_movie_def->get_font(id); }
- virtual void set_jpeg_loader(jpeg::input* j_in) { assert(0); }
- virtual jpeg::input* get_jpeg_loader() { return NULL; }
- virtual bitmap_character_def* get_bitmap_character(int id) { return
m_movie_def->get_bitmap_character(id); }
- virtual void add_bitmap_character(int id, bitmap_character_def* ch)
{ log_error("add_bc appears in sprite tags!\n"); }
- virtual sound_sample* get_sound_sample(int id) { return
m_movie_def->get_sound_sample(id); }
- virtual void add_sound_sample(int id, sound_sample* sam) {
log_error("add sam appears in sprite tags!\n"); }
+
+ virtual void set_jpeg_loader(jpeg::input* /*j_in*/)
+ {
+ assert(0);
+ }
+
+ virtual jpeg::input* get_jpeg_loader()
+ {
+ return NULL;
+ }
+
+ virtual bitmap_character_def* get_bitmap_character(int id)
+ {
+ return m_movie_def->get_bitmap_character(id);
+ }
+
+ virtual void add_bitmap_character(int /*id*/,
+ bitmap_character_def* /*ch*/)
+ {
+ log_error("add_bc appears in sprite tags!"
+ " Malformed SWF?");
+ }
+
+ virtual sound_sample* get_sound_sample(int id)
+ {
+ return m_movie_def->get_sound_sample(id);
+ }
+
+ virtual void add_sound_sample(int /*id*/, sound_sample* /*sam*/)
+ {
+ log_error("add sam appears in sprite tags!"
+ " Malformed SWF?");
+ }
// @@ would be nicer to not inherit these...
- virtual create_bitmaps_flag get_create_bitmaps() const { assert(0);
return DO_LOAD_BITMAPS; }
- virtual create_font_shapes_flag get_create_font_shapes() const {
assert(0); return DO_LOAD_FONT_SHAPES; }
- virtual int get_bitmap_info_count() const { assert(0); return 0; }
- virtual bitmap_info* get_bitmap_info(int i) const { assert(0);
return NULL; }
- virtual void add_bitmap_info(bitmap_info* bi) { assert(0); }
-
- virtual void export_resource(const tu_string& symbol, resource* res)
{ log_error("can't export from sprite\n"); }
- virtual smart_ptr<resource> get_exported_resource(const tu_string&
sym) { return m_movie_def->get_exported_resource(sym); }
- virtual void add_import(const char* source_url, int id, const char*
symbol) { assert(0); }
- virtual void visit_imported_movies(import_visitor* v) { assert(0); }
- virtual void resolve_import(const char* source_url,
movie_definition* d) { assert(0); }
+ virtual create_bitmaps_flag get_create_bitmaps() const
+ { assert(0); return DO_LOAD_BITMAPS; }
+ virtual create_font_shapes_flag get_create_font_shapes() const
+ { assert(0); return DO_LOAD_FONT_SHAPES; }
+ virtual int get_bitmap_info_count() const
+ { assert(0); return 0; }
+ virtual bitmap_info* get_bitmap_info(int /*i*/) const
+ { assert(0); return NULL; }
+ virtual void add_bitmap_info(bitmap_info* /*bi*/)
+ { assert(0); }
+
+ virtual void export_resource(const tu_string& /*symbol*/,
+ resource* /*res*/)
+ {
+ log_error("can't export from sprite! Malformed SWF?");
+ }
+
+ virtual smart_ptr<resource> get_exported_resource(const tu_string& sym)
+ {
+ return m_movie_def->get_exported_resource(sym);
+ }
+
+ virtual void add_import(const char* /*source_url*/, int /*id*/,
+ const char* /*symbol*/)
+ {
+ assert(0);
+ }
+
+ virtual void visit_imported_movies(import_visitor* /*v*/)
+ {
+ assert(0);
+ }
+
+ virtual void resolve_import(const char* /*source_url*/,
+ movie_definition* /*d*/)
+ {
+ assert(0);
+ }
+
/// \brief
/// Get a character_def from this Sprite's parent
@@ -143,22 +203,26 @@
/// that a Definition tag is been found as part of
/// a Sprite definition
///
- virtual void add_character(int id, character_def* ch)
+ virtual void add_character(int /*id*/, character_def* /*ch*/)
{
- log_error("add_character tag appears in sprite tags!\n");
+ log_error("add_character tag appears in sprite tags!"
+ " Maformed SWF?");
}
- virtual void generate_font_bitmaps() { assert(0); }
+ virtual void generate_font_bitmaps()
+ {
+ assert(0);
+ }
- virtual void output_cached_data(tu_file* out,
- const cache_options& options)
+ virtual void output_cached_data(tu_file* /*out*/,
+ const cache_options& /*options*/)
{
// Nothing to do.
return;
}
- virtual void input_cached_data(tu_file* in)
+ virtual void input_cached_data(tu_file* /*in*/)
{
// Nothing to do.
return;
@@ -183,10 +247,11 @@
m_playlist[m_loading_frame].push_back(c);
}
- virtual void add_init_action(int sprite_id, execute_tag* c)
+ //virtual void add_init_action(int sprite_id, execute_tag* c)
+ virtual void add_init_action(execute_tag* /*c*/)
{
// Sprite def's should not have do_init_action tags in them! (@@
correct?)
- log_error("sprite_definition::add_init_action called! Ignored.\n");
+ log_error("sprite_definition::add_init_action called! Ignored.
(Malformed SWF?)\n");
}
/// \brief
@@ -211,7 +276,8 @@
// Sprites do not have init actions in their
// playlists! Only the root movie
// (movie_def_impl) does (@@ correct?)
- virtual const std::vector<execute_tag*>*get_init_actions(int
frame_number)
+ virtual const std::vector<execute_tag*>* get_init_actions(
+ int /*frame_number*/)
{
return NULL;
}
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/swf/tag_loaders.cpp 21 Jun 2006 08:46:32 -0000 1.12
+++ server/swf/tag_loaders.cpp 24 Jun 2006 17:56:36 -0000 1.13
@@ -635,7 +635,7 @@
// This is like null_loader except it prints a message to nag us to fix it.
void
-fixme_loader(stream* in, tag_type tag, movie_definition* m)
+fixme_loader(stream* /*in*/, tag_type tag, movie_definition* /*m*/)
{
log_parse(" FIXME: tagtype = %d\n", tag);
}
@@ -1407,7 +1407,8 @@
do_action* da = new do_action;
da->read(in);
- m->add_init_action(sprite_character_id, da);
+ //m->add_init_action(sprite_character_id, da);
+ m->add_init_action(da);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/action.cpp server/button...,
Sandro Santilli <=