[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h gui...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h gui... |
|
Date: |
Sat, 24 Nov 2007 17:21:46 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/11/24 17:21:45
Modified files:
. : ChangeLog
gui : Player.cpp Player.h gui.cpp
libmedia : AudioDecoder.h AudioDecoderNellymoser.cpp
AudioDecoderNellymoser.h AudioDecoderSimple.cpp
AudioDecoderSimple.h FLVParser.cpp FLVParser.h
MediaBuffer.h MediaDecoder.h MediaParser.h
SoundInfo.h VideoDecoder.h sound_handler.h
libmedia/gst : VideoDecoderGst.cpp VideoDecoderGst.h
sound_handler_gst.cpp sound_handler_gst.h
libmedia/sdl : AudioDecoderFfmpeg.cpp AudioDecoderFfmpeg.h
AudioDecoderMad.cpp AudioDecoderMad.h
MediaDecoderSdl.cpp MediaDecoderSdl.h
MediaParserFfmpeg.cpp MediaParserFfmpeg.h
VideoDecoderFfmpeg.cpp VideoDecoderFfmpeg.h
sound_handler_sdl.cpp sound_handler_sdl.h
plugin/win32 : plugin.cpp
server : button_character_instance.cpp gnash.h impl.cpp
sprite_instance.cpp
server/asobj : NetStreamFfmpeg.cpp NetStreamGst.cpp Sound.cpp
SoundFfmpeg.cpp SoundGst.cpp SoundMad.cpp
server/parser : button_character_def.h sound_definition.cpp
video_stream_def.cpp video_stream_def.h
server/swf : StartSoundTag.cpp StartSoundTag.h
tag_loaders.cpp
server/vm : ASHandlers.cpp
testsuite : MovieTester.h
Log message:
Put libmedia in its own namespace (gnash::media)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4952&r2=1.4953
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoder.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaBuffer.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaDecoder.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/SoundInfo.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/VideoDecoder.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sound_handler.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/sound_handler_gst.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/sound_handler_gst.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.395&r2=1.396
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4952
retrieving revision 1.4953
diff -u -b -r1.4952 -r1.4953
--- ChangeLog 24 Nov 2007 16:47:09 -0000 1.4952
+++ ChangeLog 24 Nov 2007 17:21:41 -0000 1.4953
@@ -1,3 +1,32 @@
+2007-11-24 Sandro Santilli <address@hidden>
+
+ * gui/Player.{cpp,h}, gui/gui.cpp, libmedia/AudioDecoder.h,
+ libmedia/AudioDecoderNellymoser.{cpp,h},
+ libmedia/AudioDecoderSimple.{cpp,h}, libmedia/FLVParser.{cpp,h},
+ libmedia/MediaBuffer.h, libmedia/MediaDecoder.h,
+ libmedia/MediaParser.h, libmedia/SoundInfo.h,
+ libmedia/VideoDecoder.h, libmedia/sound_handler.h,
+ libmedia/gst/VideoDecoderGst.{cpp,h},
+ libmedia/gst/sound_handler_gst.{cpp,h},
+ libmedia/sdl/AudioDecoderFfmpeg.{cpp,h},
+ libmedia/sdl/AudioDecoderMad.{cpp,h},
+ libmedia/sdl/MediaDecoderSdl.{cpp,h},
+ libmedia/sdl/MediaParserFfmpeg.{cpp,h},
+ libmedia/sdl/VideoDecoderFfmpeg.{cpp,h},
+ libmedia/sdl/sound_handler_sdl.cpp,
+ libmedia/sdl/sound_handler_sdl.h, plugin/win32/plugin.cpp,
+ server/button_character_instance.cpp, server/gnash.h,
+ server/impl.cpp, server/sprite_instance.cpp,
+ server/asobj/NetStreamFfmpeg.cpp, server/asobj/NetStreamGst.cpp,
+ server/asobj/Sound.cpp, server/asobj/SoundFfmpeg.cpp,
+ server/asobj/SoundGst.cpp, server/asobj/SoundMad.cpp,
+ server/parser/button_character_def.h,
+ server/parser/sound_definition.cpp,
+ server/parser/video_stream_def.{cpp,h},
+ server/swf/StartSoundTag.{cpp,h}, server/swf/tag_loaders.cpp,
+ server/vm/ASHandlers.cpp, testsuite/MovieTester.h:
+ Put libmedia in its own namespace (gnash::media).
+
2007-11-24 Rob Savoye <address@hidden>
* macros/libtool.m4: Move the serial numbers to the top of the
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- gui/Player.cpp 17 Nov 2007 10:17:39 -0000 1.70
+++ gui/Player.cpp 24 Nov 2007 17:21:41 -0000 1.71
@@ -161,9 +161,9 @@
{
if (do_sound) {
#ifdef SOUND_SDL
- _sound_handler.reset( gnash::create_sound_handler_sdl() );
+ _sound_handler.reset( gnash::media::create_sound_handler_sdl() );
#elif defined(SOUND_GST)
- _sound_handler.reset( gnash::create_sound_handler_gst() );
+ _sound_handler.reset( gnash::media::create_sound_handler_gst() );
#else
log_error(_("Sound requested but no sound support compiled in"));
return;
Index: gui/Player.h
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gui/Player.h 1 Oct 2007 21:47:04 -0000 1.18
+++ gui/Player.h 24 Nov 2007 17:21:41 -0000 1.19
@@ -184,7 +184,7 @@
std::auto_ptr<Gui> _gui;
- std::auto_ptr<sound_handler> _sound_handler;
+ std::auto_ptr<media::sound_handler> _sound_handler;
std::string _url;
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- gui/gui.cpp 6 Nov 2007 15:43:41 -0000 1.114
+++ gui/gui.cpp 24 Nov 2007 17:21:41 -0000 1.115
@@ -302,7 +302,7 @@
Gui::menu_toggle_sound()
{
// GNASH_REPORT_FUNCTION;
- sound_handler* snd_handler = get_sound_handler();
+ media::sound_handler* snd_handler = get_sound_handler();
if (!snd_handler)
return;
Index: libmedia/AudioDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoder.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/AudioDecoder.h 4 Oct 2007 09:37:50 -0000 1.4
+++ libmedia/AudioDecoder.h 24 Nov 2007 17:21:41 -0000 1.5
@@ -16,7 +16,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: AudioDecoder.h,v 1.4 2007/10/04 09:37:50 tgc Exp $
+// $Id: AudioDecoder.h,v 1.5 2007/11/24 17:21:41 strk Exp $
#ifndef __AUDIODECODER_H__
#define __AUDIODECODER_H__
@@ -25,6 +25,7 @@
#include "SoundInfo.h"
namespace gnash {
+namespace media {
/// Audio decoding base class.
class AudioDecoder {
@@ -80,6 +81,7 @@
};
+} // gnash.media namespace
} // gnash namespace
#endif // __AUDIODECODER_H__
Index: libmedia/AudioDecoderNellymoser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/AudioDecoderNellymoser.cpp 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/AudioDecoderNellymoser.cpp 24 Nov 2007 17:21:42 -0000 1.4
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderNellymoser.cpp,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: AudioDecoderNellymoser.cpp,v 1.4 2007/11/24 17:21:42 strk Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -54,6 +54,7 @@
#include <math.h>
namespace gnash {
+namespace media {
float nelly_neg_unpack_table[64] = {
-0.0061359000, -0.0306748003, -0.0551952012, -0.0796824023, -0.1041216031,
@@ -823,5 +824,6 @@
return tmp_raw_buffer;
}
+} // gnash.media namespace
} // namespace gnash
Index: libmedia/AudioDecoderNellymoser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/AudioDecoderNellymoser.h 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/AudioDecoderNellymoser.h 24 Nov 2007 17:21:42 -0000 1.4
@@ -16,7 +16,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: AudioDecoderNellymoser.h,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: AudioDecoderNellymoser.h,v 1.4 2007/11/24 17:21:42 strk Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -67,6 +67,7 @@
} nelly_handle;
namespace gnash {
+namespace media {
/// Audio decoding using internal Nellymoser decoder.
class AudioDecoderNellymoser : public AudioDecoder {
@@ -92,6 +93,7 @@
bool _stereo;
};
+} // gnash.media namespace
} // gnash namespace
#endif // __AUDIODECODERNELLYMOSER_H__
Index: libmedia/AudioDecoderSimple.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/AudioDecoderSimple.cpp 30 Oct 2007 18:55:41 -0000 1.6
+++ libmedia/AudioDecoderSimple.cpp 24 Nov 2007 17:21:42 -0000 1.7
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderSimple.cpp,v 1.6 2007/10/30 18:55:41 strk Exp $
+// $Id: AudioDecoderSimple.cpp,v 1.7 2007/11/24 17:21:42 strk Exp $
#include <boost/scoped_array.hpp>
@@ -26,6 +26,7 @@
#include "BitsReader.h"
namespace gnash {
+namespace media {
// ----------------------------------------------------------------------------
// ADPCMDecoder class
@@ -425,4 +426,5 @@
return tmp_raw_buffer;
}
+} // gnash.media namespace
} // gnash namespace
Index: libmedia/AudioDecoderSimple.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/AudioDecoderSimple.h 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/AudioDecoderSimple.h 24 Nov 2007 17:21:42 -0000 1.4
@@ -16,7 +16,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: AudioDecoderSimple.h,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: AudioDecoderSimple.h,v 1.4 2007/11/24 17:21:42 strk Exp $
#ifndef __AUDIODECODERSIMPLE_H__
#define __AUDIODECODERSIMPLE_H__
@@ -29,6 +29,7 @@
}
namespace gnash {
+namespace media {
/// Audio decoding using "simple" internal decoders.
class AudioDecoderSimple : public AudioDecoder {
@@ -64,6 +65,7 @@
//
};
+} // gnash.media namespace
} // gnash namespace
#endif // __AUDIODECODERSIMPLE_H__
Index: libmedia/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/FLVParser.cpp 27 Sep 2007 23:59:53 -0000 1.1
+++ libmedia/FLVParser.cpp 24 Nov 2007 17:21:42 -0000 1.2
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.1 2007/09/27 23:59:53 tgc Exp $
+// $Id: FLVParser.cpp,v 1.2 2007/11/24 17:21:42 strk Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -29,6 +29,7 @@
//#define GNASH_DEBUG_SEEK 1
namespace gnash {
+namespace media {
FLVParser::FLVParser(tu_file* stream)
:
@@ -697,6 +698,7 @@
return (in[0] << 16) | (in[1] << 8) | in[2];
}
+} // gnash.media namespace
} // end of gnash namespace
#undef PADDING_BYTES
Index: libmedia/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/FLVParser.h 26 Oct 2007 18:43:35 -0000 1.2
+++ libmedia/FLVParser.h 24 Nov 2007 17:21:42 -0000 1.3
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.2 2007/10/26 18:43:35 tgc Exp $
+// $Id: FLVParser.h,v 1.3 2007/11/24 17:21:42 strk Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -32,6 +32,7 @@
#define HEADER_SKIP 15
namespace gnash {
+namespace media {
enum {
CONTAINS_VIDEO = 1,
@@ -265,6 +266,7 @@
boost::mutex _mutex;
};
+} // gnash.media namespace
} // end of gnash namespace
#endif // __FLVPARSER_H__
Index: libmedia/MediaBuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaBuffer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/MediaBuffer.h 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/MediaBuffer.h 24 Nov 2007 17:21:42 -0000 1.4
@@ -16,7 +16,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: MediaBuffer.h,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: MediaBuffer.h,v 1.4 2007/11/24 17:21:42 strk Exp $
#ifndef __MEDIABUFFER_H__
#define __MEDIABUFFER_H__
@@ -25,6 +25,7 @@
#include <queue>
namespace gnash {
+namespace media {
/// This class is used to store decoded video or audio data
@@ -255,6 +256,7 @@
uint32_t _bufferTime;
};
+} // gnash.media namespace
} // gnash namespace
#endif // __MEDIABUFFER_H__
Index: libmedia/MediaDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaDecoder.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/MediaDecoder.h 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/MediaDecoder.h 24 Nov 2007 17:21:42 -0000 1.4
@@ -16,7 +16,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: MediaDecoder.h,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: MediaDecoder.h,v 1.4 2007/11/24 17:21:42 strk Exp $
#ifndef __MEDIADECODER_H__
#define __MEDIADECODER_H__
@@ -37,6 +37,7 @@
#endif
namespace gnash {
+namespace media {
/// \brief
@@ -233,6 +234,7 @@
};
+} // gnash.media namespace
} // namespace gnash
#endif // __MEDIADECODER_H__
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/MediaParser.h 26 Oct 2007 18:43:36 -0000 1.7
+++ libmedia/MediaParser.h 24 Nov 2007 17:21:42 -0000 1.8
@@ -16,7 +16,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: MediaParser.h,v 1.7 2007/10/26 18:43:36 tgc Exp $
+// $Id: MediaParser.h,v 1.8 2007/11/24 17:21:42 strk Exp $
#ifndef __MEDIAPARSER_H__
#define __MEDIAPARSER_H__
@@ -37,6 +37,7 @@
#include <memory>
namespace gnash {
+namespace media {
/// Video frame types
enum videoFrameType
@@ -274,6 +275,7 @@
};
+} // gnash.media namespace
} // namespace gnash
#endif // __MEDIAPARSER_H__
Index: libmedia/SoundInfo.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/SoundInfo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/SoundInfo.h 4 Oct 2007 09:37:50 -0000 1.2
+++ libmedia/SoundInfo.h 24 Nov 2007 17:21:42 -0000 1.3
@@ -18,7 +18,7 @@
//
//
-// $Id: SoundInfo.h,v 1.2 2007/10/04 09:37:50 tgc Exp $
+// $Id: SoundInfo.h,v 1.3 2007/11/24 17:21:42 strk Exp $
#ifndef __SOUNDINFO_H__
#define __SOUNDINFO_H__
@@ -26,6 +26,7 @@
#include "MediaParser.h"
namespace gnash {
+namespace media {
///
/// Class containing information about a sound. Is created by the parser while
@@ -109,6 +110,7 @@
bool _is16bit;
};
+} // gnash.media namespace
} // namespace gnash
#endif // __SOUNDINFO_H__
Index: libmedia/VideoDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/VideoDecoder.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/VideoDecoder.h 26 Oct 2007 18:43:36 -0000 1.7
+++ libmedia/VideoDecoder.h 24 Nov 2007 17:21:42 -0000 1.8
@@ -16,7 +16,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: VideoDecoder.h,v 1.7 2007/10/26 18:43:36 tgc Exp $
+// $Id: VideoDecoder.h,v 1.8 2007/11/24 17:21:42 strk Exp $
#ifndef __VIDEODECODER_H__
#define __VIDEODECODER_H__
@@ -25,6 +25,7 @@
#include "image.h"
namespace gnash {
+namespace media {
/// Video decoding base class.
class VideoDecoder {
@@ -112,6 +113,7 @@
};
+} // gnash.media namespace
} // gnash namespace
#endif // __VIDEODECODER_H__
Index: libmedia/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sound_handler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/sound_handler.h 23 Oct 2007 18:13:59 -0000 1.2
+++ libmedia/sound_handler.h 24 Nov 2007 17:21:42 -0000 1.3
@@ -18,7 +18,7 @@
//
//
-/* $Id: sound_handler.h,v 1.2 2007/10/23 18:13:59 strk Exp $ */
+/* $Id: sound_handler.h,v 1.3 2007/11/24 17:21:42 strk Exp $ */
/// \page sound_handler_intro Sound handler introduction
///
@@ -48,6 +48,12 @@
namespace gnash {
+/// Gnash media subsystem (libmedia)
+//
+/// See http://wiki.gnashdev.org/wiki/index.php/Libmedia
+///
+namespace media {
+
/// A buffer of bytes
class Buffer {
public:
@@ -522,6 +528,7 @@
+} // gnash.media namespace
} // namespace gnash
#endif // SOUND_HANDLER_H
Index: libmedia/gst/VideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/gst/VideoDecoderGst.cpp 26 Oct 2007 18:43:36 -0000 1.4
+++ libmedia/gst/VideoDecoderGst.cpp 24 Nov 2007 17:21:42 -0000 1.5
@@ -16,7 +16,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: VideoDecoderGst.cpp,v 1.4 2007/10/26 18:43:36 tgc Exp $
+// $Id: VideoDecoderGst.cpp,v 1.5 2007/11/24 17:21:42 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -27,6 +27,7 @@
#include "VideoDecoderGst.h"
namespace gnash {
+namespace media {
VideoDecoderGst::VideoDecoderGst() :
pipeline(NULL),
@@ -288,6 +289,7 @@
}
+} // gnash.media namespace
} // end of gnash namespace
#endif // SOUND_GST
Index: libmedia/gst/VideoDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/gst/VideoDecoderGst.h 26 Oct 2007 18:43:36 -0000 1.6
+++ libmedia/gst/VideoDecoderGst.h 24 Nov 2007 17:21:42 -0000 1.7
@@ -16,7 +16,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: VideoDecoderGst.h,v 1.6 2007/10/26 18:43:36 tgc Exp $
+// $Id: VideoDecoderGst.h,v 1.7 2007/11/24 17:21:42 strk Exp $
#ifndef __VIDEODECODERGST_H__
#define __VIDEODECODERGST_H__
@@ -35,6 +35,7 @@
#include <boost/thread/mutex.hpp>
namespace gnash {
+namespace media {
/// Video decoding using Gstreamer.
class VideoDecoderGst : public VideoDecoder {
@@ -98,6 +99,7 @@
};
+} // gnash.media namespace
} // gnash namespace
#endif // __VIDEODECODERGST_H__
Index: libmedia/gst/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/sound_handler_gst.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/sound_handler_gst.cpp 27 Sep 2007 23:59:54 -0000 1.1
+++ libmedia/gst/sound_handler_gst.cpp 24 Nov 2007 17:21:42 -0000 1.2
@@ -20,7 +20,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-/* $Id: sound_handler_gst.cpp,v 1.1 2007/09/27 23:59:54 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.2 2007/11/24 17:21:42 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,6 +50,7 @@
using namespace boost;
namespace gnash {
+namespace media {
GST_sound_handler::GST_sound_handler()
: looping(false),
@@ -702,6 +703,7 @@
return new GST_sound_handler;
}
+} // gnash.media namespace
} // namespace gnash
#endif // SOUND_GST
Index: libmedia/gst/sound_handler_gst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/sound_handler_gst.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/gst/sound_handler_gst.h 4 Oct 2007 09:37:50 -0000 1.3
+++ libmedia/gst/sound_handler_gst.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -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_gst.h,v 1.3 2007/10/04 09:37:50 tgc Exp $
+// $Id: sound_handler_gst.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef SOUND_HANDLER_GST_H
#define SOUND_HANDLER_GST_H
@@ -32,6 +32,7 @@
#define BUFFER_SIZE 5000
namespace gnash {
+namespace media {
// forward declaration
class GST_sound_handler;
@@ -127,7 +128,7 @@
};
// Use gstreamer to handle sounds.
-class GST_sound_handler : public gnash::sound_handler
+class GST_sound_handler : public sound_handler
{
private:
/// Vector containing all the sounds
@@ -200,6 +201,7 @@
};
+} // gnash.media namespace
} // namespace gnash
#endif // SOUND_HANDLER_GST_H
Index: libmedia/sdl/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/AudioDecoderFfmpeg.cpp 6 Oct 2007 09:53:45 -0000 1.5
+++ libmedia/sdl/AudioDecoderFfmpeg.cpp 24 Nov 2007 17:21:43 -0000 1.6
@@ -17,11 +17,12 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderFfmpeg.cpp,v 1.5 2007/10/06 09:53:45 tgc Exp $
+// $Id: AudioDecoderFfmpeg.cpp,v 1.6 2007/11/24 17:21:43 strk Exp $
#include "AudioDecoderFfmpeg.h"
namespace gnash {
+namespace media {
AudioDecoderFfmpeg::AudioDecoderFfmpeg ()
:
@@ -253,4 +254,5 @@
}
-}
+} // gnash.media namespace
+} // gnash namespace
Index: libmedia/sdl/AudioDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/AudioDecoderFfmpeg.h 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/AudioDecoderFfmpeg.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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: AudioDecoderFfmpeg.h,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: AudioDecoderFfmpeg.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef __AUDIODECODERFFMPEG_H__
#define __AUDIODECODERFFMPEG_H__
@@ -33,6 +33,7 @@
#include "AudioDecoder.h"
namespace gnash {
+namespace media {
/// This class is used to provide an easy interface to libavcodecs audio
resampler.
///
@@ -110,6 +111,7 @@
AudioResampler _resampler;
};
+} // gnash.media namespace
} // gnash namespace
#endif // __AUDIODECODERFFMPEG_H__
Index: libmedia/sdl/AudioDecoderMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/sdl/AudioDecoderMad.cpp 8 Oct 2007 11:00:06 -0000 1.4
+++ libmedia/sdl/AudioDecoderMad.cpp 24 Nov 2007 17:21:43 -0000 1.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderMad.cpp,v 1.4 2007/10/08 11:00:06 tgc Exp $
+// $Id: AudioDecoderMad.cpp,v 1.5 2007/11/24 17:21:43 strk Exp $
#include "AudioDecoderMad.h"
#include "utility.h"
@@ -26,6 +26,7 @@
#endif
namespace gnash {
+namespace media {
AudioDecoderMad::AudioDecoderMad ()
{
@@ -170,5 +171,6 @@
return tmp_raw_buffer;
}
+} // gnash.media namespace
} // gnash namespace
Index: libmedia/sdl/AudioDecoderMad.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/AudioDecoderMad.h 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/AudioDecoderMad.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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: AudioDecoderMad.h,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: AudioDecoderMad.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef __AUDIODECODERMAD_H__
#define __AUDIODECODERMAD_H__
@@ -28,6 +28,7 @@
namespace gnash {
+namespace media {
class AudioDecoderMad : public AudioDecoder {
@@ -48,6 +49,7 @@
mad_synth _synth;
};
+} // gnash.media namespace
} // gnash namespace
#endif // __AUDIODECODERMAD_H__
Index: libmedia/sdl/MediaDecoderSdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/MediaDecoderSdl.cpp 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/MediaDecoderSdl.cpp 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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: MediaDecoderSdl.cpp,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: MediaDecoderSdl.cpp,v 1.4 2007/11/24 17:21:43 strk Exp $
#include "MediaDecoderSdl.h"
#include "AudioDecoderNellymoser.h"
@@ -43,6 +43,7 @@
#endif
namespace gnash {
+namespace media {
MediaDecoderSdl::MediaDecoderSdl(tu_file* stream, MediaBuffer* buffer,
uint16_t swfVersion, int format)
:
@@ -304,4 +305,5 @@
}
+} // gnash.media namespace
} // namespace gnash
Index: libmedia/sdl/MediaDecoderSdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/MediaDecoderSdl.h 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/MediaDecoderSdl.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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: MediaDecoderSdl.h,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: MediaDecoderSdl.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef __MEDIADECODERFFMPEG_H__
#define __MEDIADECODERFFMPEG_H__
@@ -37,6 +37,7 @@
#include "image.h"
namespace gnash {
+namespace media {
/// Media decoding using libs, used with sdl soundhandler.
class MediaDecoderSdl: public MediaDecoder {
@@ -152,6 +153,7 @@
std::auto_ptr<VideoDecoder> _videoDecoder;
};
+} // gnash.media namespace
} // namespace gnash
#endif // __MEDIADECODERFFMPEG_H__
Index: libmedia/sdl/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/MediaParserFfmpeg.cpp 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/MediaParserFfmpeg.cpp 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,13 +16,14 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: MediaParserFfmpeg.cpp,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: MediaParserFfmpeg.cpp,v 1.4 2007/11/24 17:21:43 strk Exp $
#include "MediaParserFfmpeg.h"
#include "log.h"
#include <boost/scoped_array.hpp>
namespace gnash {
+namespace media {
MediaParserFfmpeg::MediaParserFfmpeg(tu_file* stream)
:
@@ -404,4 +405,5 @@
return decoder->_inputPos;
}
+} // gnash.media namespace
} // namespace gnash
Index: libmedia/sdl/MediaParserFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/MediaParserFfmpeg.h 4 Oct 2007 09:41:46 -0000 1.3
+++ libmedia/sdl/MediaParserFfmpeg.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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: MediaParserFfmpeg.h,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: MediaParserFfmpeg.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef __MEDIAPARSERFFMPEG_H__
#define __MEDIAPARSERFFMPEG_H__
@@ -37,6 +37,7 @@
}
namespace gnash {
+namespace media {
@@ -123,6 +124,7 @@
+} // gnash.media namespace
} // namespace gnash
#endif // __MEDIAPARSERFFMPEG_H__
Index: libmedia/sdl/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/sdl/VideoDecoderFfmpeg.cpp 30 Oct 2007 18:55:42 -0000 1.8
+++ libmedia/sdl/VideoDecoderFfmpeg.cpp 24 Nov 2007 17:21:43 -0000 1.9
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: VideoDecoderFfmpeg.cpp,v 1.8 2007/10/30 18:55:42 strk Exp $
+// $Id: VideoDecoderFfmpeg.cpp,v 1.9 2007/11/24 17:21:43 strk Exp $
#include "VideoDecoderFfmpeg.h"
@@ -29,6 +29,7 @@
#include <boost/scoped_array.hpp>
namespace gnash {
+namespace media {
VideoDecoderFfmpeg::VideoDecoderFfmpeg ()
:
@@ -335,4 +336,5 @@
}
-}
+} // gnash.media namespace
+} // gnash namespace
Index: libmedia/sdl/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/sdl/VideoDecoderFfmpeg.h 26 Oct 2007 18:43:36 -0000 1.7
+++ libmedia/sdl/VideoDecoderFfmpeg.h 24 Nov 2007 17:21:43 -0000 1.8
@@ -16,7 +16,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: VideoDecoderFfmpeg.h,v 1.7 2007/10/26 18:43:36 tgc Exp $
+// $Id: VideoDecoderFfmpeg.h,v 1.8 2007/11/24 17:21:43 strk Exp $
#ifndef __VIDEODECODERFFMPEG_H__
#define __VIDEODECODERFFMPEG_H__
@@ -34,6 +34,7 @@
namespace gnash {
+namespace media {
class VideoDecoderFfmpeg : public VideoDecoder {
@@ -67,6 +68,7 @@
};
+} // gnash.media namespace
} // gnash namespace
#endif // __VIDEODECODERFFMPEG_H__
Index: libmedia/sdl/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/sound_handler_sdl.cpp 8 Oct 2007 11:00:06 -0000 1.5
+++ libmedia/sdl/sound_handler_sdl.cpp 24 Nov 2007 17:21:43 -0000 1.6
@@ -20,7 +20,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-// $Id: sound_handler_sdl.cpp,v 1.5 2007/10/08 11:00:06 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.6 2007/11/24 17:21:43 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,6 +45,7 @@
#include <SDL.h>
namespace gnash {
+namespace media {
SDL_sound_handler::SDL_sound_handler()
: soundOpened(false),
@@ -799,6 +800,7 @@
}
+} // gnash.media namespace
} // namespace gnash
// Local Variables:
Index: libmedia/sdl/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/sound_handler_sdl.h 3 Oct 2007 21:43:05 -0000 1.3
+++ libmedia/sdl/sound_handler_sdl.h 24 Nov 2007 17:21:43 -0000 1.4
@@ -16,7 +16,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.3 2007/10/03 21:43:05 tgc Exp $
+// $Id: sound_handler_sdl.h,v 1.4 2007/11/24 17:21:43 strk Exp $
#ifndef SOUND_HANDLER_SDL_H
#define SOUND_HANDLER_SDL_H
@@ -44,6 +44,7 @@
#include <boost/thread/mutex.hpp>
namespace gnash {
+namespace media {
class active_sound;
@@ -172,7 +173,7 @@
/// Sound envelopes for the current sound, which determine the volume
level
/// from a given position. Only used with sound events.
- const std::vector<gnash::sound_handler::sound_envelope>* envelopes;
+ const std::vector<sound_handler::sound_envelope>* envelopes;
/// Index of current envelope.
uint32_t current_env;
@@ -280,7 +281,7 @@
}
// Use SDL and ffmpeg/mad/nothing to handle sounds.
-class SDL_sound_handler : public gnash::sound_handler
+class SDL_sound_handler : public sound_handler
{
private:
/// NetStream audio callbacks
@@ -387,6 +388,7 @@
static void sdl_audio_callback (void *udata, Uint8 *stream, int
buffer_length_in);
};
+} // gnash.media namespace
} // namespace gnash
#endif // SOUND_HANDLER_SDL_H
Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- plugin/win32/plugin.cpp 1 Jul 2007 10:54:17 -0000 1.9
+++ plugin/win32/plugin.cpp 24 Nov 2007 17:21:43 -0000 1.10
@@ -241,7 +241,7 @@
gnash::render_handler *render = gnash::create_render_handler_ogl();
gnash::set_render_handler(render);
- gnash::sound_handler *sound = NULL;
+ gnash::media::sound_handler *sound = NULL;
#ifdef SOUND_SDL
// It leads to crash
// sound = gnash::create_sound_handler_sdl();
Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/button_character_instance.cpp 16 Nov 2007 07:43:53 -0000
1.65
+++ server/button_character_instance.cpp 24 Nov 2007 17:21:44 -0000
1.66
@@ -512,7 +512,7 @@
if (m_def->m_sound != NULL)
{
int bi; // button sound array index [0..3]
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
// Check if there is a sound handler
if (s != NULL) {
Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- server/gnash.h 10 Nov 2007 11:51:43 -0000 1.111
+++ server/gnash.h 24 Nov 2007 17:21:44 -0000 1.112
@@ -42,25 +42,23 @@
#undef INVALID
#undef ESCAPE
+class tu_file; // for file_opener_callback typedef
+namespace gnash {
+ class sprite_instance; // for fscommand_callback typedef
+ class movie_definition; // for create_movie
+ class render_handler; // for set_render_handler
+ class URL; // for set_base_url
+ namespace media {
+ class sound_handler; // for set_sound_handler
+ }
+}
// @@ forward decl to avoid including base/image.h; TODO change the
// render_handler interface to not depend on these classes at all.
namespace image { class image_base; class rgb; class rgba; }
-
-// forward decl
namespace jpeg { class input; }
-class tu_file; // for file_opener_callback typedef
-
namespace gnash {
-// Forward declarations.
-class sprite_instance; // for fscommand_callback typedef
-class movie_definition; // for create_movie
-class render_handler; // for set_render_handler
-class sound_handler; // for set_sound_handler
-class URL; // for set_base_url
-
-
// Sound callbacks stuff
/// \brief
@@ -71,10 +69,10 @@
/// 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);
+DSOEXPORT void set_sound_handler(media::sound_handler* s);
/// Get currently registered sound handler
-DSOEXPORT sound_handler* get_sound_handler();
+DSOEXPORT media::sound_handler* get_sound_handler();
///
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/impl.cpp 23 Nov 2007 22:23:24 -0000 1.125
+++ server/impl.cpp 24 Nov 2007 17:21:44 -0000 1.126
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: impl.cpp,v 1.125 2007/11/23 22:23:24 strk Exp $ */
+/* $Id: impl.cpp,v 1.126 2007/11/24 17:21:44 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -86,9 +86,9 @@
} // namespace gnash::global
// global Sound handler stuff. Should this be moved to the VM class ?
-static sound_handler* _sound_handler = 0;
-void set_sound_handler(sound_handler* s) { _sound_handler = s; }
-sound_handler* get_sound_handler() { return _sound_handler; }
+static media::sound_handler* _sound_handler = 0;
+void set_sound_handler(media::sound_handler* s) { _sound_handler = s; }
+media::sound_handler* get_sound_handler() { return _sound_handler; }
void
set_base_url(const URL& url)
@@ -834,7 +834,7 @@
{
public:
render_handler* m_original_rh;
- sound_handler* m_original_sh;
+ media::sound_handler* m_original_sh;
save_stuff()
{
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- server/sprite_instance.cpp 23 Nov 2007 12:21:26 -0000 1.395
+++ server/sprite_instance.cpp 24 Nov 2007 17:21:44 -0000 1.396
@@ -177,12 +177,12 @@
// Stop sound stream as well, if such exist
int stream_id = sprite->get_sound_stream_id();
if (sprite->get_sound_stream_id() != -1) {
- sound_handler* sh = get_sound_handler();
+ media::sound_handler* sh = get_sound_handler();
if (sh != NULL) sh->stop_sound(stream_id);
sprite->set_sound_stream_id(-1);
}
-/* sound_handler* sh = get_sound_handler();
+/* media::sound_handler* sh = get_sound_handler();
if (sh != NULL) sh->stop_all_sounds();*/
return as_value();
}
@@ -2676,7 +2676,7 @@
int stream_id = get_sound_stream_id();
if (target_frame_number != m_current_frame+1 && stream_id != -1)
{
- sound_handler* sh = get_sound_handler();
+ media::sound_handler* sh = get_sound_handler();
if (sh != NULL) sh->stop_sound(stream_id);
set_sound_stream_id(-1);
}
@@ -3238,7 +3238,7 @@
void sprite_instance::restart()
{
// Stop all sounds
- sound_handler* sh = get_sound_handler();
+ media::sound_handler* sh = get_sound_handler();
if (sh != NULL) sh->stop_all_sounds();
restoreDisplayList(0); // seems OK to me.
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/asobj/NetStreamFfmpeg.cpp 30 Oct 2007 18:55:43 -0000 1.94
+++ server/asobj/NetStreamFfmpeg.cpp 24 Nov 2007 17:21:44 -0000 1.95
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.94 2007/10/30 18:55:43 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.95 2007/11/24 17:21:44 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -124,7 +124,7 @@
// When closing gnash before playback is finished, the soundhandler
// seems to be removed before netstream is destroyed.
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
s->detach_aux_streamer(this);
@@ -294,15 +294,15 @@
// Find the decoder and init the parser
switch(videoInfo->codec) {
- case VIDEO_CODEC_H263:
+ case media::VIDEO_CODEC_H263:
codec_id = CODEC_ID_FLV1;
break;
#ifdef FFMPEG_VP6
- case VIDEO_CODEC_VP6:
+ case media::VIDEO_CODEC_VP6:
codec_id = CODEC_ID_VP6F;
break;
#endif
- case VIDEO_CODEC_SCREENVIDEO:
+ case media::VIDEO_CODEC_SCREENVIDEO:
codec_id = CODEC_ID_FLASHSV;
break;
default:
@@ -327,13 +327,13 @@
enum CodecID codec_id;
switch(audioInfo->codec) {
- case AUDIO_CODEC_RAW:
+ case media::AUDIO_CODEC_RAW:
codec_id = CODEC_ID_PCM_U16LE;
break;
- case AUDIO_CODEC_ADPCM:
+ case media::AUDIO_CODEC_ADPCM:
codec_id = CODEC_ID_ADPCM_SWF;
break;
- case AUDIO_CODEC_MP3:
+ case media::AUDIO_CODEC_MP3:
codec_id = CODEC_ID_MP3;
break;
default:
@@ -543,7 +543,7 @@
m_imageframe = new image::rgb(m_VCodecCtx->width,
m_VCodecCtx->height);
}
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (m_audio_index >= 0 && s != NULL)
{
// Get a pointer to the audio codec context for the video stream
@@ -623,7 +623,7 @@
else
{
// We need to restart the audio
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
s->attach_aux_streamer(audio_streamer, ns);
}
@@ -855,7 +855,7 @@
// Don't use depreceted img_convert, use sws_scale
} else if (m_videoFrameFormat == render::RGB &&
m_VCodecCtx->pix_fmt != PIX_FMT_RGB24) {
-
buffer.reset(VideoDecoderFfmpeg::convertRGB24(m_VCodecCtx, m_Frame));
+
buffer.reset(media::VideoDecoderFfmpeg::convertRGB24(m_VCodecCtx, m_Frame));
}
raw_mediadata_t* video = new raw_mediadata_t;
@@ -951,7 +951,7 @@
{
if (m_unqueued_data->m_stream_index == m_audio_index)
{
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s)
{
m_unqueued_data =
m_qaudio.push(m_unqueued_data) ? NULL : m_unqueued_data;
@@ -1220,7 +1220,7 @@
// Re-connect to the soundhandler.
// It was disconnected to avoid to keep playing sound while paused
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s && m_ACodecCtx) s->attach_aux_streamer(audio_streamer, (void*)
this);
}
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/asobj/NetStreamGst.cpp 30 Oct 2007 18:55:43 -0000 1.61
+++ server/asobj/NetStreamGst.cpp 24 Nov 2007 17:21:44 -0000 1.62
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamGst.cpp,v 1.61 2007/10/30 18:55:43 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.62 2007/11/24 17:21:44 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -661,7 +661,7 @@
uint32_t fps = m_parser->videoFrameRate();
GstCaps* videonincaps;
- if (videoInfo->codec == VIDEO_CODEC_H263) {
+ if (videoInfo->codec == media::VIDEO_CODEC_H263) {
videonincaps = gst_caps_new_simple
("video/x-flash-video",
"width", G_TYPE_INT, videoInfo->width,
"height", G_TYPE_INT, videoInfo->height,
@@ -683,7 +683,7 @@
#endif // GST_HAS_MODERN_PBUTILS
}
- } else if (videoInfo->codec == VIDEO_CODEC_VP6) {
+ } else if (videoInfo->codec == media::VIDEO_CODEC_VP6) {
videonincaps = gst_caps_new_simple ("video/x-vp6-flash",
"width", G_TYPE_INT, 320, // We don't yet have
a size extract for this codec, so we guess...
"height", G_TYPE_INT, 240,
@@ -704,7 +704,7 @@
#endif // GST_HAS_MODERN_PBUTILS
}
- } else if (videoInfo->codec == VIDEO_CODEC_SCREENVIDEO) {
+ } else if (videoInfo->codec == media::VIDEO_CODEC_SCREENVIDEO) {
videonincaps = gst_caps_new_simple
("video/x-flash-screen",
"width", G_TYPE_INT, 320, // We don't yet have
a size extract for this codec, so we guess...
"height", G_TYPE_INT, 240,
@@ -801,7 +801,7 @@
}
- if (audioInfo->codec == AUDIO_CODEC_MP3) {
+ if (audioInfo->codec == media::AUDIO_CODEC_MP3) {
audiodecoder = gst_element_factory_make ("mad", NULL);
if ( ! audiodecoder )
Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/Sound.cpp 20 Nov 2007 12:04:55 -0000 1.22
+++ server/asobj/Sound.cpp 24 Nov 2007 17:21:44 -0000 1.23
@@ -128,7 +128,7 @@
Sound::getVolume()
{
int volume = 0;
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
volume = s->get_volume(soundId);
@@ -178,7 +178,7 @@
// sanity check
if (volume >= 0 && volume <=100)
{
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
s->set_volume(soundId, volume);
@@ -189,7 +189,7 @@
void
Sound::start(int offset, int loops)
{
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) s->play_sound(soundId, loops, offset, 0, NULL);
}
@@ -198,7 +198,7 @@
Sound::stop(int si)
{
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
if (si > -1) {
Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/SoundFfmpeg.cpp 12 Nov 2007 16:17:02 -0000 1.16
+++ server/asobj/SoundFfmpeg.cpp 24 Nov 2007 17:21:44 -0000 1.17
@@ -267,7 +267,7 @@
{
if (packet.stream_index == so->audioIndex)
{
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s)
{
// Decode audio
@@ -365,7 +365,7 @@
}
if (isAttached) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
s->detach_aux_streamer(this);
}
@@ -429,7 +429,7 @@
}
// Start sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
if (externalSound) {
if (audioIndex >= 0)
@@ -447,7 +447,7 @@
SoundFfmpeg::stop(int si)
{
// stop the sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
if (si < 0) {
@@ -468,7 +468,7 @@
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return (s->get_duration(soundId));
} else {
@@ -489,7 +489,7 @@
{
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return s->get_position(soundId);
} else {
Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/SoundGst.cpp 30 Jul 2007 18:38:15 -0000 1.12
+++ server/asobj/SoundGst.cpp 24 Nov 2007 17:21:44 -0000 1.13
@@ -269,7 +269,7 @@
// Start sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
if (!externalSound) {
s->play_sound(soundId, loops, offset, 0, NULL);
@@ -281,7 +281,7 @@
SoundGst::stop(int si)
{
// stop the sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
if (si < 0) {
@@ -303,7 +303,7 @@
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return (s->get_duration(soundId));
} else {
@@ -328,7 +328,7 @@
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return s->get_position(soundId);
} else {
Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/SoundMad.cpp 27 Jul 2007 15:09:41 -0000 1.12
+++ server/asobj/SoundMad.cpp 24 Nov 2007 17:21:44 -0000 1.13
@@ -175,7 +175,7 @@
uint8_t* ptr = new uint8_t[8192];
bool ret = true;
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (bufSize > 0) {
if (s) {
// temp raw buffer
@@ -332,7 +332,7 @@
mad_frame_finish(&frame);
mad_stream_finish(&stream);
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
s->detach_aux_streamer(this);
}
@@ -379,7 +379,7 @@
}
// Start sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
if (externalSound) {
if (1)
@@ -397,7 +397,7 @@
SoundMad::stop(int si)
{
// stop the sound
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
if (si < 0) {
@@ -417,7 +417,7 @@
{
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return (s->get_duration(soundId));
} else {
@@ -440,7 +440,7 @@
// If this is a event sound get the info from the soundhandler
if (!externalSound) {
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s) {
return s->get_position(soundId);
} else {
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/button_character_def.h 30 Oct 2007 18:55:43 -0000
1.18
+++ server/parser/button_character_def.h 24 Nov 2007 17:21:44 -0000
1.19
@@ -126,7 +126,7 @@
uint32_t m_in_point;
uint32_t m_out_point;
uint16_t m_loop_count;
- std::vector<sound_handler::sound_envelope> m_envelopes;
+ std::vector<media::sound_handler::sound_envelope> m_envelopes;
};
struct button_sound_info
Index: server/parser/sound_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/sound_definition.cpp 23 Nov 2007 22:23:24 -0000 1.9
+++ server/parser/sound_definition.cpp 24 Nov 2007 17:21:45 -0000 1.10
@@ -18,7 +18,7 @@
sound_sample::~sound_sample()
{
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
if (handler)
{
handler->delete_sound(m_sound_handler_id);
@@ -44,7 +44,7 @@
start_stream_sound_tag::execute(sprite_instance* m) const
{
// Make static ?
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
if (handler)
{
// This makes it possible to stop only the stream when
framejumping.
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/parser/video_stream_def.cpp 26 Oct 2007 23:30:25 -0000 1.25
+++ server/parser/video_stream_def.cpp 24 Nov 2007 17:21:45 -0000 1.26
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.cpp,v 1.25 2007/10/26 23:30:25 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.26 2007/11/24 17:21:45 strk Exp $
#include "video_stream_def.h"
#include "video_stream_instance.h"
@@ -70,16 +70,16 @@
m_deblocking_flags = in->read_uint(2);
m_smoothing_flags = in->read_bit();
- m_codec_id = static_cast<videoCodecType>(in->read_u8());
+ m_codec_id = static_cast<media::videoCodecType>(in->read_u8());
#ifdef USE_FFMPEG
- _decoder.reset( new VideoDecoderFfmpeg() );
+ _decoder.reset( new media::VideoDecoderFfmpeg() );
#elif defined(SOUND_GST)
- _decoder.reset( new VideoDecoderGst() );
+ _decoder.reset( new media::VideoDecoderGst() );
#else
- _decoder.reset( new VideoDecoder() );
+ _decoder.reset( new media::VideoDecoder() );
#endif
bool ret = _decoder->setup(_width, _height, m_deblocking_flags,
m_smoothing_flags, m_codec_id, gnash::render::videoFrameFormat());
- if (!ret) _decoder.reset(new VideoDecoder()); // This is so
statically-defined video_stream_def always have a _decoder != NULL
+ if (!ret) _decoder.reset(new media::VideoDecoder()); // This is so
statically-defined video_stream_def always have a _decoder != NULL
}
@@ -113,8 +113,8 @@
// Check what kind of frame this is
- videoFrameType ft;
- if (m_codec_id == VIDEO_CODEC_H263) {
+ media::videoFrameType ft;
+ if (m_codec_id == media::VIDEO_CODEC_H263) {
// Parse the h263 header to determine the frame type. The
position of the
// info varies if the frame size is custom.
std::auto_ptr<BitsReader> br (new BitsReader(data.get(),
totSize));
@@ -124,19 +124,18 @@
else if (tmp == 1) tmp = br->read_uint(16);
// Finally we're at the info, read and use
- videoFrameType ft;
tmp = br->read_uint(3);
- if (tmp == 0) ft = KEY_FRAME;
- else if (tmp == 1) ft = INTER_FRAME;
- else ft = DIS_INTER_FRAME;
+ if (tmp == 0) ft = media::KEY_FRAME;
+ else if (tmp == 1) ft = media::INTER_FRAME;
+ else ft = media::DIS_INTER_FRAME;
- } else if (m_codec_id == VIDEO_CODEC_VP6 || m_codec_id ==
VIDEO_CODEC_VP6A) {
+ } else if (m_codec_id == media::VIDEO_CODEC_VP6 || m_codec_id ==
media::VIDEO_CODEC_VP6A) {
// Get the info from the VP6 header
- if (!(data.get()[0] & 0x80)) ft = KEY_FRAME;
- else ft = INTER_FRAME;
+ if (!(data.get()[0] & 0x80)) ft = media::KEY_FRAME;
+ else ft = media::INTER_FRAME;
} else {
- ft = KEY_FRAME;
+ ft = media::KEY_FRAME;
}
setFrameData(m->get_loading_frame(), data, totSize, ft);
@@ -164,7 +163,7 @@
}
// rewind to the nearest keyframe, or the last frame we decoded
- while (static_cast<uint32_t>(m_last_decoded_frame+1) != it->first &&
it->second->frameType != KEY_FRAME && it != m_video_frames.begin()) it--;
+ while (static_cast<uint32_t>(m_last_decoded_frame+1) != it->first &&
it->second->frameType != media::KEY_FRAME && it != m_video_frames.begin()) it--;
std::auto_ptr<image::image_base> ret(NULL);
@@ -172,7 +171,7 @@
while (it != m_video_frames.end() && it->first <= frameNum) {
// If this is a disposable interlaced frame, and it is not the
// last one to be decoded, we skip the decoding.
- if (!(it->second->frameType == DIS_INTER_FRAME && it->first !=
frameNum)) {
+ if (!(it->second->frameType == media::DIS_INTER_FRAME &&
it->first != frameNum)) {
ret.reset(NULL);
ret =
_decoder->decodeToImage(it->second->videoData.get(), it->second->dataSize);
}
@@ -186,7 +185,7 @@
}
void
-video_stream_definition::setFrameData(uint32_t frameNum,
boost::shared_array<uint8_t> data, uint32_t size, videoFrameType ft)
+video_stream_definition::setFrameData(uint32_t frameNum,
boost::shared_array<uint8_t> data, uint32_t size, media::videoFrameType ft)
{
EmbedFrameMap::iterator it = m_video_frames.find(frameNum);
if( it != m_video_frames.end() )
Index: server/parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/video_stream_def.h 23 Nov 2007 12:21:27 -0000 1.17
+++ server/parser/video_stream_def.h 24 Nov 2007 17:21:45 -0000 1.18
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.h,v 1.17 2007/11/23 12:21:27 strk Exp $
+// $Id: video_stream_def.h,v 1.18 2007/11/24 17:21:45 strk Exp $
#ifndef GNASH_VIDEO_STREAM_DEF_H
#define GNASH_VIDEO_STREAM_DEF_H
@@ -46,7 +46,7 @@
/// Contains the data, the data size and the type of the frame
class VideoData {
public:
- VideoData(boost::shared_array<uint8_t> data, uint32_t size,
videoFrameType ft)
+ VideoData(boost::shared_array<uint8_t> data, uint32_t size,
media::videoFrameType ft)
:
videoData(data),
dataSize(size),
@@ -60,7 +60,7 @@
boost::shared_array<uint8_t> videoData;
uint32_t dataSize;
- videoFrameType frameType;
+ media::videoFrameType frameType;
};
class video_stream_definition : public character_def
@@ -147,7 +147,7 @@
/// 3: screen video (Flash 7+ only)
/// 4: VP6
///
- videoCodecType m_codec_id;
+ media::videoCodecType m_codec_id;
/// Bounds of the video, as read from the DEFINEVIDEOSTREAM tag.
rect m_bound;
@@ -177,7 +177,7 @@
/// @param img
/// Frame data. Ownership is transferred.
///
- void setFrameData(uint32_t frameNum, boost::shared_array<uint8_t> data,
uint32_t size, videoFrameType ft);
+ void setFrameData(uint32_t frameNum, boost::shared_array<uint8_t> data,
uint32_t size, media::videoFrameType ft);
/// Width of the video
uint32_t _width;
@@ -186,7 +186,7 @@
uint32_t _height;
/// The decoder used to decode the video frames
- boost::scoped_ptr<VideoDecoder> _decoder;
+ boost::scoped_ptr<media::VideoDecoder> _decoder;
};
} // end namespace gnash
Index: server/swf/StartSoundTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/StartSoundTag.cpp 24 Nov 2007 08:23:48 -0000 1.3
+++ server/swf/StartSoundTag.cpp 24 Nov 2007 17:21:45 -0000 1.4
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: StartSoundTag.cpp,v 1.3 2007/11/24 08:23:48 strk Exp $ */
+/* $Id: StartSoundTag.cpp,v 1.4 2007/11/24 17:21:45 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -39,7 +39,7 @@
assert(tag == SWF::STARTSOUND); // 15
// Make static ?
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
in->ensureBytes(2); // sound_id
@@ -122,7 +122,7 @@
StartSoundTag::execute(sprite_instance* /* m */) const
{
// Make static ?
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
//GNASH_REPORT_FUNCTION;
Index: server/swf/StartSoundTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/StartSoundTag.h 24 Nov 2007 08:23:48 -0000 1.3
+++ server/swf/StartSoundTag.h 24 Nov 2007 17:21:45 -0000 1.4
@@ -86,7 +86,7 @@
//
/// See http://sswf.sourceforge.net/SWFalexref.html#swf_envelope
///
- std::vector<sound_handler::sound_envelope> m_envelopes;
+ std::vector<media::sound_handler::sound_envelope> m_envelopes;
/// Initialize this StartSoundTag from the stream
//
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- server/swf/tag_loaders.cpp 23 Nov 2007 22:23:25 -0000 1.152
+++ server/swf/tag_loaders.cpp 24 Nov 2007 17:21:45 -0000 1.153
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.152 2007/11/23 22:23:25 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.153 2007/11/24 17:21:45 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1087,7 +1087,7 @@
//
// Forward declaration
-/*static void sound_expand(stream *in, sound_handler::format_type &format,
+/*static void sound_expand(stream *in, media::sound_handler::format_type
&format,
bool sample_16bit, bool stereo, unsigned int &sample_count,
unsigned char* &data, unsigned &data_bytes);
*/
@@ -1103,20 +1103,20 @@
{
assert(tag == SWF::DEFINESOUND); // 14
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
in->ensureBytes(2+4+1+4); // character id + flags + sample count
uint16_t character_id = in->read_u16();
- audioCodecType format = static_cast<audioCodecType>(in->read_uint(4));
+ media::audioCodecType format =
static_cast<media::audioCodecType>(in->read_uint(4));
int sample_rate = in->read_uint(2); // multiples of 5512.5
bool sample_16bit = in->read_bit();
bool stereo = in->read_bit();
unsigned int sample_count = in->read_u32();
- if (format == AUDIO_CODEC_MP3) {
+ if (format == media::AUDIO_CODEC_MP3) {
in->ensureBytes(2);
int16_t delay_seek = in->read_s16(); // FIXME - not
implemented/used
// The DelaySeek field has the following meaning:
@@ -1163,8 +1163,8 @@
in->read((char*)data, data_bytes);
// Store all the data in a SoundInfo object
- std::auto_ptr<SoundInfo> sinfo;
- sinfo.reset(new SoundInfo(format, stereo,
s_sample_rate_table[sample_rate], sample_count, sample_16bit));
+ std::auto_ptr<media::SoundInfo> sinfo;
+ sinfo.reset(new media::SoundInfo(format, stereo,
s_sample_rate_table[sample_rate], sample_count, sample_16bit));
// Stores the sounddata in the soundhandler, and the ID returned
// can be used to starting, stopping and deleting that sound
@@ -1192,7 +1192,7 @@
void
sound_stream_head_loader(stream* in, tag_type tag, movie_definition* m)
{
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
// 18 || 45
assert(tag == SWF::SOUNDSTREAMHEAD || tag == SWF::SOUNDSTREAMHEAD2);
@@ -1209,7 +1209,7 @@
// extract garbage data
int garbage = in->read_uint(8);
- audioCodecType format = static_cast<audioCodecType>(in->read_uint(4));
+ media::audioCodecType format =
static_cast<media::audioCodecType>(in->read_uint(4));
int sample_rate = in->read_uint(2); // multiples of 5512.5
bool sample_16bit = in->read_bit();
bool stereo = in->read_bit();
@@ -1219,7 +1219,7 @@
unsigned int sample_count = in->read_u16();
int latency = 0;
- if (format == AUDIO_CODEC_MP3) {
+ if (format == media::AUDIO_CODEC_MP3) {
latency = in->read_s16();
garbage = in->read_uint(16);
}
@@ -1242,8 +1242,8 @@
}
// Store all the data in a SoundInfo object
- std::auto_ptr<SoundInfo> sinfo;
- sinfo.reset(new SoundInfo(format, stereo,
s_sample_rate_table[sample_rate], sample_count, sample_16bit));
+ std::auto_ptr<media::SoundInfo> sinfo;
+ sinfo.reset(new media::SoundInfo(format, stereo,
s_sample_rate_table[sample_rate], sample_count, sample_16bit));
// Stores the sounddata in the soundhandler, and the ID returned
// can be used to starting, stopping and deleting that sound
@@ -1259,7 +1259,7 @@
{
assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
- sound_handler* handler = get_sound_handler();
+ media::sound_handler* handler = get_sound_handler();
// If we don't have a sound_handler registered stop here
if (!handler) return;
@@ -1269,16 +1269,16 @@
// Get the SoundInfo object that contains info about the sound stream.
// Ownership of the object is in the soundhandler
- SoundInfo* sinfo = handler->get_sound_info(handle_id);
+ media::SoundInfo* sinfo = handler->get_sound_info(handle_id);
// If there is no SoundInfo something is wrong...
if (!sinfo) return;
- audioCodecType format = sinfo->getFormat();
+ media::audioCodecType format = sinfo->getFormat();
unsigned int sample_count = sinfo->getSampleCount();
// discard garbage data if format is MP3
- if (format == AUDIO_CODEC_MP3) in->skip_bytes(4);
+ if (format == media::AUDIO_CODEC_MP3) in->skip_bytes(4);
unsigned int data_bytes = in->get_tag_end_position() - in->get_position();
unsigned char *data = new unsigned char[data_bytes];
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- server/vm/ASHandlers.cpp 23 Nov 2007 02:37:39 -0000 1.161
+++ server/vm/ASHandlers.cpp 24 Nov 2007 17:21:45 -0000 1.162
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.161 2007/11/23 02:37:39 zoulunkai Exp $ */
+/* $Id: ASHandlers.cpp,v 1.162 2007/11/24 17:21:45 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -529,7 +529,7 @@
assert( code[thread.pc] == SWF::ACTION_STOP );
#endif
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
sprite_instance* tgt = env.get_target()->to_movie();
assert(tgt);
@@ -569,7 +569,7 @@
assert( code[thread.pc] == SWF::ACTION_STOPSOUNDS );
#endif
- sound_handler* s = get_sound_handler();
+ media::sound_handler* s = get_sound_handler();
if (s != NULL)
{
s->stop_all_sounds();
Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- testsuite/MovieTester.h 1 Oct 2007 22:41:59 -0000 1.32
+++ testsuite/MovieTester.h 24 Nov 2007 17:21:45 -0000 1.33
@@ -287,7 +287,7 @@
gnash::movie_instance* _movie;
- std::auto_ptr<sound_handler> _sound_handler;
+ std::auto_ptr<media::sound_handler> _sound_handler;
/// Current pointer position - X ordinate
int _x;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/Player.cpp gui/Player.h gui...,
Sandro Santilli <=