[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/Makefile.am backend/sou...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/Makefile.am backend/sou... |
|
Date: |
Tue, 27 Feb 2007 09:10:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/02/27 09:10:21
Modified files:
. : ChangeLog
backend : Makefile.am sound_handler_gst.h
sound_handler_sdl.h
extensions : Makefile.am
gui : Player.cpp Player.h gtk.cpp gui.cpp
server : Makefile.am button_character_instance.h gnash.h
impl.cpp impl.h mouse_button_state.h
sprite_instance.cpp
server/asobj : Sound.cpp SoundFfmpeg.cpp SoundGst.cpp
SoundMad.cpp
server/parser : Makefile.am button_character_def.cpp
button_character_def.h movie_def_impl.cpp
server/swf : tag_loaders.cpp
server/vm : ASHandlers.cpp action.cpp
testsuite : Makefile.am MovieTester.cpp MovieTester.h
sound_handler_test.h
testsuite/actionscript.all: LoadVars.as
testsuite/misc-ming.all: Makefile.am
testsuite/misc-mtasc.all: hello.as
testsuite/movies.all: Makefile.am
testsuite/samples: Makefile.am
Added files:
backend : sound_handler.cpp sound_handler.h
server/parser : sound_definition.cpp sound_definition.h
Removed files:
server : sound.cpp sound.h
Log message:
Files scramble. sound_handler has now it's own header,
sound.{cpp,h}
has been moved to parser/sound_definition.{cpp,h}
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2480&r2=1.2481
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/mouse_button_state.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.180&r2=1.181
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sound.cpp?cvsroot=gnash&r1=1.23&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sound.h?cvsroot=gnash&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/sound_handler_test.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/LoadVars.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/hello.as?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2480
retrieving revision 1.2481
diff -u -b -r1.2480 -r1.2481
--- ChangeLog 27 Feb 2007 01:07:07 -0000 1.2480
+++ ChangeLog 27 Feb 2007 09:10:19 -0000 1.2481
@@ -1,3 +1,30 @@
+2007-02-27 Sandro Santilli <address@hidden>
+
+ * backend/Makefile.am, backend/sound_handler.h,
+ backend/sound_handler.cpp, backend/sound_handler_gst.h,
+ backend/sound_handler_sdl.h, extensions/Makefile.am,
+ gui/Player.cpp, gui/Player.h, gui/gtk.cpp, gui/gui.cpp,
+ server/Makefile.am, server/button_character_instance.h,
+ server/gnash.h, server/impl.cpp, server/impl.h,
+ server/mouse_button_state.h, server/sound.cpp, server/sound.h,
+ server/sprite_instance.cpp, server/asobj/Sound.cpp,
+ server/asobj/SoundFfmpeg.cpp, server/asobj/SoundGst.cpp,
+ server/asobj/SoundMad.cpp, server/parser/Makefile.am,
+ server/parser/button_character_def.cpp,
+ server/parser/button_character_def.h,
+ server/parser/movie_def_impl.cpp,
+ server/parser/sound_definition.cpp,
+ server/parser/sound_definition.h, server/swf/tag_loaders.cpp,
+ server/vm/ASHandlers.cpp, server/vm/action.cpp,
+ testsuite/Makefile.am, testsuite/MovieTester.cpp,
+ testsuite/MovieTester.h, testsuite/sound_handler_test.h,
+ testsuite/actionscript.all/LoadVars.as,
+ testsuite/misc-ming.all/Makefile.am,
+ testsuite/misc-mtasc.all/hello.as,
+ testsuite/movies.all/Makefile.am, testsuite/samples/Makefile.am:
+ Files scramble. sound_handler has now it's own header, sound.{cpp,h}
+ has been moved to parser/sound_definition.{cpp,h}.
+
2007-02-26 Markus Gothe <address@hidden>
* extensions/fileio/Makefile.am: Added {PTHREAD,BOOST}_CFLAGS
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- backend/Makefile.am 17 Jan 2007 11:50:13 -0000 1.50
+++ backend/Makefile.am 27 Feb 2007 09:10:19 -0000 1.51
@@ -58,6 +58,7 @@
$(NULL)
noinst_HEADERS = \
+ sound_handler.h \
render_handler.h \
render_handler_tri.h
@@ -67,6 +68,7 @@
lib_LTLIBRARIES = libgnashbackend.la
RENDER_SOURCES = render_handler_tri.cpp
+SOUND_SOURCES = sound_handler.cpp
if USE_RENDERER_CAIRO
RENDER_SOURCES += render_handler_cairo.cpp
@@ -81,7 +83,7 @@
endif
if USE_SOUND_GST
-SOUND_SOURCES = sound_handler_gst.cpp sound_handler_gst.h
+SOUND_SOURCES += sound_handler_gst.cpp sound_handler_gst.h
libgnashbackend_LIBS += $(GSTREAMER_LIBS)
libgnashbackend_LIBS += $(LIBXML_LIBS)
AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
@@ -89,7 +91,7 @@
endif
if USE_SOUND_SDL
-SOUND_SOURCES = sound_handler_sdl.cpp sound_handler_sdl.h
+SOUND_SOURCES += sound_handler_sdl.cpp sound_handler_sdl.h
if USE_FFMPEG_ENGINE
libgnashbackend_LIBS += $(FFMPEG_LIBS)
AM_CPPFLAGS += $(FFMPEG_CFLAGS)
Index: backend/sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- backend/sound_handler_gst.h 17 Nov 2006 19:24:57 -0000 1.1
+++ backend/sound_handler_gst.h 27 Feb 2007 09:10:20 -0000 1.2
@@ -17,7 +17,9 @@
#ifndef SOUND_HANDLER_GST_H
#define SOUND_HANDLER_GST_H
-#include "gnash.h"
+//#include "gnash.h"
+#include "sound_handler.h" // for inheritance
+
#include <vector>
#include <gst/gst.h>
Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- backend/sound_handler_sdl.h 2 Feb 2007 15:01:17 -0000 1.15
+++ backend/sound_handler_sdl.h 27 Feb 2007 09:10:20 -0000 1.16
@@ -14,21 +14,21 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: sound_handler_sdl.h,v 1.15 2007/02/02 15:01:17 bjacques Exp $
+// $Id: sound_handler_sdl.h,v 1.16 2007/02/27 09:10:20 strk Exp $
#ifndef SOUND_HANDLER_SDL_H
#define SOUND_HANDLER_SDL_H
+#include "sound_handler.h" // for inheritance
+#include "hash_wrapper.h"
+
#ifdef USE_FFMPEG
#include <ffmpeg/avcodec.h>
#elif defined(USE_MAD)
#include <mad.h>
#endif
-#include "gnash.h"
-#include "hash_wrapper.h"
-
#include <vector>
#include <SDL_audio.h>
Index: extensions/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/Makefile.am 13 Feb 2007 19:39:46 -0000 1.4
+++ extensions/Makefile.am 27 Feb 2007 09:10:20 -0000 1.5
@@ -22,4 +22,5 @@
MYSQL_DIR = mysql
endif
+DISTSUBDIRS = dejagnu fileio mysql gtk2
SUBDIRS = dejagnu fileio $(MYSQL_DIR)
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gui/Player.cpp 21 Feb 2007 14:51:00 -0000 1.42
+++ gui/Player.cpp 27 Feb 2007 09:10:20 -0000 1.43
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -53,8 +53,9 @@
#include "NullGui.h"
-#include "gnash.h"
+#include "gnash.h" // still needed ?
#include "movie_definition.h"
+#include "sound_handler.h" // for set_sound_handler and create_sound_handler_*
#include "sprite_instance.h" // for setting FlashVars
#include "movie_root.h"
#include "Player.h"
Index: gui/Player.h
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/Player.h 18 Dec 2006 20:51:02 -0000 1.8
+++ gui/Player.h 27 Feb 2007 09:10:20 -0000 1.9
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -26,7 +26,8 @@
#include "tu_config.h"
-#include "gnash.h"
+#include "gnash.h" // still needed ?
+#include "sound_handler.h" // for visibility of sound_handler destructor
#include "gui.h"
#include <string>
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gui/gtk.cpp 6 Feb 2007 17:46:24 -0000 1.66
+++ gui/gtk.cpp 27 Feb 2007 09:10:20 -0000 1.67
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -17,19 +17,19 @@
//
//
-/* $Id: gtk.cpp,v 1.66 2007/02/06 17:46:24 rsavoye Exp $ */
+/* $Id: gtk.cpp,v 1.67 2007/02/27 09:10:20 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "gnash.h"
-//#include "movie_definition.h"
+#include "gnash.h" // is this still needed ?
#include "log.h"
#include "gui.h"
#include "rc.h"
#include "gtksup.h"
+#include "sound_handler.h"
#include "render_handler.h"
#include <iostream>
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- gui/gui.cpp 13 Feb 2007 09:29:26 -0000 1.61
+++ gui/gui.cpp 27 Feb 2007 09:10:20 -0000 1.62
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -25,6 +25,7 @@
#include "gui.h"
#include "render.h" // debug
#include "render_handler.h"
+#include "sound_handler.h"
#include "movie_root.h"
#include "VM.h"
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- server/Makefile.am 21 Feb 2007 13:22:37 -0000 1.105
+++ server/Makefile.am 27 Feb 2007 09:10:20 -0000 1.106
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.105 2007/02/21 13:22:37 strk Exp $
+# $Id: Makefile.am,v 1.106 2007/02/27 09:10:20 strk Exp $
AUTOMAKE_OPTIONS =
@@ -81,7 +81,6 @@
impl.cpp \
render.cpp \
shape.cpp \
- sound.cpp \
stream.cpp \
styles.cpp \
tesselate.cpp \
@@ -132,7 +131,6 @@
resource.h \
shape.h \
shm.h \
- sound.h \
sprite_instance.h \
stream.h \
styles.h \
Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/button_character_instance.h 31 Jan 2007 15:11:58 -0000 1.11
+++ server/button_character_instance.h 27 Feb 2007 09:10:20 -0000 1.12
@@ -5,15 +5,13 @@
// SWF buttons. Mouse-sensitive update/display, actions, etc.
-/* $Id: button_character_instance.h,v 1.11 2007/01/31 15:11:58 strk Exp $ */
+/* $Id: button_character_instance.h,v 1.12 2007/02/27 09:10:20 strk Exp $ */
#ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
#define GNASH_BUTTON_CHARACTER_INSTANCE_H
-//#include "impl.h" // should get rid of this
#include "character.h" // for inheritance
-//#include "sound.h"
namespace gnash {
Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/gnash.h 20 Feb 2007 16:37:19 -0000 1.85
+++ server/gnash.h 27 Feb 2007 09:10:20 -0000 1.86
@@ -17,7 +17,7 @@
//
//
-/* $Id: gnash.h,v 1.85 2007/02/20 16:37:19 tgc Exp $ */
+/* $Id: gnash.h,v 1.86 2007/02/27 09:10:20 strk Exp $ */
/// \mainpage
///
@@ -95,23 +95,12 @@
/// want to display anything).
DSOEXPORT void set_render_handler(render_handler* s);
-/// Pass in a sound handler, so you can handle audio on behalf of
-/// gnash. This is optional; if you don't set a handler, or set
-/// NULL, then sounds won't be played.
-///
-/// If you want sound support, you should set this at startup,
-/// before loading or playing any movies!
-DSOEXPORT void set_sound_handler(sound_handler* s);
-
/// Set the base url against which to resolve relative urls
DSOEXPORT void set_base_url(const URL& url);
/// Return base url
DSOEXPORT const gnash::URL& get_base_url();
-/// You probably don't need this. (@@ make it private?)
-DSOEXPORT sound_handler* get_sound_handler();
-
/// Signature of file opener callback function
typedef tu_file* (*file_opener_callback)(const URL& url);
@@ -156,9 +145,6 @@
DSOEXPORT render_handler* create_render_handler_ogl();
//DSOEXPORT render_handler* create_render_handler_cairo(void* cairohandle);
-DSOEXPORT sound_handler* create_sound_handler_sdl();
-DSOEXPORT sound_handler* create_sound_handler_gst();
-DSOEXPORT sound_handler* create_sound_handler_test();
class font;
/// For caching precomputed stuff. Generally of
@@ -401,115 +387,6 @@
}
-//
-// Sound callback handler.
-//
-
-// You may define a subclass of this, and pass an instance to
-// set_sound_handler().
-class DSOEXPORT sound_handler
-{
-public:
-
- typedef bool (*aux_streamer_ptr)(void *udata, uint8 *stream, int len);
-
- struct sound_envelope
- {
- uint32_t m_mark44;
- uint16_t m_level0;
- uint16_t m_level1;
- };
-
- enum format_type
- {
- FORMAT_RAW = 0, // unspecified format. Useful for
8-bit sounds???
- FORMAT_ADPCM = 1, // gnash doesn't pass this through; it
uncompresses and sends FORMAT_NATIVE16
- FORMAT_MP3 = 2,
- FORMAT_UNCOMPRESSED = 3, // 16 bits/sample, little-endian
- FORMAT_NELLYMOSER = 6, // Mystery proprietary format; see
nellymoser.com
-
- // gnash tries to convert data to this format when possible:
- FORMAT_NATIVE16 = 7 // gnash extension: 16 bits/sample,
native-endian
- };
- // If stereo is true, samples are interleaved w/ left sample first.
-
- // gnash calls at load-time with sound data, to be
- // played later. You should create a sample with the
- // data, and return a handle that can be used to play
- // it later. If the data is in a format you can't
- // deal with, then you can return 0 (for example), and
- // then ignore 0's in play_sound() and delete_sound().
- //
- // Assign handles however you like.
- virtual int create_sound(
- void* data,
- int data_bytes,
- int sample_count,
- format_type format,
- int sample_rate, /* one of 5512, 11025, 22050,
44100 */
- bool stereo
- ) = 0;
-
- // gnash calls this to fill up soundstreams data
- virtual long fill_stream_data(void* data, int data_bytes, int
sample_count, int handle_id) = 0;
-
- // Gives info about the format, samplerate and stereo of the sound
in question;
- virtual void get_info(int sound_handle, int* format, bool* stereo) = 0;
-
- // gnash calls this when it wants you to play the defined sound.
- // loop_count == 0 means play the sound once (1 means play it twice,
etc)
- virtual void play_sound(int sound_handle, int loop_count, int
secondOffset, long start, std::vector<sound_envelope>* envelopes) = 0;
-
- // stops all sounds currently playing in a SWF file without
stopping the playhead.
- // Sounds set to stream will resume playing as the playhead moves
over the frames they are in.
- virtual void stop_all_sounds() = 0;
-
- // returns the sound volume level as an integer from 0 to 100,
- // where 0 is off and 100 is full volume. The default setting is
100.
- virtual int get_volume(int sound_handle) = 0;
-
- // A number from 0 to 100 representing a volume level.
- // 100 is full volume and 0 is no volume. The default setting is
100.
- virtual void set_volume(int sound_handle, int volume) = 0;
-
- // Stop the specified sound if it's playing.
- // (Normally a full-featured sound API would take a
- // handle specifying the *instance* of a playing
- // sample, but SWF is not expressive that way.)
- virtual void stop_sound(int sound_handle) = 0;
-
- // gnash calls this when it's done with a particular sound.
- virtual void delete_sound(int sound_handle) = 0;
-
- // gnash calls this to mute audio
- virtual void mute() = 0;
-
- // gnash calls this to unmute audio
- virtual void unmute() = 0;
-
- //// @return Whether or not sound is muted.
- virtual bool is_muted() = 0;
-
- virtual void attach_aux_streamer(aux_streamer_ptr ptr, void* owner)
= 0;
- virtual void detach_aux_streamer(void* owner) = 0;
-
- // Converts input data to the SDL output format.
- virtual void convert_raw_data(int16_t** adjusted_data,
- int* adjusted_size, void* data, int sample_count,
- int sample_size, int sample_rate, bool stereo) = 0;
-
- virtual ~sound_handler() {};
-
- // Utility function to uncompress ADPCM.
- static void adpcm_expand(
- void* data_out,
- stream* in,
- int sample_count, // in stereo, this is number of *pairs*
of samples
- bool stereo);
-
-
-};
-
//
// point: used by rect which is used by render_handler (otherwise would be in
internal gnash_types.h)
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/impl.cpp 26 Feb 2007 22:58:38 -0000 1.98
+++ server/impl.cpp 27 Feb 2007 09:10:20 -0000 1.99
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -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: impl.cpp,v 1.98 2007/02/26 22:58:38 strk Exp $ */
+/* $Id: impl.cpp,v 1.99 2007/02/27 09:10:20 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -53,6 +53,7 @@
#include "VM.h"
#include "BitmapMovieDefinition.h"
#include "DefineFontAlignZonesTag.h"
+#include "sound_handler.h" // for get_sound_handler
#include <string>
#include <map>
Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/impl.h 6 Dec 2006 10:21:32 -0000 1.41
+++ server/impl.h 27 Feb 2007 09:10:20 -0000 1.42
@@ -18,7 +18,7 @@
//
//
-/* $Id: impl.h,v 1.41 2006/12/06 10:21:32 strk Exp $ */
+/* $Id: impl.h,v 1.42 2007/02/27 09:10:20 strk Exp $ */
#ifndef GNASH_IMPL_H
#define GNASH_IMPL_H
@@ -34,7 +34,6 @@
#include "container.h"
#include "utility.h"
#include "smart_ptr.h"
-#include "resource.h" // for sound_sample inheritance
#include "swf/TagLoadersTable.h"
#include "matrix.h" // for display_info composition
@@ -55,12 +54,6 @@
class stream;
class sprite_instance;
-class sound_sample : public resource //virtual public ref_counted
-{
-public:
- virtual sound_sample* cast_to_sound_sample() { return this; }
-};
-
DSOEXPORT void save_extern_movie(sprite_instance* m);
Index: server/mouse_button_state.h
===================================================================
RCS file: /sources/gnash/gnash/server/mouse_button_state.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/mouse_button_state.h 31 Jan 2007 16:12:06 -0000 1.7
+++ server/mouse_button_state.h 27 Feb 2007 09:10:20 -0000 1.8
@@ -8,9 +8,8 @@
#define GNASH_MOUSE_BUTTON_STATE_H
-//#include "impl.h" // should get rid of this
#include "character_def.h"
-#include "sound.h"
+//#include "sound.h"
#include "smart_ptr.h" // for composition and inlines
#include "character.h" // for use in intrusive_ptr
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- server/sprite_instance.cpp 26 Feb 2007 22:08:06 -0000 1.180
+++ server/sprite_instance.cpp 27 Feb 2007 09:10:20 -0000 1.181
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -25,7 +25,7 @@
#include "log.h"
#include "action.h" // for call_method_parsed (call_method_args)
-#include "gnash.h"
+//#include "gnash.h"
#include "render.h" // for bounds_in_clipping_area()
#include "sprite_instance.h"
#include "movie_definition.h"
@@ -47,6 +47,7 @@
#include "Range2d.h" // for getBounds
#include "GnashException.h"
#include "URL.h"
+#include "sound_handler.h"
#include <vector>
#include <string>
Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/Sound.cpp 19 Feb 2007 21:45:41 -0000 1.4
+++ server/asobj/Sound.cpp 27 Feb 2007 09:10:20 -0000 1.5
@@ -22,7 +22,7 @@
#include "log.h"
#include "Sound.h"
-#include "sound.h" // for sound_sample_impl
+#include "sound_definition.h" // for sound_sample
#include "movie_definition.h"
#include "sprite_instance.h"
#include "fn_call.h"
@@ -309,7 +309,7 @@
}
// FIXME: shouldn't we use dynamic_cast here (or rely on
sound_sample interface) ?
- sound_sample_impl* ss = (sound_sample_impl*)
res->cast_to_sound_sample();
+ sound_sample* ss = res->cast_to_sound_sample();
if (ss != NULL)
{
@@ -317,7 +317,7 @@
}
else
{
- log_error("sound sample is NULL (doesn't cast to
sound_sample_impl)");
+ log_error("sound sample is NULL (doesn't cast to
sound_sample)");
return;
}
@@ -361,8 +361,7 @@
}
int si = 0;
- // FIXME: shouldn't we use dynamic_cast here (or rely on sound_sample
interface) ?
- sound_sample_impl* ss = (sound_sample_impl*)
res->cast_to_sound_sample();
+ sound_sample* ss = res->cast_to_sound_sample();
if (ss != NULL)
{
@@ -370,7 +369,7 @@
}
else
{
- log_error("sound sample is NULL (doesn't cast to
sound_sample_impl)");
+ log_error("sound sample is NULL (doesn't cast to
sound_sample)");
return;
}
Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/SoundFfmpeg.cpp 21 Feb 2007 14:51:01 -0000 1.3
+++ server/asobj/SoundFfmpeg.cpp 27 Feb 2007 09:10:20 -0000 1.4
@@ -22,7 +22,7 @@
#include "log.h"
#include "SoundFfmpeg.h"
-#include "sound.h" // for sound_sample_impl
+#include "sound_definition.h" // for sound_sample
#include "movie_definition.h"
#include "sprite_instance.h"
#include "fn_call.h"
Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/SoundGst.cpp 19 Feb 2007 21:45:41 -0000 1.2
+++ server/asobj/SoundGst.cpp 27 Feb 2007 09:10:20 -0000 1.3
@@ -22,7 +22,7 @@
#include "log.h"
#include "SoundGst.h"
-#include "sound.h" // for sound_sample_impl
+#include "sound_definition.h" // for sound_sample
#include "movie_definition.h"
#include "sprite_instance.h"
#include "fn_call.h"
Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/SoundMad.cpp 21 Feb 2007 14:51:01 -0000 1.2
+++ server/asobj/SoundMad.cpp 27 Feb 2007 09:10:20 -0000 1.3
@@ -22,7 +22,7 @@
#include "log.h"
#include "SoundMad.h"
-#include "sound.h" // for sound_sample_impl
+#include "sound_definition.h" // for sound_sample
#include "movie_definition.h"
#include "sprite_instance.h"
#include "fn_call.h"
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/parser/Makefile.am 14 Feb 2007 09:03:53 -0000 1.24
+++ server/parser/Makefile.am 27 Feb 2007 09:10:20 -0000 1.25
@@ -15,7 +15,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: Makefile.am,v 1.24 2007/02/14 09:03:53 strk Exp $
+# $Id: Makefile.am,v 1.25 2007/02/27 09:10:20 strk Exp $
AUTOMAKE_OPTIONS =
@@ -54,6 +54,7 @@
movie_def_impl.cpp \
morph2_character_def.cpp \
shape_character_def.cpp \
+ sound_definition.cpp \
sprite_definition.cpp \
video_stream_def.cpp
@@ -69,6 +70,7 @@
movie_definition.h \
movie_def_impl.h \
shape_character_def.h \
+ sound_definition.h \
sprite_definition.h \
video_stream_def.h
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/button_character_def.cpp 11 Nov 2006 22:44:54 -0000
1.8
+++ server/parser/button_character_def.cpp 27 Feb 2007 09:10:20 -0000
1.9
@@ -215,7 +215,7 @@
bs.m_sound_id = in->read_u16();
if (bs.m_sound_id > 0)
{
- bs.m_sam = (sound_sample_impl*)
m->get_sound_sample(bs.m_sound_id);
+ bs.m_sam = m->get_sound_sample(bs.m_sound_id);
if (bs.m_sam == NULL)
{
// printf("sound tag not found,
sound_id=%d, button state #=%i", bs.sound_id, i);
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/button_character_def.h 20 Nov 2006 21:46:58 -0000
1.10
+++ server/parser/button_character_def.h 27 Feb 2007 09:10:20 -0000
1.11
@@ -11,8 +11,10 @@
#include "character_def.h"
-#include "sound.h"
+#include "sound_definition.h"
#include "rect.h" // for get_bound
+#include "matrix.h" // for composition
+#include "gnash.h" // for class cxform :(
#ifndef UNUSED
#define UNUSED(x) ((x) = (x))
@@ -108,7 +110,7 @@
struct button_sound_info
{
uint16_t m_sound_id;
- sound_sample_impl* m_sam;
+ sound_sample* m_sam;
sound_info m_sound_style;
};
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/parser/movie_def_impl.cpp 1 Feb 2007 15:47:33 -0000 1.60
+++ server/parser/movie_def_impl.cpp 27 Feb 2007 09:10:20 -0000 1.61
@@ -35,6 +35,8 @@
#include "movie_root.h"
#include "VM.h" // for assertions
#include "GnashException.h" // for parser exception
+#include "execute_tag.h"
+#include "sound_definition.h" // for sound_sample
#include <memory>
#include <string>
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- server/swf/tag_loaders.cpp 26 Feb 2007 22:58:38 -0000 1.77
+++ server/swf/tag_loaders.cpp 27 Feb 2007 09:10:20 -0000 1.78
@@ -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: tag_loaders.cpp,v 1.77 2007/02/26 22:58:38 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.78 2007/02/27 09:10:20 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -53,6 +53,7 @@
#include "URL.h"
#include "GnashException.h"
#include "video_stream_def.h"
+#include "sound_definition.h"
namespace gnash {
@@ -1672,7 +1673,7 @@
if (handler_id >= 0)
{
- sound_sample* sam = new sound_sample_impl(handler_id);
+ sound_sample* sam = new sound_sample(handler_id);
m->add_sound_sample(character_id, sam);
}
@@ -1699,7 +1700,7 @@
uint16_t sound_id = in->read_u16();
- sound_sample_impl* sam = (sound_sample_impl*)
m->get_sound_sample(sound_id);
+ sound_sample* sam = m->get_sound_sample(sound_id);
if (sam)
{
start_sound_tag* sst = new start_sound_tag();
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/vm/ASHandlers.cpp 26 Feb 2007 14:19:23 -0000 1.40
+++ server/vm/ASHandlers.cpp 27 Feb 2007 09:10:20 -0000 1.41
@@ -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: ASHandlers.cpp,v 1.40 2007/02/26 14:19:23 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.41 2007/02/27 09:10:20 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,6 +45,7 @@
#include "VM.h" // for getting the root
#include "movie_root.h" // for set_drag_state (ActionStartDragMovie)
#include "debugger.h"
+#include "sound_handler.h"
#include <string>
#include <map>
Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/vm/action.cpp 30 Jan 2007 02:02:29 -0000 1.7
+++ server/vm/action.cpp 27 Feb 2007 09:10:20 -0000 1.8
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -27,7 +27,7 @@
#include "as_function.h"
#include "timers.h"
#include "textformat.h"
-#include "sound.h"
+#include "sound_definition.h"
#include "array.h"
#include "types.h"
#include "sprite_instance.h"
Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/Makefile.am 20 Feb 2007 16:37:19 -0000 1.28
+++ testsuite/Makefile.am 27 Feb 2007 09:10:20 -0000 1.29
@@ -27,11 +27,13 @@
sound_handler_test.cpp \
$(NULL)
libtestsuite_la_LIBADD = \
+ $(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libbase/libgnashbase.la \
$(NULL)
libtestsuite_la_CXXFLAGS = \
-I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
-I$(top_srcdir)/libgeometry \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/MovieTester.cpp 20 Feb 2007 16:37:19 -0000 1.21
+++ testsuite/MovieTester.cpp 27 Feb 2007 09:10:20 -0000 1.22
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2006, 2007 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
@@ -28,6 +28,7 @@
#include "as_environment.h"
#include "gnash.h" // for create_movie and create_library_movie and for
gnash::key namespace
#include "VM.h" // for initialization
+#include "sound_handler_test.h" // for creating the "test" sound handler
#include <cstdio>
#include <string>
Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/MovieTester.h 20 Feb 2007 16:37:19 -0000 1.10
+++ testsuite/MovieTester.h 27 Feb 2007 09:10:20 -0000 1.11
@@ -22,7 +22,7 @@
#include "Range2d.h"
#include "gnash.h" // for namespace key
-#include "sound_handler_test.h"
+#include "sound_handler_test.h" // for creating the "test" sound handler
#include <memory> // for auto_ptr
#include <string> // for auto_ptr
Index: testsuite/sound_handler_test.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/sound_handler_test.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/sound_handler_test.h 20 Feb 2007 16:37:19 -0000 1.1
+++ testsuite/sound_handler_test.h 27 Feb 2007 09:10:20 -0000 1.2
@@ -14,12 +14,13 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: sound_handler_test.h,v 1.1 2007/02/20 16:37:19 tgc Exp $
+// $Id: sound_handler_test.h,v 1.2 2007/02/27 09:10:20 strk Exp $
#ifndef SOUND_HANDLER_TEST_H
#define SOUND_HANDLER_TEST_H
-#include "gnash.h"
+#include "gnash.h" // still needed ?
+#include "sound_handler.h" // for inheritance
#include "hash_wrapper.h"
#include <vector>
Index: testsuite/actionscript.all/LoadVars.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/LoadVars.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/LoadVars.as 25 Feb 2007 14:14:14 -0000
1.9
+++ testsuite/actionscript.all/LoadVars.as 27 Feb 2007 09:10:20 -0000
1.10
@@ -20,7 +20,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: LoadVars.as,v 1.9 2007/02/25 14:14:14 strk Exp $";
+rcsid="$Id: LoadVars.as,v 1.10 2007/02/27 09:10:20 strk Exp $";
#include "check.as"
@@ -35,6 +35,8 @@
#else // OUTPUT_VERSION >= 6
+#if 0 // STRK REMOVEME
+
check_equals(typeof(LoadVars), 'function');
var loadvarsObj = new LoadVars;
@@ -59,6 +61,9 @@
// test the LoadVars::tostring method
check_equals (typeof(loadvarsObj.toString), 'function');
+#endif // 0 // STRK REMOVEME
+var loadvarsObj = new LoadVars; // STRK REMOVEME
+
//--------------------------------------------------------------------------
// Test LoadVars::load()
//--------------------------------------------------------------------------
@@ -84,12 +89,13 @@
//for (var i in _root) { note("_root["+i+"] = "+_root[i]); }
- if ( varsloaded == 2 )
+ if ( varsloaded == 1 )
{
- check_equals(loadvarsObj['var1'], 'val1');
- check_equals(loadvarsObj['var2'], 'val2');
- check_equals(loadvarsObj['v2_var1'], 'val1');
- check_equals(loadvarsObj['v2_var2'], 'val2');
+ check_equals(loadvarsObj['var1'], 'previous val1');
+ check_equals(loadvarsObj['var1_check'], 'previous val1');
+ //check_equals(loadvarsObj['var2'], 'val2');
+ //check_equals(loadvarsObj['v2_var1'], 'val1');
+ //check_equals(loadvarsObj['v2_var2'], 'val2');
play();
}
};
@@ -118,13 +124,14 @@
// The final '&' char is important, and it must
// not start with a '?' char.
//
-check( loadvarsObj.load( MEDIA(vars.txt) ) );
-check( loadvarsObj.load( MEDIA(vars2.txt) ) );
+check( loadvarsObj instanceOf LoadVars );
+check( loadvarsObj.sendAndLoad( 'http://localhost/vars.php', loadvarsObj ) );
+//check( loadvarsObj.load( MEDIA(vars2.txt) ) );
//loadvarsObj.load( 'vars.cgi' );
check_equals( loadvarsObj.loaded, false );
-loadvars.Obj.loaded = true;
-check_equals( loadvarsObj.loaded, false );
+//loadvars.Obj.loaded = true;
+//check_equals( loadvarsObj.loaded, false );
check_equals(varsloaded, 0);
check_equals(loadvarsObj['var1'], 'previous val1'); // will be overridden
check_equals(loadvarsObj['var2'], undefined);
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- testsuite/misc-ming.all/Makefile.am 21 Feb 2007 10:58:56 -0000 1.74
+++ testsuite/misc-ming.all/Makefile.am 27 Feb 2007 09:10:21 -0000 1.75
@@ -40,6 +40,7 @@
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
-I$(top_srcdir)/libgeometry \
Index: testsuite/misc-mtasc.all/hello.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/hello.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-mtasc.all/hello.as 13 Feb 2007 09:57:37 -0000 1.2
+++ testsuite/misc-mtasc.all/hello.as 27 Feb 2007 09:10:21 -0000 1.3
@@ -1,8 +1,17 @@
-class Test
+class Test extends MovieClip
{
-static function main(mc)
-{
+ function test_all()
+ {
+ _root.check_equals(typeof(this.loadMovie), 'function');
+
+ }
+
+ static function main(mc)
+ {
+ var myTest = new Test;
+ myTest.test_all();
+
var a = 1;
// This is how you call check_equals
@@ -10,6 +19,6 @@
// This is how you print notes (trace + visual trace)
_root.note("Hello world");
-}
+ }
}
Index: testsuite/movies.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/movies.all/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/movies.all/Makefile.am 13 Dec 2006 14:19:44 -0000 1.6
+++ testsuite/movies.all/Makefile.am 27 Feb 2007 09:10:21 -0000 1.7
@@ -39,6 +39,7 @@
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
-I$(top_srcdir)/libgeometry \
Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/samples/Makefile.am 26 Feb 2007 13:55:12 -0000 1.12
+++ testsuite/samples/Makefile.am 27 Feb 2007 09:10:21 -0000 1.13
@@ -28,6 +28,7 @@
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
-I$(top_srcdir)/libgeometry \
Index: backend/sound_handler.cpp
===================================================================
RCS file: backend/sound_handler.cpp
diff -N backend/sound_handler.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ backend/sound_handler.cpp 27 Feb 2007 09:10:20 -0000 1.1
@@ -0,0 +1,53 @@
+//
+// Copyright (C) 2007 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
+
+
+#include "sound_handler.h"
+
+namespace gnash {
+
+namespace globals {
+
+// Callback interface to host, for handling sounds. If it's NULL,
+// sound is ignored.
+sound_handler* s_sound_handler = 0;
+
+} // namespace gnash::global
+
+
+void set_sound_handler(sound_handler* s)
+// Called by host, to set a handler for all sounds.
+// Can pass in 0 to disable sound.
+{
+ globals::s_sound_handler = s;
+}
+
+
+sound_handler* get_sound_handler()
+{
+ return globals::s_sound_handler;
+}
+
+
+} // namespace gnash
+
+
+// Local Variables:
+// mode: C++
+// c-basic-offset: 8
+// tab-width: 8
+// indent-tabs-mode: t
+// End:
Index: backend/sound_handler.h
===================================================================
RCS file: backend/sound_handler.h
diff -N backend/sound_handler.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ backend/sound_handler.h 27 Feb 2007 09:10:20 -0000 1.1
@@ -0,0 +1,180 @@
+//
+// Copyright (C) 2005, 2006, 2007 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: sound_handler.h,v 1.1 2007/02/27 09:10:20 strk Exp $ */
+
+/// \page sound_handler_intro Sound handler introduction
+///
+/// This page must be written, volunteers ? :)
+///
+
+#ifndef SOUND_HANDLER_H
+#define SOUND_HANDLER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tu_config.h" // for DSOEXPORT
+#include "tu_types.h"
+
+#include <vector>
+
+namespace gnash {
+ class stream;
+}
+
+namespace gnash {
+
+//
+// Sound callback handler.
+//
+
+// You may define a subclass of this, and pass an instance to
+// set_sound_handler().
+class DSOEXPORT sound_handler
+{
+public:
+
+ typedef bool (*aux_streamer_ptr)(void *udata, uint8 *stream, int len);
+
+ struct sound_envelope
+ {
+ uint32_t m_mark44;
+ uint16_t m_level0;
+ uint16_t m_level1;
+ };
+
+ enum format_type
+ {
+ FORMAT_RAW = 0, // unspecified format. Useful for
8-bit sounds???
+ FORMAT_ADPCM = 1, // gnash doesn't pass this through; it
uncompresses and sends FORMAT_NATIVE16
+ FORMAT_MP3 = 2,
+ FORMAT_UNCOMPRESSED = 3, // 16 bits/sample, little-endian
+ FORMAT_NELLYMOSER = 6, // Mystery proprietary format; see
nellymoser.com
+
+ // gnash tries to convert data to this format when possible:
+ FORMAT_NATIVE16 = 7 // gnash extension: 16 bits/sample,
native-endian
+ };
+ // If stereo is true, samples are interleaved w/ left sample first.
+
+ // gnash calls at load-time with sound data, to be
+ // played later. You should create a sample with the
+ // data, and return a handle that can be used to play
+ // it later. If the data is in a format you can't
+ // deal with, then you can return 0 (for example), and
+ // then ignore 0's in play_sound() and delete_sound().
+ //
+ // Assign handles however you like.
+ virtual int create_sound(
+ void* data,
+ int data_bytes,
+ int sample_count,
+ format_type format,
+ int sample_rate, /* one of 5512, 11025, 22050,
44100 */
+ bool stereo
+ ) = 0;
+
+ // gnash calls this to fill up soundstreams data
+ virtual long fill_stream_data(void* data, int data_bytes, int
sample_count, int handle_id) = 0;
+
+ // Gives info about the format, samplerate and stereo of the sound
in question;
+ virtual void get_info(int sound_handle, int* format, bool* stereo) = 0;
+
+ // gnash calls this when it wants you to play the defined sound.
+ // loop_count == 0 means play the sound once (1 means play it twice,
etc)
+ virtual void play_sound(int sound_handle, int loop_count, int
secondOffset, long start, std::vector<sound_envelope>* envelopes) = 0;
+
+ // stops all sounds currently playing in a SWF file without
stopping the playhead.
+ // Sounds set to stream will resume playing as the playhead moves
over the frames they are in.
+ virtual void stop_all_sounds() = 0;
+
+ // returns the sound volume level as an integer from 0 to 100,
+ // where 0 is off and 100 is full volume. The default setting is
100.
+ virtual int get_volume(int sound_handle) = 0;
+
+ // A number from 0 to 100 representing a volume level.
+ // 100 is full volume and 0 is no volume. The default setting is
100.
+ virtual void set_volume(int sound_handle, int volume) = 0;
+
+ // Stop the specified sound if it's playing.
+ // (Normally a full-featured sound API would take a
+ // handle specifying the *instance* of a playing
+ // sample, but SWF is not expressive that way.)
+ virtual void stop_sound(int sound_handle) = 0;
+
+ // gnash calls this when it's done with a particular sound.
+ virtual void delete_sound(int sound_handle) = 0;
+
+ // gnash calls this to mute audio
+ virtual void mute() = 0;
+
+ // gnash calls this to unmute audio
+ virtual void unmute() = 0;
+
+ //// @return Whether or not sound is muted.
+ virtual bool is_muted() = 0;
+
+ virtual void attach_aux_streamer(aux_streamer_ptr ptr, void* owner)
= 0;
+ virtual void detach_aux_streamer(void* owner) = 0;
+
+ // Converts input data to the SDL output format.
+ virtual void convert_raw_data(int16_t** adjusted_data,
+ int* adjusted_size, void* data, int sample_count,
+ int sample_size, int sample_rate, bool stereo) = 0;
+
+ virtual ~sound_handler() {};
+
+ // Utility function to uncompress ADPCM.
+ static void adpcm_expand(
+ void* data_out,
+ stream* in,
+ int sample_count, // in stereo, this is number of *pairs*
of samples
+ bool stereo);
+
+
+};
+
+/// Pass in a sound handler, so you can handle audio on behalf of
+/// gnash. This is optional; if you don't set a handler, or set
+/// NULL, then sounds won't be played.
+///
+/// If you want sound support, you should set this at startup,
+/// before loading or playing any movies!
+DSOEXPORT void set_sound_handler(sound_handler* s);
+
+/// You probably don't need this. (@@ make it private?)
+DSOEXPORT sound_handler* get_sound_handler();
+
+// TODO: move to appropriate specific sound handlers
+DSOEXPORT sound_handler* create_sound_handler_sdl();
+DSOEXPORT sound_handler* create_sound_handler_gst();
+DSOEXPORT sound_handler* create_sound_handler_test();
+
+
+
+} // namespace gnash
+
+#endif // SOUND_HANDLER_H
+
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: server/parser/sound_definition.cpp
===================================================================
RCS file: server/parser/sound_definition.cpp
diff -N server/parser/sound_definition.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ server/parser/sound_definition.cpp 27 Feb 2007 09:10:20 -0000 1.1
@@ -0,0 +1,339 @@
+// sound.cpp -- Thatcher Ulrich <address@hidden> 2003
+
+// This source code has been donated to the Public Domain. Do
+// whatever you want with it.
+
+// Code to handle SWF sound-related tags.
+
+
+#include "sound_definition.h"
+#include "stream.h"
+#include "impl.h"
+#include "execute_tag.h" // for start_sound_tag inheritance
+#include "movie_definition.h"
+#include "sprite_instance.h"
+
+namespace gnash {
+
+
+ sound_sample::~sound_sample()
+ {
+ if (globals::s_sound_handler)
+ {
+
globals::s_sound_handler->delete_sound(m_sound_handler_id);
+ }
+ }
+
+
+
+//
+// SWF Tag StartSound (15)
+//
+
+void
+start_sound_tag::read(stream* in, int /* tag_type */, movie_definition* m,
+ const sound_sample* sam)
+{
+ assert(sam);
+
+ in->read_uint(2); // skip reserved bits.
+ m_stop_playback = in->read_uint(1) ? true : false;
+ bool no_multiple = in->read_uint(1) ? true : false;
+ bool has_envelope = in->read_uint(1) ? true : false;
+ bool has_loops = in->read_uint(1) ? true : false;
+ bool has_out_point = in->read_uint(1) ? true : false;
+ bool has_in_point = in->read_uint(1) ? true : false;
+
+ UNUSED(no_multiple);
+ UNUSED(has_envelope);
+
+ uint32_t in_point = 0;
+ uint32_t out_point = 0;
+ if (has_in_point) { in_point = in->read_u32(); }
+ if (has_out_point) { out_point = in->read_u32(); }
+ if (has_loops) { m_loop_count = in->read_u16(); }
+
+ if (has_envelope)
+ {
+ int nPoints = in->read_u8();
+ m_envelopes.resize(nPoints);
+ for (int i=0; i < nPoints; i++)
+ {
+ m_envelopes[i].m_mark44 = in->read_u32();
+ m_envelopes[i].m_level0 = in->read_u16();
+ m_envelopes[i].m_level1 = in->read_u16();
+ }
+ }
+ else
+ {
+ m_envelopes.resize(0);
+ }
+
+ m_handler_id = sam->m_sound_handler_id;
+ m->add_execute_tag(this);
+}
+
+
+void
+start_sound_tag::execute_state(sprite_instance* /* m */)
+{
+ using globals::s_sound_handler;
+
+ //GNASH_REPORT_FUNCTION;
+
+ if (s_sound_handler)
+ {
+ if (m_stop_playback)
+ {
+ s_sound_handler->stop_sound(m_handler_id);
+ }
+ else
+ {
+ s_sound_handler->play_sound(m_handler_id, m_loop_count,
0,0, (m_envelopes.size() == 0 ? NULL : &m_envelopes));
+ }
+ }
+}
+
+//
+// SWF Tag SoundStreamBlock (19)
+//
+
+// Initialize this StartSound tag from the stream & given sample.
+// Insert ourself into the movie.
+void
+start_stream_sound_tag::read(movie_definition* m, int handler_id, long start)
+{
+ m_handler_id = handler_id;
+ m_start = start;
+ m->add_execute_tag(this);
+}
+
+
+void
+start_stream_sound_tag::execute_state(sprite_instance* m)
+{
+ using globals::s_sound_handler;
+ if (s_sound_handler)
+ {
+ // This makes it possible to stop only the stream when
framejumping.
+ m->set_sound_stream_id(m_handler_id);
+ s_sound_handler->play_sound(m_handler_id, 0, 0, m_start, NULL);
+ }
+}
+
+ //
+ // ADPCM
+ //
+
+
+ // Data from Alexis' SWF reference
+ static int s_index_update_table_2bits[2] = { -1, 2 };
+ static int s_index_update_table_3bits[4] = { -1, -1, 2, 4 };
+ static int s_index_update_table_4bits[8] = { -1, -1, -1, -1, 2,
4, 6, 8 };
+ static int s_index_update_table_5bits[16] = { -1, -1, -1, -1, -1,
-1, -1, -1, 1, 2, 4, 6, 8, 10, 13, 16 };
+
+ static int* s_index_update_tables[4] = {
+ s_index_update_table_2bits,
+ s_index_update_table_3bits,
+ s_index_update_table_4bits,
+ s_index_update_table_5bits,
+ };
+
+ // Data from Jansen. http://homepages.cwi.nl/~jack/
+ // Check out his Dutch retro punk songs, heh heh :)
+ const int STEPSIZE_CT = 89;
+ static int s_stepsize[STEPSIZE_CT] = {
+ 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+ 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+ 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+ 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+ 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+ 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+ 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+ 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+ 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+ };
+
+
+ // Algo from
http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
+ // And also Jansen.
+ // Here's another reference:
http://www.geocities.com/SiliconValley/8682/aud3.txt
+ // Original IMA spec doesn't seem to be on the web :(
+
+
+ // @@ lots of macros here! It seems that VC6 can't correctly
+ // handle integer template args, although it's happy to
+ // compile them?!
+
+// void DO_SAMPLE(int n_bits, int& sample, int& stepsize_index, int
raw_code)
+#define DO_SAMPLE(n_bits, sample, stepsize_index, raw_code)
\
+ {
\
+ assert(raw_code >= 0 && raw_code < (1 << n_bits));
\
+
\
+ static const int HI_BIT = (1 << (n_bits - 1));
\
+ int* index_update_table = s_index_update_tables[n_bits - 2];
\
+
\
+ /* Core of ADPCM. */
\
+
\
+ int code_mag = raw_code & (HI_BIT - 1);
\
+ bool code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;
\
+ int mag = (code_mag << 1) + 1; /* shift in LSB (they
do this so that pos & neg zero are different)*/ \
+
\
+ int stepsize = s_stepsize[stepsize_index];
\
+
\
+ /* Compute the new sample. It's the predicted value
*/ \
+ /* (i.e. the previous value), plus a delta. The delta
*/ \
+ /* comes from the code times the stepsize. going for
*/ \
+ /* something like: delta = stepsize * (code * 2 + 1) >>
code_bits */ \
+ int delta = (stepsize * mag) >> (n_bits - 1);
\
+ if (code_sign_bit) delta = -delta;
\
+
\
+ sample += delta;
\
+ sample = iclamp(sample, -32768, 32767);
\
+
\
+ /* Update our stepsize index. Use a lookup table. */
\
+ stepsize_index += index_update_table[code_mag];
\
+ stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);
\
+ }
+
+
+ class in_stream
+ {
+ public:
+ const unsigned char* m_in_data;
+ int m_current_bits;
+ int m_unused_bits;
+
+ in_stream(const unsigned char* data)
+ :
+ m_in_data(data),
+ m_current_bits(0),
+ m_unused_bits(0)
+ {
+ }
+ };
+
+
+// void DO_MONO_BLOCK(int16_t** out_data, int n_bits, int sample_count,
stream* in, int sample, int stepsize_index)
+#define DO_MONO_BLOCK(out_data, n_bits, sample_count, in, sample,
stepsize_index) \
+ {
\
+ /* First sample doesn't need to be decompressed. */
\
+ sample_count--;
\
+ *(*out_data)++ = (int16_t) sample;
\
+
\
+ while (sample_count--)
\
+ {
\
+ int raw_code = in->read_uint(n_bits);
\
+ DO_SAMPLE(n_bits, sample, stepsize_index, raw_code);
/* sample & stepsize_index are in/out params */ \
+ *(*out_data)++ = (int16_t) sample;
\
+ }
\
+ }
+
+
+// void do_stereo_block(
+// int16_t** out_data, // in/out param
+// int n_bits,
+// int sample_count,
+// stream* in,
+// int left_sample,
+// int left_stepsize_index,
+// int right_sample,
+// int right_stepsize_index
+// )
+#define DO_STEREO_BLOCK(out_data, n_bits, sample_count, in, left_sample,
left_stepsize_index, right_sample, right_stepsize_index) \
+ /* Uncompress 4096 stereo sample pairs of ADPCM. */
\
+ {
\
+ /* First samples don't need to be decompressed. */
\
+ sample_count--;
\
+ *(*out_data)++ = (int16_t) left_sample;
\
+ *(*out_data)++ = (int16_t) right_sample;
\
+
\
+ while (sample_count--)
\
+ {
\
+ int left_raw_code = in->read_uint(n_bits);
\
+ DO_SAMPLE(n_bits, left_sample, left_stepsize_index,
left_raw_code); \
+ *(*out_data)++ = (int16_t) left_sample;
\
+
\
+ int right_raw_code = in->read_uint(n_bits);
\
+ DO_SAMPLE(n_bits, right_sample, right_stepsize_index,
right_raw_code); \
+ *(*out_data)++ = (int16_t) right_sample;
\
+ }
\
+ }
+
+
+ // Utility function: uncompress ADPCM data from in stream to
+ // out_data[]. The output buffer must have (sample_count*2)
+ // bytes for mono, or (sample_count*4) bytes for stereo.
+ void sound_handler::adpcm_expand(
+ void* out_data_void,
+ stream* in,
+ int sample_count, // in stereo, this is number of *pairs*
of samples
+ bool stereo)
+ {
+ int16_t* out_data = (int16_t*) out_data_void;
+
+ // Read header.
+ int n_bits = in->read_uint(2) + 2; // 2 to 5 bits
+
+ while (sample_count)
+ {
+ // Read initial sample & index values.
+ int sample = in->read_sint(16);
+
+ int stepsize_index = in->read_uint(6);
+ assert(STEPSIZE_CT >= (1 << 6)); // ensure we
don't need to clamp.
+
+ int samples_this_block = imin(sample_count, 4096);
+ sample_count -= samples_this_block;
+
+ if (stereo == false)
+ {
+#define DO_MONO(n) DO_MONO_BLOCK(&out_data, n, samples_this_block, in, sample,
stepsize_index)
+
+ switch (n_bits)
+ {
+ default: assert(0); break;
+ case 2: DO_MONO(2); break;
+ case 3: DO_MONO(3); break;
+ case 4: DO_MONO(4); break;
+ case 5: DO_MONO(5); break;
+ }
+ }
+ else
+ {
+ // Stereo.
+
+ // Got values for left channel; now get initial
sample
+ // & index for right channel.
+ int right_sample = in->read_sint(16);
+
+ int right_stepsize_index = in->read_uint(6);
+ assert(STEPSIZE_CT >= (1 << 6)); //
ensure we don't need to clamp.
+
+#define DO_STEREO(n) \
+ DO_STEREO_BLOCK( \
+ &out_data, n, samples_this_block, \
+ in, sample, stepsize_index, \
+ right_sample, right_stepsize_index)
+
+ switch (n_bits)
+ {
+ default: assert(0); break;
+ case 2: DO_STEREO(2); break;
+ case 3: DO_STEREO(3); break;
+ case 4: DO_STEREO(4); break;
+ case 5: DO_STEREO(5); break;
+ }
+ }
+ }
+ }
+
+} // namespace gnash
+
+
+// Local Variables:
+// mode: C++
+// c-basic-offset: 8
+// tab-width: 8
+// indent-tabs-mode: t
+// End:
Index: server/parser/sound_definition.h
===================================================================
RCS file: server/parser/sound_definition.h
diff -N server/parser/sound_definition.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ server/parser/sound_definition.h 27 Feb 2007 09:10:20 -0000 1.1
@@ -0,0 +1,129 @@
+//
+// Copyright (C) 2007 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_SOUND_H
+#define GNASH_SOUND_H
+
+
+#include "resource.h" // for sound_sample inheritance
+#include "sound_handler.h"
+#include "execute_tag.h" // for sound tags inheritance
+
+// Forward declarations
+namespace gnash {
+ class movie_definition;
+ class stream;
+}
+
+
+namespace gnash {
+
+class sound_sample: public resource
+{
+public:
+ int m_sound_handler_id;
+
+ sound_sample(int id)
+ :
+ m_sound_handler_id(id)
+ {
+ }
+
+ ~sound_sample();
+
+ sound_sample* cast_to_sound_sample() { return this; }
+};
+
+/// SWF Tag StartSound (15)
+class start_sound_tag : public execute_tag
+{
+public:
+ uint16_t m_handler_id;
+ int m_loop_count;
+ bool m_stop_playback;
+ std::vector<sound_handler::sound_envelope> m_envelopes;
+
+ // envelopes for the current sound instance
+ uint32_t* envelopes;
+
+ start_sound_tag()
+ :
+ m_handler_id(0),
+ m_loop_count(0),
+ m_stop_playback(false)
+ {
+ }
+
+
+ /// \brief
+ /// Initialize this StartSound tag from
+ /// the stream & given sample.
+ //
+ /// Insert ourself into the movie.
+ void read(stream* in, int tag_type,
+ movie_definition* m, const sound_sample* sam);
+
+ /// StartSound is a "state" tag.
+ void execute_state(sprite_instance* m);
+
+ /// This implementation of 'execute' should likely
+ /// be the default one.
+ void execute(sprite_instance* m)
+ {
+ execute_state(m);
+ }
+
+ /// TODO: provide execute_reverse ?
+ /// (for StartSound would StopSound and vice-versa)
+};
+
+/// SWF Tag SoundStreamBlock (19)
+class start_stream_sound_tag : public execute_tag
+{
+public:
+ uint16_t m_handler_id;
+ long m_start;
+ int latency;
+
+ start_stream_sound_tag()
+ :
+ m_handler_id(0),
+ m_start(0),
+ latency(0)
+ {
+ }
+
+
+ /// \brief
+ /// Initialize this StartSound tag
+ /// from the stream & given sample.
+ //
+ /// Insert ourself into the movie.
+ void read(movie_definition* m, int handler_id, long start);
+
+ /// StartStreamSound is a "state" tag.
+ void execute_state(sprite_instance* m);
+
+ void execute(sprite_instance* m)
+ {
+ execute_state(m);
+ }
+};
+
+} // namespace gnash
+
+
+#endif // GNASH_SOUND_H
Index: server/sound.cpp
===================================================================
RCS file: server/sound.cpp
diff -N server/sound.cpp
--- server/sound.cpp 21 Feb 2007 14:51:01 -0000 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,361 +0,0 @@
-// sound.cpp -- Thatcher Ulrich <address@hidden> 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// Code to handle SWF sound-related tags.
-
-
-#include "sound.h"
-#include "stream.h"
-#include "impl.h"
-#include "execute_tag.h" // for start_sound_tag inheritance
-#include "movie_definition.h"
-#include "sprite_instance.h"
-
-namespace gnash {
-
-namespace globals {
-
- // Callback interface to host, for handling sounds. If it's NULL,
- // sound is ignored.
- sound_handler* s_sound_handler = 0;
-
-} // namespace gnash::global
-
-
- void set_sound_handler(sound_handler* s)
- // Called by host, to set a handler for all sounds.
- // Can pass in 0 to disable sound.
- {
- globals::s_sound_handler = s;
- }
-
-
- sound_handler* get_sound_handler()
- {
- return globals::s_sound_handler;
- }
-
-
- sound_sample_impl::~sound_sample_impl()
- {
- if (globals::s_sound_handler)
- {
-
globals::s_sound_handler->delete_sound(m_sound_handler_id);
- }
- }
-
-
-
-//
-// SWF Tag StartSound (15)
-//
-
-void
-start_sound_tag::read(stream* in, int /* tag_type */, movie_definition* m,
- const sound_sample_impl* sam)
-{
- assert(sam);
-
- in->read_uint(2); // skip reserved bits.
- m_stop_playback = in->read_uint(1) ? true : false;
- bool no_multiple = in->read_uint(1) ? true : false;
- bool has_envelope = in->read_uint(1) ? true : false;
- bool has_loops = in->read_uint(1) ? true : false;
- bool has_out_point = in->read_uint(1) ? true : false;
- bool has_in_point = in->read_uint(1) ? true : false;
-
- UNUSED(no_multiple);
- UNUSED(has_envelope);
-
- uint32_t in_point = 0;
- uint32_t out_point = 0;
- if (has_in_point) { in_point = in->read_u32(); }
- if (has_out_point) { out_point = in->read_u32(); }
- if (has_loops) { m_loop_count = in->read_u16(); }
-
- if (has_envelope)
- {
- int nPoints = in->read_u8();
- m_envelopes.resize(nPoints);
- for (int i=0; i < nPoints; i++)
- {
- m_envelopes[i].m_mark44 = in->read_u32();
- m_envelopes[i].m_level0 = in->read_u16();
- m_envelopes[i].m_level1 = in->read_u16();
- }
- }
- else
- {
- m_envelopes.resize(0);
- }
-
- m_handler_id = sam->m_sound_handler_id;
- m->add_execute_tag(this);
-}
-
-
-void
-start_sound_tag::execute_state(sprite_instance* /* m */)
-{
- using globals::s_sound_handler;
-
- //GNASH_REPORT_FUNCTION;
-
- if (s_sound_handler)
- {
- if (m_stop_playback)
- {
- s_sound_handler->stop_sound(m_handler_id);
- }
- else
- {
- s_sound_handler->play_sound(m_handler_id, m_loop_count,
0,0, (m_envelopes.size() == 0 ? NULL : &m_envelopes));
- }
- }
-}
-
-//
-// SWF Tag SoundStreamBlock (19)
-//
-
-// Initialize this StartSound tag from the stream & given sample.
-// Insert ourself into the movie.
-void
-start_stream_sound_tag::read(movie_definition* m, int handler_id, long start)
-{
- m_handler_id = handler_id;
- m_start = start;
- m->add_execute_tag(this);
-}
-
-
-void
-start_stream_sound_tag::execute_state(sprite_instance* m)
-{
- using globals::s_sound_handler;
- if (s_sound_handler)
- {
- // This makes it possible to stop only the stream when
framejumping.
- m->set_sound_stream_id(m_handler_id);
- s_sound_handler->play_sound(m_handler_id, 0, 0, m_start, NULL);
- }
-}
-
- //
- // ADPCM
- //
-
-
- // Data from Alexis' SWF reference
- static int s_index_update_table_2bits[2] = { -1, 2 };
- static int s_index_update_table_3bits[4] = { -1, -1, 2, 4 };
- static int s_index_update_table_4bits[8] = { -1, -1, -1, -1, 2,
4, 6, 8 };
- static int s_index_update_table_5bits[16] = { -1, -1, -1, -1, -1,
-1, -1, -1, 1, 2, 4, 6, 8, 10, 13, 16 };
-
- static int* s_index_update_tables[4] = {
- s_index_update_table_2bits,
- s_index_update_table_3bits,
- s_index_update_table_4bits,
- s_index_update_table_5bits,
- };
-
- // Data from Jansen. http://homepages.cwi.nl/~jack/
- // Check out his Dutch retro punk songs, heh heh :)
- const int STEPSIZE_CT = 89;
- static int s_stepsize[STEPSIZE_CT] = {
- 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
- 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
- 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
- 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
- 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
- 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
- 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
- 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
- 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
- };
-
-
- // Algo from
http://www.circuitcellar.com/pastissues/articles/richey110/text.htm
- // And also Jansen.
- // Here's another reference:
http://www.geocities.com/SiliconValley/8682/aud3.txt
- // Original IMA spec doesn't seem to be on the web :(
-
-
- // @@ lots of macros here! It seems that VC6 can't correctly
- // handle integer template args, although it's happy to
- // compile them?!
-
-// void DO_SAMPLE(int n_bits, int& sample, int& stepsize_index, int
raw_code)
-#define DO_SAMPLE(n_bits, sample, stepsize_index, raw_code)
\
- {
\
- assert(raw_code >= 0 && raw_code < (1 << n_bits));
\
-
\
- static const int HI_BIT = (1 << (n_bits - 1));
\
- int* index_update_table = s_index_update_tables[n_bits - 2];
\
-
\
- /* Core of ADPCM. */
\
-
\
- int code_mag = raw_code & (HI_BIT - 1);
\
- bool code_sign_bit = (raw_code & HI_BIT) ? 1 : 0;
\
- int mag = (code_mag << 1) + 1; /* shift in LSB (they
do this so that pos & neg zero are different)*/ \
-
\
- int stepsize = s_stepsize[stepsize_index];
\
-
\
- /* Compute the new sample. It's the predicted value
*/ \
- /* (i.e. the previous value), plus a delta. The delta
*/ \
- /* comes from the code times the stepsize. going for
*/ \
- /* something like: delta = stepsize * (code * 2 + 1) >>
code_bits */ \
- int delta = (stepsize * mag) >> (n_bits - 1);
\
- if (code_sign_bit) delta = -delta;
\
-
\
- sample += delta;
\
- sample = iclamp(sample, -32768, 32767);
\
-
\
- /* Update our stepsize index. Use a lookup table. */
\
- stepsize_index += index_update_table[code_mag];
\
- stepsize_index = iclamp(stepsize_index, 0, STEPSIZE_CT - 1);
\
- }
-
-
- class in_stream
- {
- public:
- const unsigned char* m_in_data;
- int m_current_bits;
- int m_unused_bits;
-
- in_stream(const unsigned char* data)
- :
- m_in_data(data),
- m_current_bits(0),
- m_unused_bits(0)
- {
- }
- };
-
-
-// void DO_MONO_BLOCK(int16_t** out_data, int n_bits, int sample_count,
stream* in, int sample, int stepsize_index)
-#define DO_MONO_BLOCK(out_data, n_bits, sample_count, in, sample,
stepsize_index) \
- {
\
- /* First sample doesn't need to be decompressed. */
\
- sample_count--;
\
- *(*out_data)++ = (int16_t) sample;
\
-
\
- while (sample_count--)
\
- {
\
- int raw_code = in->read_uint(n_bits);
\
- DO_SAMPLE(n_bits, sample, stepsize_index, raw_code);
/* sample & stepsize_index are in/out params */ \
- *(*out_data)++ = (int16_t) sample;
\
- }
\
- }
-
-
-// void do_stereo_block(
-// int16_t** out_data, // in/out param
-// int n_bits,
-// int sample_count,
-// stream* in,
-// int left_sample,
-// int left_stepsize_index,
-// int right_sample,
-// int right_stepsize_index
-// )
-#define DO_STEREO_BLOCK(out_data, n_bits, sample_count, in, left_sample,
left_stepsize_index, right_sample, right_stepsize_index) \
- /* Uncompress 4096 stereo sample pairs of ADPCM. */
\
- {
\
- /* First samples don't need to be decompressed. */
\
- sample_count--;
\
- *(*out_data)++ = (int16_t) left_sample;
\
- *(*out_data)++ = (int16_t) right_sample;
\
-
\
- while (sample_count--)
\
- {
\
- int left_raw_code = in->read_uint(n_bits);
\
- DO_SAMPLE(n_bits, left_sample, left_stepsize_index,
left_raw_code); \
- *(*out_data)++ = (int16_t) left_sample;
\
-
\
- int right_raw_code = in->read_uint(n_bits);
\
- DO_SAMPLE(n_bits, right_sample, right_stepsize_index,
right_raw_code); \
- *(*out_data)++ = (int16_t) right_sample;
\
- }
\
- }
-
-
- // Utility function: uncompress ADPCM data from in stream to
- // out_data[]. The output buffer must have (sample_count*2)
- // bytes for mono, or (sample_count*4) bytes for stereo.
- void sound_handler::adpcm_expand(
- void* out_data_void,
- stream* in,
- int sample_count, // in stereo, this is number of *pairs*
of samples
- bool stereo)
- {
- int16_t* out_data = (int16_t*) out_data_void;
-
- // Read header.
- int n_bits = in->read_uint(2) + 2; // 2 to 5 bits
-
- while (sample_count)
- {
- // Read initial sample & index values.
- int sample = in->read_sint(16);
-
- int stepsize_index = in->read_uint(6);
- assert(STEPSIZE_CT >= (1 << 6)); // ensure we
don't need to clamp.
-
- int samples_this_block = imin(sample_count, 4096);
- sample_count -= samples_this_block;
-
- if (stereo == false)
- {
-#define DO_MONO(n) DO_MONO_BLOCK(&out_data, n, samples_this_block, in, sample,
stepsize_index)
-
- switch (n_bits)
- {
- default: assert(0); break;
- case 2: DO_MONO(2); break;
- case 3: DO_MONO(3); break;
- case 4: DO_MONO(4); break;
- case 5: DO_MONO(5); break;
- }
- }
- else
- {
- // Stereo.
-
- // Got values for left channel; now get initial
sample
- // & index for right channel.
- int right_sample = in->read_sint(16);
-
- int right_stepsize_index = in->read_uint(6);
- assert(STEPSIZE_CT >= (1 << 6)); //
ensure we don't need to clamp.
-
-#define DO_STEREO(n) \
- DO_STEREO_BLOCK( \
- &out_data, n, samples_this_block, \
- in, sample, stepsize_index, \
- right_sample, right_stepsize_index)
-
- switch (n_bits)
- {
- default: assert(0); break;
- case 2: DO_STEREO(2); break;
- case 3: DO_STEREO(3); break;
- case 4: DO_STEREO(4); break;
- case 5: DO_STEREO(5); break;
- }
- }
- }
- }
-
-} // namespace gnash
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
-// indent-tabs-mode: t
-// End:
Index: server/sound.h
===================================================================
RCS file: server/sound.h
diff -N server/sound.h
--- server/sound.h 21 Feb 2007 14:51:01 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,112 +0,0 @@
-// sound.h -- Thatcher Ulrich, Vitaly Alexeev
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-#ifndef GNASH_SOUND_H
-#define GNASH_SOUND_H
-
-
-namespace gnash {
- class movie_definition;
-}
-
-#include "impl.h"
-#include "execute_tag.h" // for sound tags
-
-namespace gnash {
-
- class sound_sample_impl : public sound_sample
- {
- public:
- int m_sound_handler_id;
-
- sound_sample_impl(int id)
- :
- m_sound_handler_id(id)
- {
- }
-
- virtual ~sound_sample_impl();
- };
-
- /// SWF Tag StartSound (15)
- class start_sound_tag : public execute_tag
- {
- public:
- uint16_t m_handler_id;
- int m_loop_count;
- bool m_stop_playback;
- std::vector<sound_handler::sound_envelope> m_envelopes;
-
- // envelopes for the current sound instance
- uint32_t* envelopes;
-
- start_sound_tag()
- :
- m_handler_id(0),
- m_loop_count(0),
- m_stop_playback(false)
- {
- }
-
-
- /// \brief
- /// Initialize this StartSound tag from
- /// the stream & given sample.
- //
- /// Insert ourself into the movie.
- void read(stream* in, int tag_type,
- movie_definition* m, const sound_sample_impl* sam);
-
- /// StartSound is a "state" tag.
- void execute_state(sprite_instance* m);
-
- /// This implementation of 'execute' should likely
- /// be the default one.
- void execute(sprite_instance* m)
- {
- execute_state(m);
- }
-
- /// TODO: provide execute_reverse ?
- /// (for StartSound would StopSound and vice-versa)
- };
-
- /// SWF Tag SoundStreamBlock (19)
- class start_stream_sound_tag : public execute_tag
- {
- public:
- uint16_t m_handler_id;
- long m_start;
- int latency;
-
- start_stream_sound_tag()
- :
- m_handler_id(0),
- m_start(0),
- latency(0)
- {
- }
-
-
- /// \brief
- /// Initialize this StartSound tag
- /// from the stream & given sample.
- //
- /// Insert ourself into the movie.
- void read(movie_definition* m, int handler_id, long start);
-
- /// StartStreamSound is a "state" tag.
- void execute_state(sprite_instance* m);
-
- void execute(sprite_instance* m)
- {
- execute_state(m);
- }
- };
-
-}
-
-
-#endif // GNASH_SOUND_H
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog backend/Makefile.am backend/sou...,
Sandro Santilli <=