[Gnash-commit] gnash/backend sound_handler.h sound_handler_gst...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/24 22:45:00

Modified files:
        backend        : sound_handler.h sound_handler_gst.h 
                         sound_handler_sdl.h 

Log message:
        reverted faulty code, sorry :(

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- sound_handler.h     24 May 2007 22:27:09 -0000      1.10
+++ sound_handler.h     24 May 2007 22:44:59 -0000      1.11
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.10 2007/05/24 22:27:09 tgc Exp $ */
+/* $Id: sound_handler.h,v 1.11 2007/05/24 22:44:59 tgc Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -42,37 +42,6 @@
 
 namespace gnash {
 
-/// Used to hold the sounddata when doing on-demand-decoding
-class sound_data
-{
-public:
-       // The (un)compressed data
-       guint8* data;
-
-       // data format
-       int format;
-
-       // data size
-       long data_size;
-
-       // stereo or not
-       bool stereo;
-
-       // number of samples
-       int sample_count;
-
-       // sample rate
-       int sample_rate;
-
-       // Volume, SWF range: 0-100, GST range 0-10 (we only use 0-1, the rest 
is amplified)
-       // It's the SWF range that is represented here
-       int volume;
-
-       // gstreamer objects
-       std::vector<gst_elements*>      m_gst_elements;
-
-};
-
 //
 // Sound callback handler.
 //

Index: sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- sound_handler_gst.h 24 May 2007 22:27:09 -0000      1.6
+++ sound_handler_gst.h 24 May 2007 22:44:59 -0000      1.7
@@ -62,6 +62,38 @@
 
 };
 
+
+// Used to hold the sounddata when doing on-demand-decoding
+class sound_data
+{
+public:
+       // The (un)compressed data
+       guint8* data;
+
+       // data format
+       int format;
+
+       // data size
+       long data_size;
+
+       // stereo or not
+       bool stereo;
+
+       // number of samples
+       int sample_count;
+
+       // sample rate
+       int sample_rate;
+
+       // Volume, SWF range: 0-100, GST range 0-10 (we only use 0-1, the rest 
is amplified)
+       // It's the SWF range that is represented here
+       int volume;
+
+       // gstreamer objects
+       std::vector<gst_elements*>      m_gst_elements;
+
+};
+
 // Use gstreamer to handle sounds.
 class GST_sound_handler : public gnash::sound_handler
 {

Index: sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- sound_handler_sdl.h 24 May 2007 22:27:09 -0000      1.22
+++ sound_handler_sdl.h 24 May 2007 22:44:59 -0000      1.23
@@ -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: sound_handler_sdl.h,v 1.22 2007/05/24 22:27:09 tgc Exp $
+// $Id: sound_handler_sdl.h,v 1.23 2007/05/24 22:44:59 tgc Exp $
 
 #ifndef SOUND_HANDLER_SDL_H
 #define SOUND_HANDLER_SDL_H
@@ -109,6 +109,39 @@
 
 };
 
+
+/// Used to hold the sounddata when doing on-demand-decoding
+class sound_data
+{
+public:
+       /// The undecoded data
+       uint8_t* data;
+
+       /// Format of the sound (MP3, raw, etc).
+       int format;
+
+       /// The size of the undecoded data
+       long data_size;
+
+       /// Stereo or not
+       bool stereo;
+
+       /// Number of samples
+       int sample_count;
+
+       /// Sample rate
+       int sample_rate;
+
+       /// Volume for AS-sounds, range: 0-100.
+       /// It's the SWF range that is represented here.
+       int volume;
+
+       /// Vector containing the active instances of this sounds being played
+       std::vector<active_sound*>      m_active_sounds;
+
+};
+
+
 // Use SDL and ffmpeg/mad/nothing to handle sounds.
 class SDL_sound_handler : public gnash::sound_handler
 {