[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ... |
|
Date: |
Tue, 04 Dec 2007 11:45:38 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/12/04 11:45:35
Modified files:
. : ChangeLog
backend : render_handler_agg.cpp render_handler_cairo.cpp
render_handler_d3d.cpp render_handler_ogl.cpp
render_handler_xbox.cpp
gui : NullGui.cpp Player.cpp gui.cpp gui.h sdl.cpp
sdl_agg_glue.cpp sdl_agg_glue.h
sdl_cairo_glue.cpp sdl_cairo_glue.h sdl_glue.h
sdl_ogl_glue.cpp sdl_ogl_glue.h
libamf : amf.cpp
libbase : BitsReader.cpp BitsReader.h FLVParser.cpp
FLVParser.h LoadThread.h Makefile.am
WallClockTimer.cpp WallClockTimer.h image.h
log.h rc.cpp tu_file.h tu_random.cpp
tu_random.h tu_timer.cpp tu_timer.h utf8.cpp
utf8.h utility.cpp utility.h
libmedia : AudioDecoder.h AudioDecoderNellymoser.cpp
AudioDecoderNellymoser.h AudioDecoderSimple.cpp
AudioDecoderSimple.h FLVParser.cpp FLVParser.h
MediaBuffer.h MediaDecoder.cpp MediaDecoder.h
MediaParser.h SoundInfo.h VideoDecoder.h
sound_handler.h
libmedia/gst : AudioDecoderGst.cpp AudioDecoderGst.h
MediaDecoderGst.cpp MediaDecoderGst.h
VideoDecoderGst.cpp VideoDecoderGst.h
sound_handler_gst.cpp
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
server : BevelFilter.h ConvolutionFilter.h
DropShadowFilter.h DynamicShape.cpp
DynamicShape.h FreetypeGlyphsProvider.cpp
FreetypeGlyphsProvider.h GlowFilter.h
GradientBevelFilter.h GradientGlowFilter.h
asClass.cpp asClass.h as_value.cpp as_value.h
cxform.h edit_text_character.cpp font.cpp
font.h impl.cpp impl.h render.cpp render.h
sprite_instance.cpp sprite_instance.h
stream.cpp stream.h styles.h swf_function.h
text.cpp textformat.cpp textformat.h timers.cpp
timers.h tools.cpp types.h
server/asobj : BevelFilter_as.cpp Color.cpp
ConvolutionFilter_as.cpp
DropShadowFilter_as.cpp GlowFilter_as.cpp
Math.cpp NetStream.cpp NetStream.h
NetStreamFfmpeg.cpp NetStreamFfmpeg.h
NetStreamGst.cpp NetStreamGst.h SoundFfmpeg.cpp
SoundGst.cpp SoundMad.cpp string.cpp xml.cpp
server/parser : abc_block.cpp abc_block.h action_buffer.cpp
action_buffer.h button_character_def.h
edit_text_character_def.h
morph2_character_def.cpp movie_def_impl.cpp
movie_def_impl.h shape_character_def.cpp
sound_definition.h sprite_definition.cpp
text_character_def.cpp video_stream_def.cpp
video_stream_def.h
server/swf : ControlTag.h DisplayListTag.h DoActionTag.h
DoInitActionTag.h PlaceObject2Tag.cpp
PlaceObject2Tag.h StartSoundTag.cpp
StartSoundTag.h tag_loaders.cpp
server/vm : ASHandlers.cpp ActionExec.cpp ActionExec.h
CodeStream.h Machine.cpp VM.cpp VM.h
testsuite/libbase: IntTypesTest.cpp
testsuite/server: BitsReaderTest.cpp StreamTest.cpp
utilities : parser.cpp processor.cpp
Removed files:
libbase : tu_types.cpp tu_types.h
Log message:
drop tu_types.h, use boost/cstdint.hpp instead.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5078&r2=1.5079
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_d3d.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_xbox.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_cairo_glue.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_cairo_glue.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_glue.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_ogl_glue.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_ogl_glue.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/BitsReader.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/BitsReader.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/WallClockTimer.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/WallClockTimer.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_random.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_random.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utf8.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utf8.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.40&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoder.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaBuffer.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaDecoder.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaDecoder.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/SoundInfo.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/VideoDecoder.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sound_handler.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/AudioDecoderGst.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/AudioDecoderGst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/MediaDecoderGst.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/MediaDecoderGst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/VideoDecoderGst.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/sound_handler_gst.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderMad.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaDecoderSdl.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asClass.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asClass.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.h?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.404&r2=1.405
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tools.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Color.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ConvolutionFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/DropShadowFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GlowFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Math.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ControlTag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DisplayListTag.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoActionTag.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoInitActionTag.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StartSoundTag.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/CodeStream.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Machine.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/IntTypesTest.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/BitsReaderTest.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.72&r2=1.73
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5078
retrieving revision 1.5079
diff -u -b -r1.5078 -r1.5079
--- ChangeLog 4 Dec 2007 09:20:28 -0000 1.5078
+++ ChangeLog 4 Dec 2007 11:45:21 -0000 1.5079
@@ -1,3 +1,7 @@
+2007-12-04 Sandro Santilli <address@hidden>
+
+ * (tons of files): drop tu_types.h, use boost/cstdint.hpp instead.
+
2007-12-04 Benjamin Wolsey <address@hidden>
* libmedia/MediaDecoder.cpp: make sure we can stop decoding before the
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- backend/render_handler_agg.cpp 3 Dec 2007 05:29:34 -0000 1.121
+++ backend/render_handler_agg.cpp 4 Dec 2007 11:45:21 -0000 1.122
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.121 2007/12/03 05:29:34 bjacques Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.122 2007/12/04 11:45:21 strk Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -745,7 +745,7 @@
stroke.line_join(agg::round_join);
path.remove_all(); // Not obligatory in this case
- const int16_t *vertex = static_cast<const int16_t*>(coords);
+ const boost::int16_t *vertex = static_cast<const boost::int16_t*>(coords);
mat.transform(&pnt, point(vertex[0], vertex[1]));
path.move_to(pnt.x, pnt.y);
@@ -2091,7 +2091,7 @@
bool is_little_endian_host() {
union {
- uint16_t word;
+ boost::uint16_t word;
struct {
uint8_t b1;
uint8_t b2;
Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- backend/render_handler_cairo.cpp 3 Dec 2007 05:29:34 -0000 1.35
+++ backend/render_handler_cairo.cpp 4 Dec 2007 11:45:22 -0000 1.36
@@ -52,7 +52,7 @@
static void
rgb_to_cairo_rgb24(uint8_t* dst, const image::rgb* im)
{
- uint32_t* dst32 = reinterpret_cast<uint32_t*>(dst);
+ boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
{
const uint8_t* src = im->scanline(y);
@@ -67,7 +67,7 @@
static void
rgba_to_cairo_argb(uint8_t* dst, const image::rgba* im)
{
- uint32_t* dst32 = reinterpret_cast<uint32_t*>(dst);
+ boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
{
const uint8_t* src = im->scanline(y);
Index: backend/render_handler_d3d.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_d3d.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- backend/render_handler_d3d.cpp 10 Nov 2007 11:51:42 -0000 1.12
+++ backend/render_handler_d3d.cpp 4 Dec 2007 11:45:22 -0000 1.13
@@ -516,7 +516,7 @@
delete bi;
}
- void prepare_vertex_buffer(const int16_t* coords, int vertex_count)
+ void prepare_vertex_buffer(const boost::int16_t* coords, int vertex_count)
{
HRESULT hr;
@@ -690,11 +690,11 @@
}
else
{
- const int16_t backgroundCoords[] = {
- (int16_t)x0,(int16_t)y0,
- (int16_t)x1,(int16_t)y0,
- (int16_t)x0,(int16_t)y1,
- (int16_t)x1,(int16_t)y1};
+ const boost::int16_t backgroundCoords[] = {
+ (boost::int16_t)x0,(boost::int16_t)y0,
+ (boost::int16_t)x1,(boost::int16_t)y0,
+ (boost::int16_t)x0,(boost::int16_t)y1,
+ (boost::int16_t)x1,(boost::int16_t)y1};
apply_color(background_color);
set_matrix(gameswf::matrix::identity);
apply_matrix(m_current_matrix);
@@ -824,7 +824,7 @@
m_current_styles[LEFT_STYLE].apply(m_current_matrix);
apply_matrix(m_current_matrix);
- prepare_vertex_buffer((int16_t*)coords, vertex_count);
+ prepare_vertex_buffer((boost::int16_t*)coords, vertex_count);
HRESULT hr = m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLESTRIP, 0,
vertex_count - 2);
assert(hr==S_OK);
@@ -846,7 +846,7 @@
m_current_styles[LINE_STYLE].apply(m_current_matrix);
apply_matrix(m_current_matrix);
- prepare_vertex_buffer((int16_t*)coords, vertex_count);
+ prepare_vertex_buffer((boost::int16_t*)coords, vertex_count);
HRESULT hr = m_pd3dDevice->DrawPrimitive( D3DPT_LINESTRIP, 0,
vertex_count-1);
assert(hr==S_OK);
}
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- backend/render_handler_ogl.cpp 3 Dec 2007 05:29:34 -0000 1.100
+++ backend/render_handler_ogl.cpp 4 Dec 2007 11:45:22 -0000 1.101
@@ -883,7 +883,7 @@
// Draw a dot on the beginning and end coordinates to round lines.
// glVertexPointer: skip all but the first and last coordinates in the
line.
- glVertexPointer(2, GL_SHORT, (sizeof(int16_t) * 2) * (vertex_count - 1),
coords);
+ glVertexPointer(2, GL_SHORT, (sizeof(boost::int16_t) * 2) * (vertex_count
- 1), coords);
glEnable(GL_POINT_SMOOTH); // Draw a round (antialiased) point.
glDrawArrays(GL_POINTS, 0, 2);
glDisable(GL_POINT_SMOOTH);
Index: backend/render_handler_xbox.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_xbox.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- backend/render_handler_xbox.cpp 10 Nov 2007 11:51:42 -0000 1.9
+++ backend/render_handler_xbox.cpp 4 Dec 2007 11:45:22 -0000 1.10
@@ -651,13 +651,13 @@
// @@ we'd like to use a VB instead, and use DrawPrimitive().
// Draw the mesh.
- IDirect3DDevice8::DrawPrimitiveUP(D3DPT_TRIANGLESTRIP,
vertex_count - 2, coords, sizeof(int16_t) * 2);
+ IDirect3DDevice8::DrawPrimitiveUP(D3DPT_TRIANGLESTRIP,
vertex_count - 2, coords, sizeof(boost::int16_t) * 2);
if (m_current_styles[LEFT_STYLE].needs_second_pass())
{
// 2nd pass, if necessary.
m_current_styles[LEFT_STYLE].apply_second_pass();
- IDirect3DDevice8::DrawPrimitiveUP(D3DPT_TRIANGLESTRIP,
vertex_count - 2, coords, sizeof(int16_t) * 2);
+ IDirect3DDevice8::DrawPrimitiveUP(D3DPT_TRIANGLESTRIP,
vertex_count - 2, coords, sizeof(boost::int16_t) * 2);
m_current_styles[LEFT_STYLE].cleanup_second_pass();
}
@@ -668,7 +668,7 @@
// Send the tris to OpenGL
glEnableClientState(GL_VERTEX_ARRAY);
- glVertexPointer(2, GL_SHORT, sizeof(int16_t) * 2, coords);
+ glVertexPointer(2, GL_SHORT, sizeof(boost::int16_t) * 2,
coords);
glDrawArrays(GL_TRIANGLE_STRIP, 0, vertex_count);
if (m_current_styles[LEFT_STYLE].needs_second_pass())
@@ -693,7 +693,7 @@
apply_matrix(m_current_matrix);
- IDirect3DDevice8::DrawPrimitiveUP(D3DPT_LINESTRIP, vertex_count
- 1, coords, sizeof(int16_t) * 2);
+ IDirect3DDevice8::DrawPrimitiveUP(D3DPT_LINESTRIP, vertex_count
- 1, coords, sizeof(boost::int16_t) * 2);
}
Index: gui/NullGui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/NullGui.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gui/NullGui.cpp 13 Sep 2007 09:47:31 -0000 1.18
+++ gui/NullGui.cpp 4 Dec 2007 11:45:22 -0000 1.19
@@ -40,15 +40,15 @@
bool
NullGui::run()
{
- uint64_t prevtimer=0;
- uint64_t start_timer = tu_timer::get_ticks(); // returns milliseconds
+ boost::uint64_t prevtimer=0;
+ boost::uint64_t start_timer = tu_timer::get_ticks(); // returns milliseconds
prevtimer = start_timer;
while (true)
{
- uint64_t timer=0;
+ boost::uint64_t timer=0;
// synchronize to frame time
if (_timeout || (_interval>1)) // avoid timing completely for interval==1
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- gui/Player.cpp 24 Nov 2007 17:21:41 -0000 1.71
+++ gui/Player.cpp 4 Dec 2007 11:45:22 -0000 1.72
@@ -237,8 +237,6 @@
Player::run(int argc, char* argv[], const char* infile, const char* url)
{
- assert(tu_types_validate());
-
// Call this at run() time, so the caller has
// a cache of setting some parameter before calling us...
// (example: setDoSound(), setWindowId() etc.. )
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- gui/gui.cpp 30 Nov 2007 23:11:11 -0000 1.118
+++ gui/gui.cpp 4 Dec 2007 11:45:22 -0000 1.119
@@ -706,15 +706,15 @@
#ifdef SKIP_RENDERING_IF_LATE
- uint32_t advanceTime = advanceTimer.elapsed(); // in milliseconds !
+ boost::uint32_t advanceTime = advanceTimer.elapsed(); // in
milliseconds !
- uint32_t timeSlot = _interval; // milliseconds between advance calls
+ boost::uint32_t timeSlot = _interval; // milliseconds between advance
calls
if ( advanceTime+gui->estimatedDisplayTime < timeSlot )
{
advanceTimer.restart();
display(m);
- uint32_t displayTime = advanceTimer.elapsed();
+ boost::uint32_t displayTime = advanceTimer.elapsed();
if ( displayTime > estimatedDisplayTime)
{
@@ -860,11 +860,11 @@
return;
}
- uint64_t current_timer = tu_timer::get_ticks();
+ boost::uint64_t current_timer = tu_timer::get_ticks();
// TODO: keep fps_timer_interval in milliseconds to avoid the multiplication
// at each fpsCounterTick call...
- uint64_t interval_ms = (uint64_t)(fps_timer_interval * 1000.0);
+ boost::uint64_t interval_ms = (boost::uint64_t)(fps_timer_interval * 1000.0);
if (fps_counter_total==1) {
fps_timer = current_timer;
Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- gui/gui.h 30 Oct 2007 11:03:47 -0000 1.69
+++ gui/gui.h 4 Dec 2007 11:45:22 -0000 1.70
@@ -359,7 +359,7 @@
// the number of calls to movie_advance()
unsigned int fps_counter_total;
- uint64_t fps_timer, fps_start_timer;
+ boost::uint64_t fps_timer, fps_start_timer;
/// The time, in seconds, between prints (which also resets the fps
counter).
//
@@ -380,7 +380,7 @@
#ifdef SKIP_RENDERING_IF_LATE
/// Estimated max number of milliseconds required for a call to ::display
/// This should be incremented everytime we take more
- uint32_t estimatedDisplayTime;
+ boost::uint32_t estimatedDisplayTime;
#endif // SKIP_RENDERING_IF_LATE
VariableMap _flashVars;
Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- gui/sdl.cpp 25 Sep 2007 08:53:54 -0000 1.60
+++ gui/sdl.cpp 4 Dec 2007 11:45:22 -0000 1.61
@@ -18,7 +18,7 @@
//
//
-/* $Id: sdl.cpp,v 1.60 2007/09/25 08:53:54 zoulunkai Exp $ */
+/* $Id: sdl.cpp,v 1.61 2007/12/04 11:45:22 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -202,7 +202,7 @@
_width = width;
_height = height;
- uint32_t sdl_flags = 0;
+ boost::uint32_t sdl_flags = 0;
if (!_core_trap) {
sdl_flags |= SDL_INIT_NOPARACHUTE;
Index: gui/sdl_agg_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gui/sdl_agg_glue.cpp 30 Oct 2007 18:55:41 -0000 1.15
+++ gui/sdl_agg_glue.cpp 4 Dec 2007 11:45:22 -0000 1.16
@@ -82,7 +82,7 @@
bool
-SdlAggGlue::prepDrawingArea(int width, int height, uint32_t sdl_flags)
+SdlAggGlue::prepDrawingArea(int width, int height, boost::uint32_t sdl_flags)
{
int depth_bytes = _bpp / 8; // TODO: <Udo> is this correct? Gives 1 for
15 bit modes!
@@ -97,7 +97,7 @@
int stride = width * depth_bytes;
- uint32_t rmask, gmask, bmask, amask;
+ boost::uint32_t rmask, gmask, bmask, amask;
switch(_bpp) {
case 32: // RGBA32
Index: gui/sdl_agg_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/sdl_agg_glue.h 1 Jul 2007 10:54:04 -0000 1.7
+++ gui/sdl_agg_glue.h 4 Dec 2007 11:45:22 -0000 1.8
@@ -19,12 +19,9 @@
//
#include "sdl_glue.h"
-#include <SDL.h>
-
-
-
-using namespace std;
+#include <SDL.h>
+#include <boost/cstdint.hpp> // for boost::?int??_t
namespace gnash
{
@@ -37,8 +34,8 @@
bool init(int argc, char **argv[]);
render_handler* createRenderHandler(int depth);
- bool prepDrawingArea(int width, int height, uint32_t sdl_flags);
- uint32_t maskFlags(uint32_t sdl_flags);
+ bool prepDrawingArea(int width, int height, boost::uint32_t sdl_flags);
+ boost::uint32_t maskFlags(boost::uint32_t sdl_flags);
void render();
void render(int minx, int miny, int maxx, int maxy);
private:
Index: gui/sdl_cairo_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_cairo_glue.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/sdl_cairo_glue.cpp 1 Jul 2007 10:54:04 -0000 1.6
+++ gui/sdl_cairo_glue.cpp 4 Dec 2007 11:45:22 -0000 1.7
@@ -63,7 +63,7 @@
bool
-SdlCairoGlue::prepDrawingArea(int width, int height, uint32_t sdl_flags)
+SdlCairoGlue::prepDrawingArea(int width, int height, boost::uint32_t sdl_flags)
{
_screen = SDL_SetVideoMode(width, height, _bpp, sdl_flags | SDL_SWSURFACE);
@@ -85,7 +85,7 @@
renderer::cairo::set_handle(_cairo_handle);
- uint32_t rmask, gmask, bmask, amask;
+ boost::uint32_t rmask, gmask, bmask, amask;
rmask = 0x00ff0000;
gmask = 0x0000ff00;
Index: gui/sdl_cairo_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_cairo_glue.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/sdl_cairo_glue.h 1 Jul 2007 10:54:04 -0000 1.6
+++ gui/sdl_cairo_glue.h 4 Dec 2007 11:45:23 -0000 1.7
@@ -38,8 +38,8 @@
bool init(int argc, char **argv[]);
render_handler* createRenderHandler( int depth);
- bool prepDrawingArea(int width, int height, uint32_t sdl_flags);
- uint32_t maskFlags(uint32_t sdl_flags);
+ bool prepDrawingArea(int width, int height, boost::uint32_t sdl_flags);
+ boost::uint32_t maskFlags(boost::uint32_t sdl_flags);
void render();
private:
cairo_surface_t *_cairo_surface;
Index: gui/sdl_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_glue.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/sdl_glue.h 1 Jul 2007 10:54:04 -0000 1.6
+++ gui/sdl_glue.h 4 Dec 2007 11:45:23 -0000 1.7
@@ -20,6 +20,8 @@
#include "gnash.h"
+#include <boost/cstdint.hpp> // for boost::?int??_t
+
namespace gnash
{
@@ -29,7 +31,7 @@
virtual ~SdlGlue() { }
virtual bool init(int argc, char **argv[]) = 0;
- virtual bool prepDrawingArea(int width, int height, uint32_t sdl_flags) =
0;
+ virtual bool prepDrawingArea(int width, int height, boost::uint32_t
sdl_flags) = 0;
virtual render_handler* createRenderHandler(int depth) = 0;
virtual void render() = 0;
protected:
Index: gui/sdl_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_ogl_glue.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/sdl_ogl_glue.cpp 1 Jul 2007 10:54:04 -0000 1.9
+++ gui/sdl_ogl_glue.cpp 4 Dec 2007 11:45:23 -0000 1.10
@@ -82,7 +82,7 @@
}
bool
-SdlOglGlue::prepDrawingArea(int width, int height, uint32_t sdl_flags)
+SdlOglGlue::prepDrawingArea(int width, int height, boost::uint32_t sdl_flags)
{
if (_bpp == 16) {
// 16-bit color, surface creation is likely to succeed.
Index: gui/sdl_ogl_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_ogl_glue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/sdl_ogl_glue.h 1 Jul 2007 10:54:05 -0000 1.7
+++ gui/sdl_ogl_glue.h 4 Dec 2007 11:45:23 -0000 1.8
@@ -37,7 +37,7 @@
bool init(int argc, char ***argv);
render_handler* createRenderHandler( int depth);
- bool prepDrawingArea(int width, int height, uint32_t sdl_flags);
+ bool prepDrawingArea(int width, int height, boost::uint32_t sdl_flags);
void render();
private:
#ifdef FIX_I810_LOD_BIAS
Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- libamf/amf.cpp 23 Aug 2007 14:10:54 -0000 1.41
+++ libamf/amf.cpp 4 Dec 2007 11:45:23 -0000 1.42
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: amf.cpp,v 1.41 2007/08/23 14:10:54 strk Exp $ */
+/* $Id: amf.cpp,v 1.42 2007/12/04 11:45:23 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -37,6 +37,8 @@
#include "amf.h"
#include "amfutf8.h"
+#include <boost/cstdint.hpp> // for boost::?int??_t
+
using namespace std;
using namespace gnash;
@@ -118,7 +120,7 @@
swapBytes(void *word, int size)
{
union {
- uint16_t s;
+ boost::uint16_t s;
struct {
uint8_t c0;
uint8_t c1;
Index: libbase/BitsReader.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/BitsReader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/BitsReader.cpp 4 Oct 2007 09:37:49 -0000 1.2
+++ libbase/BitsReader.cpp 4 Dec 2007 11:45:23 -0000 1.3
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: BitsReader.cpp,v 1.2 2007/10/04 09:37:49 tgc Exp $
+// $Id: BitsReader.cpp,v 1.3 2007/12/04 11:45:23 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -40,7 +40,7 @@
{
assert(bitcount <= 32);
- uint32_t value = 0;
+ boost::uint32_t value = 0;
unsigned short bits_needed = bitcount;
do
@@ -90,9 +90,9 @@
}
-int32_t BitsReader::read_sint(unsigned short bitcount)
+boost::int32_t BitsReader::read_sint(unsigned short bitcount)
{
- int32_t value = int32_t(read_uint(bitcount));
+ boost::int32_t value = boost::int32_t(read_uint(bitcount));
// Sign extend...
if (value & (1 << (bitcount - 1)))
Index: libbase/BitsReader.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/BitsReader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/BitsReader.h 4 Dec 2007 06:37:37 -0000 1.6
+++ libbase/BitsReader.h 4 Dec 2007 11:45:23 -0000 1.7
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: BitsReader.h,v 1.6 2007/12/04 06:37:37 zoulunkai Exp $
+// $Id: BitsReader.h,v 1.7 2007/12/04 11:45:23 strk Exp $
#ifndef BITSREADER_H
#define BITSREADER_H
@@ -28,13 +28,13 @@
#include "swf.h"
#include "tu_config.h"
-#include "tu_types.h" // for uint32_t used in this file
#include "GnashException.h"
#include "log.h"
#include <cassert> // for assert used in this file
#include <string>
#include <sstream>
+#include <boost/cstdint.hpp> // for boost::uint32_t used in this file
namespace gnash {
@@ -88,7 +88,7 @@
/// Reads a bit-packed little-endian signed integer
/// from the stream. The given bitcount determines the
/// number of bits to read.
- int32_t read_sint(unsigned short bitcount);
+ boost::int32_t read_sint(unsigned short bitcount);
/// Read a byte as an unsigned int (aligned)
uint8_t read_u8()
@@ -104,27 +104,27 @@
}
/// Read two bytes as an unsigned int (aligned)
- uint16_t read_u16()
+ boost::uint16_t read_u16()
{
align();
assert(ptr+2 < end);
- uint16_t result = *ptr++;
+ boost::uint16_t result = *ptr++;
result |= *ptr++ << 8;
return result ;
}
/// Read two bytes as a signed int (aligned)
- int16_t read_s16()
+ boost::int16_t read_s16()
{
- return static_cast<int16_t>(read_u16());
+ return static_cast<boost::int16_t>(read_u16());
}
/// Read four bytes as an unsigned int (aligned)
- uint32_t read_u32()
+ boost::uint32_t read_u32()
{
align();
assert(ptr+4 < end);
- uint32_t result = *ptr++;
+ boost::uint32_t result = *ptr++;
result |= *ptr++ << 8;
result |= *ptr++ << 16;
result |= *ptr++ << 24;
@@ -132,9 +132,9 @@
}
/// Read four bytes as an signed int (aligned)
- int32_t read_s32()
+ boost::int32_t read_s32()
{
- return static_cast<int32_t>(read_u32());
+ return static_cast<boost::int32_t>(read_u32());
}
/// \brief
@@ -146,9 +146,9 @@
}
/// Checks if the stream contains X bits
- bool gotBits(uint32_t nbits)
+ bool gotBits(boost::uint32_t nbits)
{
- uint32_t gotbits = 8-usedBits +8*(end-ptr-1);
+ boost::uint32_t gotbits = 8-usedBits +8*(end-ptr-1);
if (gotbits > nbits) return true;
else return false;
}
Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/FLVParser.cpp 6 Sep 2007 12:21:06 -0000 1.23
+++ libbase/FLVParser.cpp 4 Dec 2007 11:45:23 -0000 1.24
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.23 2007/09/06 12:21:06 tgc Exp $
+// $Id: FLVParser.cpp,v 1.24 2007/12/04 11:45:23 strk Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -52,7 +52,7 @@
}
-uint32_t FLVParser::getBufferLength()
+boost::uint32_t FLVParser::getBufferLength()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -70,7 +70,7 @@
}
return 0;
}
-uint16_t FLVParser::videoFrameRate()
+boost::uint16_t FLVParser::videoFrameRate()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -81,13 +81,13 @@
if (_videoFrames.size() < 2) return 0;
- uint32_t framedelay = _videoFrames[1]->timestamp -
_videoFrames[0]->timestamp;
+ boost::uint32_t framedelay = _videoFrames[1]->timestamp -
_videoFrames[0]->timestamp;
- return static_cast<int16_t>(1000 / framedelay);
+ return static_cast<boost::int16_t>(1000 / framedelay);
}
-uint32_t FLVParser::videoFrameDelay()
+boost::uint32_t FLVParser::videoFrameDelay()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -105,7 +105,7 @@
return _videoFrames[_nextVideoFrame-1]->timestamp -
_videoFrames[_nextVideoFrame-2]->timestamp;
}
-uint32_t FLVParser::audioFrameDelay()
+boost::uint32_t FLVParser::audioFrameDelay()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -127,8 +127,8 @@
{
boost::mutex::scoped_lock lock(_mutex);
- uint32_t video_size = _videoFrames.size();
- uint32_t audio_size = _audioFrames.size();
+ boost::uint32_t video_size = _videoFrames.size();
+ boost::uint32_t audio_size = _audioFrames.size();
if (audio_size <= _nextAudioFrame && video_size <= _nextVideoFrame)
{
@@ -234,7 +234,7 @@
}
// Make sure that there are parsed enough frames to return the need
frame
- while(_videoFrames.size() <= static_cast<uint32_t>(_nextVideoFrame) &&
!_parsingComplete)
+ while(_videoFrames.size() <=
static_cast<boost::uint32_t>(_nextVideoFrame) && !_parsingComplete)
{
if (!parseNextFrame()) break;
}
@@ -264,7 +264,7 @@
}
-uint32_t FLVParser::seekAudio(uint32_t time)
+boost::uint32_t FLVParser::seekAudio(boost::uint32_t time)
{
// Make sure that there are parsed some frames
@@ -318,7 +318,7 @@
}
-uint32_t FLVParser::seekVideo(uint32_t time)
+boost::uint32_t FLVParser::seekVideo(boost::uint32_t time)
{
// Make sure that there are parsed some frames
while(_videoFrames.size() < 1 && !_parsingComplete) {
@@ -371,13 +371,13 @@
}
#if 0
- uint32_t diff = abs(_videoFrames[bestFrame]->timestamp - time);
+ boost::uint32_t diff = abs(_videoFrames[bestFrame]->timestamp - time);
while (true)
{
- if (bestFrame+1 < numFrames &&
static_cast<uint32_t>(abs(_videoFrames[bestFrame+1]->timestamp - time)) < diff)
{
+ if (bestFrame+1 < numFrames &&
static_cast<boost::uint32_t>(abs(_videoFrames[bestFrame+1]->timestamp - time))
< diff) {
diff = abs(_videoFrames[bestFrame+1]->timestamp - time);
bestFrame = bestFrame + 1;
- } else if (bestFrame > 0 &&
static_cast<uint32_t>(abs(_videoFrames[bestFrame-1]->timestamp - time)) < diff)
{
+ } else if (bestFrame > 0 &&
static_cast<boost::uint32_t>(abs(_videoFrames[bestFrame-1]->timestamp - time))
< diff) {
diff = abs(_videoFrames[bestFrame-1]->timestamp - time);
bestFrame = bestFrame - 1;
} else {
@@ -410,8 +410,8 @@
}
else
{
- int32_t forwardDiff = _videoFrames[forwardKeyframe]->timestamp
- time;
- int32_t rewindDiff = time -
_videoFrames[rewindKeyframe]->timestamp;
+ boost::int32_t forwardDiff =
_videoFrames[forwardKeyframe]->timestamp - time;
+ boost::int32_t rewindDiff = time -
_videoFrames[rewindKeyframe]->timestamp;
if (forwardDiff < rewindDiff) bestFrame = forwardKeyframe;
else bestFrame = rewindKeyframe;
@@ -469,7 +469,7 @@
}
-bool FLVParser::isTimeLoaded(uint32_t time)
+bool FLVParser::isTimeLoaded(boost::uint32_t time)
{
boost::mutex::scoped_lock lock(_mutex);
@@ -494,7 +494,7 @@
}
-uint32_t FLVParser::seek(uint32_t time)
+boost::uint32_t FLVParser::seek(boost::uint32_t time)
{
boost::mutex::scoped_lock lock(_mutex);
@@ -524,8 +524,8 @@
_lt.read(tag, 12);
// Extract length and timestamp
- uint32_t bodyLength = getUInt24(&tag[1]);
- uint32_t timestamp = getUInt24(&tag[4]);
+ boost::uint32_t bodyLength = getUInt24(&tag[1]);
+ boost::uint32_t timestamp = getUInt24(&tag[4]);
// Check if there is enough data to parse the body of the frame
if (!_lt.isPositionConfirmed(_lastParsedPosition+15+bodyLength)) return
false;
@@ -570,10 +570,10 @@
// If this is the first videoframe no info about the
// video format has been noted, so we do that now
if (_videoInfo == NULL) {
- uint16_t codec = (tag[11] & 0x0f) >> 0;
+ boost::uint16_t codec = (tag[11] & 0x0f) >> 0;
// Set standard guessed size...
- uint16_t width = 320;
- uint16_t height = 240;
+ boost::uint16_t width = 320;
+ boost::uint16_t height = 240;
// Extract the video size from the videodata header
if (codec == VIDEO_CODEC_H263) {
@@ -667,7 +667,7 @@
return true;
}
-inline uint32_t FLVParser::getUInt24(uint8_t* in)
+inline boost::uint32_t FLVParser::getUInt24(uint8_t* in)
{
// The bits are in big endian order
return (in[0] << 16) | (in[1] << 8) | in[2];
Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/FLVParser.h 27 Sep 2007 23:59:52 -0000 1.19
+++ libbase/FLVParser.h 4 Dec 2007 11:45:23 -0000 1.20
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.19 2007/09/27 23:59:52 tgc Exp $
+// $Id: FLVParser.h,v 1.20 2007/12/04 11:45:23 strk Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -38,9 +38,9 @@
class FLVFrame
{
public:
- uint32_t dataSize;
+ boost::uint32_t dataSize;
uint8_t* data;
- uint64_t timestamp;
+ boost::uint64_t timestamp;
uint8_t tag;
};
@@ -52,7 +52,7 @@
class FLVAudioInfo
{
public:
- FLVAudioInfo(uint16_t codeci, uint16_t sampleRatei, uint16_t
sampleSizei, bool stereoi, uint64_t durationi)
+ FLVAudioInfo(boost::uint16_t codeci, boost::uint16_t sampleRatei,
boost::uint16_t sampleSizei, bool stereoi, boost::uint64_t durationi)
: codec(codeci),
sampleRate(sampleRatei),
sampleSize(sampleSizei),
@@ -61,11 +61,11 @@
{
}
- uint16_t codec;
- uint16_t sampleRate;
- uint16_t sampleSize;
+ boost::uint16_t codec;
+ boost::uint16_t sampleRate;
+ boost::uint16_t sampleSize;
bool stereo;
- uint64_t duration;
+ boost::uint64_t duration;
};
/// \brief
@@ -76,7 +76,7 @@
class FLVVideoInfo
{
public:
- FLVVideoInfo(uint16_t codeci, uint16_t widthi, uint16_t heighti,
uint16_t frameRatei, uint64_t durationi)
+ FLVVideoInfo(boost::uint16_t codeci, boost::uint16_t widthi,
boost::uint16_t heighti, boost::uint16_t frameRatei, boost::uint64_t durationi)
: codec(codeci),
width(widthi),
height(heighti),
@@ -85,23 +85,23 @@
{
}
- uint16_t codec;
- uint16_t width;
- uint16_t height;
- uint16_t frameRate;
- uint64_t duration;
+ boost::uint16_t codec;
+ boost::uint16_t width;
+ boost::uint16_t height;
+ boost::uint16_t frameRate;
+ boost::uint64_t duration;
};
class FLVVideoFrame
{
public:
- uint16_t frameType;
- uint32_t dataSize;
- uint64_t dataPosition;
+ boost::uint16_t frameType;
+ boost::uint32_t dataSize;
+ boost::uint64_t dataPosition;
/// in milliseconds
- uint32_t timestamp;
+ boost::uint32_t timestamp;
/// Return true if this video frame is a key frame
bool isKeyFrame() const
@@ -114,11 +114,11 @@
class FLVAudioFrame
{
public:
- uint32_t dataSize;
- uint64_t dataPosition;
+ boost::uint32_t dataSize;
+ boost::uint64_t dataPosition;
/// in milliseconds
- uint32_t timestamp;
+ boost::uint32_t timestamp;
};
@@ -248,7 +248,7 @@
/// @param time
/// Timestamp, in milliseconds.
///
- bool isTimeLoaded(uint32_t time);
+ bool isTimeLoaded(boost::uint32_t time);
/// \brief
/// Seeks to the closest possible position the given position,
@@ -256,14 +256,14 @@
//
/// Locks the _mutex
///
- uint32_t seek(uint32_t);
+ boost::uint32_t seek(boost::uint32_t);
/// Returns the framedelay from the last to the current
/// audioframe in milliseconds. This is used for framerate.
//
/// Locks the _mutex
///
- uint32_t audioFrameDelay();
+ boost::uint32_t audioFrameDelay();
/// \brief
/// Returns the framedelay from the last to the current
@@ -271,13 +271,13 @@
//
/// Locks the _mutex
///
- uint32_t videoFrameDelay();
+ boost::uint32_t videoFrameDelay();
/// Returns the framerate of the video
//
/// Locks the _mutex
///
- uint16_t videoFrameRate();
+ boost::uint16_t videoFrameRate();
/// Returns the "bufferlength", meaning the differens between the
/// current frames timestamp and the timestamp of the last parseable
@@ -285,17 +285,17 @@
//
/// Locks the _mutex
///
- uint32_t getBufferLength();
+ boost::uint32_t getBufferLength();
private:
/// seeks to the closest possible position the given position,
/// and returns the new position.
- uint32_t seekAudio(uint32_t time);
+ boost::uint32_t seekAudio(boost::uint32_t time);
/// seeks to the closest possible position the given position,
/// and returns the new position.
- uint32_t seekVideo(uint32_t time);
+ boost::uint32_t seekVideo(boost::uint32_t time);
/// Parses next frame from the file, returns true is a frame
@@ -306,7 +306,7 @@
bool parseHeader();
// Functions used to extract numbers from the file
- inline uint32_t getUInt24(uint8_t* in);
+ inline boost::uint32_t getUInt24(uint8_t* in);
/// The interface to the file, externally owned
LoadThread& _lt;
@@ -322,7 +322,7 @@
AudioFrames _audioFrames;
/// The position where the parsing should continue from.
- uint64_t _lastParsedPosition;
+ boost::uint64_t _lastParsedPosition;
/// Whether the parsing is complete or not
bool _parsingComplete;
Index: libbase/LoadThread.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/LoadThread.h 10 Nov 2007 11:51:42 -0000 1.14
+++ libbase/LoadThread.h 4 Dec 2007 11:45:23 -0000 1.15
@@ -97,7 +97,7 @@
/// Check if given position is confirmed to be accessable
bool isPositionConfirmed(size_t pos) const
{
- return (static_cast<int32_t>(pos) <= _loadPosition);
+ return (static_cast<boost::int32_t>(pos) <= _loadPosition);
}
/// Request download cancel
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- libbase/Makefile.am 2 Dec 2007 14:54:32 -0000 1.92
+++ libbase/Makefile.am 4 Dec 2007 11:45:23 -0000 1.93
@@ -95,7 +95,6 @@
tu_random.cpp \
tu_timer.cpp \
WallClockTimer.cpp \
- tu_types.cpp \
utf8.cpp \
utility.cpp \
curl_adapter.cpp \
@@ -137,7 +136,6 @@
tu_random.h \
tu_timer.h \
WallClockTimer.h \
- tu_types.h \
utf8.h \
utility.h \
curl_adapter.h \
Index: libbase/WallClockTimer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/WallClockTimer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/WallClockTimer.cpp 25 Sep 2007 14:17:20 -0000 1.1
+++ libbase/WallClockTimer.cpp 4 Dec 2007 11:45:23 -0000 1.2
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: WallClockTimer.cpp,v 1.1 2007/09/25 14:17:20 strk Exp $ */
+/* $Id: WallClockTimer.cpp,v 1.2 2007/12/04 11:45:23 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -41,10 +41,10 @@
startTimer = tu_timer::get_ticks();
}
-uint32_t
+boost::uint32_t
WallClockTimer::elapsed() const
{
- uint64_t currTime = tu_timer::get_ticks();
+ boost::uint64_t currTime = tu_timer::get_ticks();
// be aware of time glitches
if ( currTime <= startTimer ) return 0;
Index: libbase/WallClockTimer.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/WallClockTimer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/WallClockTimer.h 25 Sep 2007 14:17:20 -0000 1.1
+++ libbase/WallClockTimer.h 4 Dec 2007 11:45:23 -0000 1.2
@@ -38,14 +38,14 @@
/// \brief
/// Return time elapsed in milliseconds since construction
/// or last call to ::restart()
- DSOEXPORT uint32_t elapsed() const;
+ DSOEXPORT boost::uint32_t elapsed() const;
/// Restart the timer
DSOEXPORT void restart();
private:
- uint64_t startTimer;
+ boost::uint64_t startTimer;
};
Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/image.h 10 Sep 2007 16:53:29 -0000 1.16
+++ libbase/image.h 4 Dec 2007 11:45:23 -0000 1.17
@@ -10,7 +10,6 @@
#include "tu_config.h"
-#include "tu_types.h"
#include <boost/scoped_array.hpp>
#include <memory> // for auto_ptr
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- libbase/log.h 20 Aug 2007 16:21:04 -0000 1.60
+++ libbase/log.h 4 Dec 2007 11:45:24 -0000 1.61
@@ -387,6 +387,20 @@
}
};
+#ifndef HAVE_FUNCTION
+ #ifndef HAVE_func
+ #define dummystr(x) # x
+ #define dummyestr(x) dummystr(x)
+ #define __FUNCTION__ __FILE__":"dummyestr(__LINE__)
+ #else
+ #define __FUNCTION__ __func__
+ #endif
+#endif
+
+#ifndef HAVE_PRETTY_FUNCTION
+ #define __PRETTY_FUNCTION__ __FUNCTION__
+#endif
+
#if defined(__cplusplus) && defined(__GNUC__)
#define GNASH_REPORT_FUNCTION \
gnash::__Host_Function_Report__ __host_function_report__(
__PRETTY_FUNCTION__)
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/rc.cpp 20 Oct 2007 09:16:05 -0000 1.43
+++ libbase/rc.cpp 4 Dec 2007 11:45:24 -0000 1.44
@@ -22,6 +22,10 @@
# include "config.h"
#endif
+#include "StringPredicates.h"
+#include "log.h"
+#include "rc.h"
+
#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
@@ -36,10 +40,6 @@
#include <iostream>
#include <fstream>
-#include "tu_types.h"
-#include "StringPredicates.h"
-#include "log.h"
-#include "rc.h"
#ifndef DEFAULT_STREAMS_TIMEOUT
// TODO: add a ./configure switch to set this
Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/tu_file.h 2 Dec 2007 14:54:33 -0000 1.18
+++ libbase/tu_file.h 4 Dec 2007 11:45:24 -0000 1.19
@@ -10,11 +10,11 @@
#define TU_FILE_H
-#include "tu_config.h"
-#include <cstdio>
-#include "tu_types.h"
+#include "tu_config.h" // needed ?
#include "utility.h"
+#include <cstdio>
+
class membuf;
struct SDL_RWops;
@@ -109,12 +109,12 @@
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- uint32_t read_le32() {
+ boost::uint32_t read_le32() {
// read8() is uint8_t, so no masks with 0xff are required.
- uint32_t result = (uint32_t)read8();
- result |= (uint32_t)read8() << 8;
- result |= (uint32_t)read8() << 16;
- result |= (uint32_t)read8() << 24;
+ boost::uint32_t result = (boost::uint32_t)read8();
+ result |= (boost::uint32_t)read8() << 8;
+ result |= (boost::uint32_t)read8() << 16;
+ result |= (boost::uint32_t)read8() << 24;
return(result);
}
@@ -126,8 +126,8 @@
/// TODO: define a platform-neutral type for 64 bits.
long double read_le_double64() {
return static_cast<long double> (
- static_cast<int64_t> (read_le32()) |
- static_cast<int64_t> (read_le32()) << 32
+ static_cast<boost::int64_t> (read_le32()) |
+ static_cast<boost::int64_t> (read_le32()) << 32
);
}
@@ -136,9 +136,9 @@
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- uint16_t read_le16() {
- uint16_t result = (uint16_t)read8();
- result |= (uint16_t)read8() << 8;
+ boost::uint16_t read_le16() {
+ boost::uint16_t result = (boost::uint16_t)read8();
+ result |= (boost::uint16_t)read8() << 8;
return(result);
}
@@ -147,7 +147,7 @@
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- void write_le32(uint32_t u) {
+ void write_le32(boost::uint32_t u) {
write8((uint8_t)u);
write8((uint8_t)(u>>8));
write8((uint8_t)(u>>16));
@@ -159,7 +159,7 @@
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- void write_le16(uint16_t u) {
+ void write_le16(boost::uint16_t u) {
write8((uint8_t)u);
write8((uint8_t)(u>>8));
}
@@ -277,18 +277,18 @@
private:
- uint64_t read64() {
- uint64_t u;
+ boost::uint64_t read64() {
+ boost::uint64_t u;
m_read(&u, 8, m_data);
return u;
}
- uint32_t read32() {
- uint32_t u;
+ boost::uint32_t read32() {
+ boost::uint32_t u;
m_read(&u, 4, m_data);
return u;
}
- uint16_t read16() {
- uint16_t u;
+ boost::uint16_t read16() {
+ boost::uint16_t u;
m_read(&u, 2, m_data);
return u;
}
@@ -298,13 +298,13 @@
return u;
}
- void write64(uint64_t u) {
+ void write64(boost::uint64_t u) {
m_write(&u, 8, m_data);
}
- void write32(uint32_t u) {
+ void write32(boost::uint32_t u) {
m_write(&u, 4, m_data);
}
- void write16(uint16_t u) {
+ void write16(boost::uint16_t u) {
m_write(&u, 2, m_data);
}
void write8(uint8_t u) {
@@ -338,9 +338,9 @@
{
union alias {
float f;
- uint32_t i;
+ boost::uint32_t i;
} u;
- compiler_assert(sizeof(alias) == sizeof(uint32_t));
+ compiler_assert(sizeof(alias) == sizeof(boost::uint32_t));
u.f = value;
write_le32(u.i);
@@ -355,7 +355,7 @@
{
union {
float f;
- uint32_t i;
+ boost::uint32_t i;
} u;
compiler_assert(sizeof(u) == sizeof(u.i));
Index: libbase/tu_random.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_random.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/tu_random.cpp 11 Apr 2007 17:54:21 -0000 1.7
+++ libbase/tu_random.cpp 4 Dec 2007 11:45:24 -0000 1.8
@@ -17,12 +17,12 @@
// Global generator.
static generator s_generator;
- uint32_t next_random()
+ boost::uint32_t next_random()
{
return s_generator.next_random();
}
- void seed_random(uint32_t seed)
+ void seed_random(boost::uint32_t seed)
{
s_generator.seed_random(seed);
}
@@ -52,14 +52,14 @@
// random number generator. _Statistics and Probability Letters
// 8_ (1990), 35-39.
-// const uint64_t a = 123471786; // for SEED_COUNT=1024
-// const uint64_t a = 123554632; // for SEED_COUNT=512
-// const uint64_t a = 8001634; // for SEED_COUNT=255
-// const uint64_t a = 8007626; // for SEED_COUNT=128
-// const uint64_t a = 647535442; // for SEED_COUNT=64
-// const uint64_t a = 547416522; // for SEED_COUNT=32
-// const uint64_t a = 487198574; // for SEED_COUNT=16
- const uint64_t a = 716514398; // for SEED_COUNT=8
+// const boost::uint64_t a = 123471786; // for SEED_COUNT=1024
+// const boost::uint64_t a = 123554632; // for SEED_COUNT=512
+// const boost::uint64_t a = 8001634; // for SEED_COUNT=255
+// const boost::uint64_t a = 8007626; // for SEED_COUNT=128
+// const boost::uint64_t a = 647535442; // for SEED_COUNT=64
+// const boost::uint64_t a = 547416522; // for SEED_COUNT=32
+// const boost::uint64_t a = 487198574; // for SEED_COUNT=16
+ const boost::uint64_t a = 716514398; // for SEED_COUNT=8
generator::generator()
@@ -71,11 +71,11 @@
}
- void generator::seed_random(uint32_t seed)
+ void generator::seed_random(boost::uint32_t seed)
{
// Simple pseudo-random to reseed the seeds.
// Suggested by the above article.
- uint32_t j = seed;
+ boost::uint32_t j = seed;
for (int i = 0; i < SEED_COUNT; i++)
{
j = j ^ (j << 13);
@@ -86,27 +86,27 @@
}
- uint32_t generator::next_random()
+ boost::uint32_t generator::next_random()
// Return the next pseudo-random number in the sequence.
{
- uint64_t t;
- uint32_t x;
+ boost::uint64_t t;
+ boost::uint32_t x;
- //static uint32_t c = 362436;
- //static uint32_t i = SEED_COUNT - 1;
- const uint32_t r = 0xFFFFFFFE;
+ //static boost::uint32_t c = 362436;
+ //static boost::uint32_t i = SEED_COUNT - 1;
+ const boost::uint32_t r = 0xFFFFFFFE;
i = (i+1) & (SEED_COUNT - 1);
t = a * Q[i] + c;
- c = (uint32_t) (t >> 32);
- x = (uint32_t) (t + c);
+ c = (boost::uint32_t) (t >> 32);
+ x = (boost::uint32_t) (t + c);
if (x < c)
{
x++;
c++;
}
- uint32_t val = r - x;
+ boost::uint32_t val = r - x;
Q[i] = val;
return val;
}
@@ -114,7 +114,7 @@
float generator::get_unit_float()
{
- uint32_t r = next_random();
+ boost::uint32_t r = next_random();
// 24 bits of precision.
return float(r >> 8) / (16777216.0f - 1.0f);
@@ -136,7 +136,7 @@
for (int i = 0; i < COUNT; i++)
{
- uint32_t val = tu_random::next_random();
+ boost::uint32_t val = tu_random::next_random();
fwrite(&val, sizeof(val), 1, stdout);
}
}
Index: libbase/tu_random.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_random.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/tu_random.h 14 Sep 2006 23:54:22 -0000 1.4
+++ libbase/tu_random.h 4 Dec 2007 11:45:24 -0000 1.5
@@ -10,15 +10,15 @@
#define TU_RANDOM_H
-#include "tu_config.h"
-#include "tu_types.h"
+#include "tu_config.h" // needed ?
+#include <boost/cstdint.hpp> // for boost::uint32_t used in this file
namespace tu_random
{
// Global generator.
- DSOEXPORT uint32_t next_random();
- void seed_random(uint32_t seed);
+ DSOEXPORT boost::uint32_t next_random();
+ void seed_random(boost::uint32_t seed);
DSOEXPORT float get_unit_float();
// In case you need independent generators. The global
@@ -28,14 +28,14 @@
{
public:
generator();
- void seed_random(uint32_t seed); // not necessary
- uint32_t next_random();
+ void seed_random(boost::uint32_t seed); // not necessary
+ boost::uint32_t next_random();
float get_unit_float();
private:
- uint32_t Q[SEED_COUNT];
- uint32_t c;
- uint32_t i;
+ boost::uint32_t Q[SEED_COUNT];
+ boost::uint32_t c;
+ boost::uint32_t i;
};
} // end namespace tu_random
Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/tu_timer.cpp 8 Oct 2007 16:05:53 -0000 1.14
+++ libbase/tu_timer.cpp 4 Dec 2007 11:45:24 -0000 1.15
@@ -15,19 +15,19 @@
#include <mmsystem.h>
-uint64_t tu_timer::get_ticks()
+boost::uint64_t tu_timer::get_ticks()
{
return timeGetTime();
}
-double tu_timer::ticks_to_seconds(uint64_t ticks)
+double tu_timer::ticks_to_seconds(boost::uint64_t ticks)
{
return ticks * (1.0f / 1000.f);
}
-uint64_t tu_timer::get_profile_ticks()
+boost::uint64_t tu_timer::get_profile_ticks()
{
// @@ use rdtsc?
@@ -39,7 +39,7 @@
}
-double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
+double tu_timer::profile_ticks_to_seconds(boost::uint64_t ticks)
{
LARGE_INTEGER freq;
QueryPerformanceFrequency(&freq);
@@ -60,19 +60,19 @@
// The profile ticks implementation is just fine for a normal timer.
-uint64_t tu_timer::get_ticks()
+boost::uint64_t tu_timer::get_ticks()
{
- return static_cast<uint64_t>(get_profile_ticks()/1000.0);
+ return static_cast<boost::uint64_t>(get_profile_ticks()/1000.0);
}
-double tu_timer::ticks_to_seconds(uint64_t ticks)
+double tu_timer::ticks_to_seconds(boost::uint64_t ticks)
{
return profile_ticks_to_seconds(ticks);
}
-uint64_t tu_timer::get_profile_ticks()
+boost::uint64_t tu_timer::get_profile_ticks()
{
// @@ TODO prefer rdtsc when available?
@@ -81,7 +81,7 @@
gettimeofday(&tv, 0);
- uint64_t result = (uint64_t)tv.tv_sec * 1000000L;
+ boost::uint64_t result = (boost::uint64_t)tv.tv_sec * 1000000L;
result += tv.tv_usec;
// Time Unit: microsecond
@@ -90,7 +90,7 @@
}
-double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
+double tu_timer::profile_ticks_to_seconds(boost::uint64_t ticks)
{
// ticks is microseconds. Convert to seconds.
return ticks / 1000000.0;
Index: libbase/tu_timer.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/tu_timer.h 13 Sep 2007 09:47:31 -0000 1.8
+++ libbase/tu_timer.h 4 Dec 2007 11:45:24 -0000 1.9
@@ -8,18 +8,19 @@
#ifndef TU_TIMER_H
-#include "tu_config.h"
-#include "tu_types.h"
+#include "tu_config.h" // needed ?
+
+#include <boost/cstdint.hpp> // for boost::?int??_t
namespace tu_timer
{
// General-purpose wall-clock timer. May not be hi-res enough
// for profiling. Time Unit: millisecond
- DSOEXPORT uint64_t get_ticks();
+ DSOEXPORT boost::uint64_t get_ticks();
// Time Unit: second
- DSOEXPORT double ticks_to_seconds(uint64_t ticks);
+ DSOEXPORT double ticks_to_seconds(boost::uint64_t ticks);
// Hi-res timer for CPU profiling.
@@ -28,10 +29,10 @@
// operation, and pass the difference to
// profile_ticks_to_seconds() to find out how long the
// operation took.
- DSOEXPORT uint64_t get_profile_ticks();
+ DSOEXPORT boost::uint64_t get_profile_ticks();
// Convert a hi-res ticks value into seconds.
- DSOEXPORT double profile_ticks_to_seconds(uint64_t
profile_ticks);
+ DSOEXPORT double profile_ticks_to_seconds(boost::uint64_t
profile_ticks);
}
Index: libbase/utf8.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/utf8.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/utf8.cpp 14 Sep 2006 05:02:11 -0000 1.5
+++ libbase/utf8.cpp 4 Dec 2007 11:45:24 -0000 1.6
@@ -11,9 +11,9 @@
#include "utf8.h"
-uint32_t utf8::decode_next_unicode_character(const char** utf8_buffer)
+boost::uint32_t utf8::decode_next_unicode_character(const char**
utf8_buffer)
{
- uint32_t uc;
+ boost::uint32_t uc;
char c;
// Security considerations:
@@ -48,7 +48,7 @@
if (c == 0) return 0; // End of buffer. Do not advance.
(*utf8_buffer)++;
- if ((c & 0x80) == 0) return (uint32_t) c; // Conventional 7-bit
ASCII.
+ if ((c & 0x80) == 0) return (boost::uint32_t) c; // Conventional
7-bit ASCII.
// Multi-byte sequences.
if ((c & 0xE0) == 0xC0)
@@ -111,7 +111,7 @@
}
-void utf8::encode_unicode_character(char* buffer, int* index, uint32_t
ucs_character)
+void utf8::encode_unicode_character(char* buffer, int* index,
boost::uint32_t ucs_character)
{
if (ucs_character <= 0x7F)
{
@@ -188,12 +188,12 @@
#include <cstdio>
-bool check_equal(const char* utf8_in, const uint32_t* ucs_in)
+bool check_equal(const char* utf8_in, const boost::uint32_t* ucs_in)
{
for (;;)
{
- uint32_t next_ucs = *ucs_in++;
- uint32_t next_ucs_from_utf8 =
utf8::decode_next_unicode_character(&utf8_in);
+ boost::uint32_t next_ucs = *ucs_in++;
+ boost::uint32_t next_ucs_from_utf8 =
utf8::decode_next_unicode_character(&utf8_in);
if (next_ucs != next_ucs_from_utf8)
{
return false;
@@ -233,11 +233,11 @@
}
-void log_ucs(const uint32_t* line)
+void log_ucs(const boost::uint32_t* line)
{
for (;;)
{
- uint32_t uc = *line++;
+ boost::uint32_t uc = *line++;
if (uc == 0)
{
// End of line.
@@ -262,7 +262,7 @@
// Simple canned test.
{
const char* test8 = "Ignacio Castaño";
- const uint32_t test32[] =
+ const boost::uint32_t test32[] =
{
0x49, 0x67, 0x6E, 0x61, 0x63,
0x69, 0x6F, 0x20, 0x43, 0x61,
@@ -288,7 +288,7 @@
const int LINE_SIZE = 200; // max line size
char line_buffer_utf8[LINE_SIZE];
char reencoded_utf8[6 * LINE_SIZE];
- uint32_t line_buffer_ucs[LINE_SIZE];
+ boost::uint32_t line_buffer_ucs[LINE_SIZE];
int byte_counter = 0;
for (;;)
@@ -307,10 +307,10 @@
// Decode into UCS.
const char* p = line_buffer_utf8;
- uint32_t* q = line_buffer_ucs;
+ boost::uint32_t* q = line_buffer_ucs;
for (;;)
{
- uint32_t uc =
utf8::decode_next_unicode_character(&p);
+ boost::uint32_t uc =
utf8::decode_next_unicode_character(&p);
*q++ = uc;
assert(q < line_buffer_ucs + LINE_SIZE);
@@ -324,7 +324,7 @@
int index = 0;
for (;;)
{
- uint32_t uc = *q++;
+ boost::uint32_t uc = *q++;
assert(index < LINE_SIZE * 6 - 6);
int last_index = index;
utf8::encode_unicode_character(reencoded_utf8, &index, uc);
Index: libbase/utf8.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utf8.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/utf8.h 14 Sep 2006 23:54:22 -0000 1.3
+++ libbase/utf8.h 4 Dec 2007 11:45:24 -0000 1.4
@@ -9,8 +9,9 @@
#ifndef UTF8_H
#define UTF8_H
-#include "tu_config.h"
-#include "tu_types.h"
+#include "tu_config.h" // needed ?
+
+#include <boost/cstdint.hpp> // for boost::?int??_t
namespace utf8
@@ -20,7 +21,7 @@
// as output. Advances *utf8_buffer past the character
// returned, unless the returned character is '\0', in which
// case the buffer does not advance.
- DSOEXPORT uint32_t decode_next_unicode_character(const char**
utf8_buffer);
+ DSOEXPORT boost::uint32_t decode_next_unicode_character(const
char** utf8_buffer);
// Encodes the given UCS character into the given UTF-8
// buffer. Writes the data starting at buffer[offset], and
@@ -28,7 +29,7 @@
//
// May write up to 6 bytes, so make sure there's room in the
// buffer!
- DSOEXPORT void encode_unicode_character(char* buffer, int* offset,
uint32_t ucs_character);
+ DSOEXPORT void encode_unicode_character(char* buffer, int* offset,
boost::uint32_t ucs_character);
}
Index: libbase/utility.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/utility.cpp 2 Sep 2007 00:38:20 -0000 1.17
+++ libbase/utility.cpp 4 Dec 2007 11:45:24 -0000 1.18
@@ -22,7 +22,7 @@
#include "config.h"
#endif
-#include <boost/cstdint.hpp> // for int16_t
+#include <boost/cstdint.hpp> // for boost::int16_t
#include <cstring> // for memcpy
@@ -109,7 +109,7 @@
// Converts input data to output format.
// sample_size
void convert_raw_data(
- int16_t** adjusted_data,
+ boost::int16_t** adjusted_data,
int* adjusted_size,
void* data,
int sample_count, // A stereo pair counts as one
@@ -147,9 +147,9 @@
}
int output_sample_count = (sample_count * dup * (stereo ? 2 : 1)) /
inc;
- int16_t* out_data = new int16_t[output_sample_count];
+ boost::int16_t* out_data = new boost::int16_t[output_sample_count];
*adjusted_data = out_data;
- *adjusted_size = output_sample_count * sizeof(int16_t); // in bytes
+ *adjusted_size = output_sample_count * sizeof(boost::int16_t); // in bytes
// Either inc > 1 (decimate the audio)
// or dup > 1 (repeat samples)
@@ -157,12 +157,12 @@
if (inc == 1 && dup == 1)
{
// No tranformation required
- memcpy(out_data, data, output_sample_count * sizeof(int16_t));
+ memcpy(out_data, data, output_sample_count *
sizeof(boost::int16_t));
}
else if (inc > 1)
{
// Downsample by skipping samples from the input
- int16_t* in = (int16_t*) data;
+ boost::int16_t* in = (boost::int16_t*) data;
for (int i = output_sample_count; i > 0; i--)
{
*out_data++ = *in;
@@ -179,7 +179,7 @@
// then the right sample in both channels alternately.
// So for stereo-stereo transforms we have a stereo routine.
- int16_t* in = (int16_t*) data;
+ boost::int16_t* in = (boost::int16_t*) data;
if (stereo && m_stereo) {
// Stereo-to-stereo upsampling: Replicate pairs of samples
Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- libbase/utility.h 2 Dec 2007 14:54:33 -0000 1.36
+++ libbase/utility.h 4 Dec 2007 11:45:24 -0000 1.37
@@ -22,14 +22,13 @@
#define UTILITY_H
#include "tu_config.h"
-//#include "tu_math.h"
-//#include "tu_types.h"
#include <cassert>
#include <cctype>
#include <string>
#include <typeinfo>
#include <cmath>
+#include <boost/cstdint.hpp>
#if defined(__GNUC__) && __GNUC__ > 2
# include <cxxabi.h>
@@ -252,7 +251,7 @@
/// @param m_stereo
/// Do we want the output data to be in stereo?
///
-void convert_raw_data(int16_t** adjusted_data,
+void convert_raw_data(boost::int16_t** adjusted_data,
int* adjusted_size, void* data, int sample_count,
int sample_size, int sample_rate, bool stereo,
int m_sample_rate, bool m_stereo);
Index: libmedia/AudioDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoder.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/AudioDecoder.h 24 Nov 2007 17:21:41 -0000 1.5
+++ libmedia/AudioDecoder.h 4 Dec 2007 11:45:25 -0000 1.6
@@ -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.5 2007/11/24 17:21:41 strk Exp $
+// $Id: AudioDecoder.h,v 1.6 2007/12/04 11:45:25 strk Exp $
#ifndef __AUDIODECODER_H__
#define __AUDIODECODER_H__
@@ -77,7 +77,7 @@
/// @return a pointer to the decoded data, or NULL if decoding fails.
/// The caller owns the decoded data.
///
- virtual uint8_t* decode(uint8_t* /*input*/, uint32_t /*inputSize*/,
uint32_t& /*outputSize*/, uint32_t& /*decodedData*/, bool /*parse*/) { return
NULL; }
+ virtual uint8_t* decode(uint8_t* /*input*/, boost::uint32_t
/*inputSize*/, boost::uint32_t& /*outputSize*/, boost::uint32_t&
/*decodedData*/, bool /*parse*/) { return NULL; }
};
Index: libmedia/AudioDecoderNellymoser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/AudioDecoderNellymoser.cpp 24 Nov 2007 17:21:42 -0000 1.4
+++ libmedia/AudioDecoderNellymoser.cpp 4 Dec 2007 11:45:25 -0000 1.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderNellymoser.cpp,v 1.4 2007/11/24 17:21:42 strk Exp $
+// $Id: AudioDecoderNellymoser.cpp,v 1.5 2007/12/04 11:45:25 strk Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -770,13 +770,13 @@
}
-uint8_t* AudioDecoderNellymoser::decode(uint8_t* input, uint32_t inputSize,
uint32_t& outputSize, uint32_t& decodedBytes, bool /*parse*/)
+uint8_t* AudioDecoderNellymoser::decode(uint8_t* input, boost::uint32_t
inputSize, boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool
/*parse*/)
{
float float_buf[256];
- uint32_t out_buf_size = (inputSize / 64) * 256;
- int16_t* out_buf = new int16_t[out_buf_size];
- int16_t* out_buf_start = out_buf;
+ boost::uint32_t out_buf_size = (inputSize / 64) * 256;
+ boost::int16_t* out_buf = new boost::int16_t[out_buf_size];
+ boost::int16_t* out_buf_start = out_buf;
while (inputSize > 0) {
nelly_decode_block(_nh, input, float_buf);
@@ -787,12 +787,12 @@
}
uint8_t* tmp_raw_buffer = reinterpret_cast<uint8_t*>(out_buf_start);
- uint32_t tmp_raw_buffer_size = out_buf_size * 2;
+ boost::uint32_t tmp_raw_buffer_size = out_buf_size * 2;
// If we need to convert samplerate or/and from mono to stereo...
if (out_buf_size > 0 && (_sampleRate != 44100 || !_stereo)) {
- int16_t* adjusted_data = 0;
+ boost::int16_t* adjusted_data = 0;
int adjusted_size = 0;
int sample_count = out_buf_size / (_stereo ? 2 : 1);
Index: libmedia/AudioDecoderNellymoser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/AudioDecoderNellymoser.h 24 Nov 2007 17:21:42 -0000 1.4
+++ libmedia/AudioDecoderNellymoser.h 4 Dec 2007 11:45:25 -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: AudioDecoderNellymoser.h,v 1.4 2007/11/24 17:21:42 strk Exp $
+// $Id: AudioDecoderNellymoser.h,v 1.5 2007/12/04 11:45:25 strk Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -79,7 +79,7 @@
bool setup(AudioInfo* info);
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedBytes, bool parse);
+ uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
private:
@@ -87,7 +87,7 @@
nelly_handle* _nh;
// samplerate
- uint16_t _sampleRate;
+ boost::uint16_t _sampleRate;
// stereo
bool _stereo;
Index: libmedia/AudioDecoderSimple.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/AudioDecoderSimple.cpp 3 Dec 2007 08:35:34 -0000 1.9
+++ libmedia/AudioDecoderSimple.cpp 4 Dec 2007 11:45:25 -0000 1.10
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderSimple.cpp,v 1.9 2007/12/03 08:35:34 strk Exp $
+// $Id: AudioDecoderSimple.cpp,v 1.10 2007/12/04 11:45:25 strk Exp $
#include "AudioDecoderSimple.h"
#include "utility.h"
@@ -91,17 +91,17 @@
}
/* Uncompress 4096 mono samples of ADPCM. */
- static uint32_t doMonoBlock(int16_t** out_data, int n_bits, BitsReader*
in, int sample, int stepsize_index)
+ static boost::uint32_t doMonoBlock(boost::int16_t** out_data, int
n_bits, BitsReader* in, int sample, int stepsize_index)
{
/* First sample doesn't need to be decompressed. */
- uint32_t sample_count = 1;
- *(*out_data)++ = (int16_t) sample;
+ boost::uint32_t sample_count = 1;
+ *(*out_data)++ = (boost::int16_t) sample;
while (sample_count < 4096 && in->gotBits(n_bits))
{
int raw_code = in->read_uint(n_bits);
doSample(n_bits, sample, stepsize_index, raw_code);
/* sample & stepsize_index are in/out params */
- *(*out_data)++ = (int16_t) sample;
+ *(*out_data)++ = (boost::int16_t) sample;
sample_count++;
}
@@ -111,7 +111,7 @@
/* Uncompress 4096 stereo sample pairs of ADPCM. */
static int doStereoBlock(
- int16_t** out_data, // in/out param
+ boost::int16_t** out_data, // in/out param
int n_bits,
BitsReader* in,
int left_sample,
@@ -121,19 +121,19 @@
)
{
/* First samples don't need to be decompressed. */
- uint32_t sample_count = 2;
- *(*out_data)++ = (int16_t) left_sample;
- *(*out_data)++ = (int16_t) right_sample;
+ boost::uint32_t sample_count = 2;
+ *(*out_data)++ = (boost::int16_t) left_sample;
+ *(*out_data)++ = (boost::int16_t) right_sample;
while (sample_count < 4096 && in->gotBits(n_bits*2))
{
int left_raw_code = in->read_uint(n_bits);
doSample(n_bits, left_sample, left_stepsize_index,
left_raw_code);
- *(*out_data)++ = (int16_t) left_sample;
+ *(*out_data)++ = (boost::int16_t) left_sample;
int right_raw_code = in->read_uint(n_bits);
doSample(n_bits, right_sample, right_stepsize_index,
right_raw_code);
- *(*out_data)++ = (int16_t) right_sample;
+ *(*out_data)++ = (boost::int16_t) right_sample;
sample_count++;
}
@@ -144,21 +144,21 @@
// Utility function: uncompress ADPCM data from in BitReader to
// out_data[]. Returns the output samplecount.
- static uint32_t adpcm_expand(
+ static boost::uint32_t adpcm_expand(
unsigned char* &data,
BitsReader* in,
unsigned int insize,
bool stereo)
{
// The compression ratio is 4:1, so this should be enough...
- int16_t* out_data = new int16_t[insize * 5];
+ boost::int16_t* out_data = new boost::int16_t[insize * 5];
data = reinterpret_cast<unsigned char *>(out_data);
// Read header.
//in->ensureBytes(1); // nbits
unsigned int n_bits = in->read_uint(2) + 2; // 2 to 5 bits
(TODO: use unsigned...)
- uint32_t sample_count = 0;
+ boost::uint32_t sample_count = 0;
while (/*sample_count && !in->overread()*/in->gotBits(22))
{
@@ -252,18 +252,18 @@
static void u8_expand(
unsigned char * &data,
unsigned char* input,
- uint32_t input_size) // This is also the number of u8bit samples
+ boost::uint32_t input_size) // This is also the number of u8bit samples
{
boost::scoped_array<uint8_t> in_data ( new uint8_t[input_size] );
- int16_t *out_data = new int16_t[input_size];
+ boost::int16_t *out_data = new boost::int16_t[input_size];
memcpy((char *)in_data.get(), input, input_size);
// Convert 8-bit to 16
uint8_t *inp = in_data.get();
- int16_t *outp = out_data;
+ boost::int16_t *outp = out_data;
for (unsigned int i = input_size; i>0; i--) {
- *outp++ = ((int16_t)(*inp++) - 128) * 256;
+ *outp++ = ((boost::int16_t)(*inp++) - 128) * 256;
}
data = (unsigned char *)out_data;
@@ -311,7 +311,7 @@
}
}
-uint8_t* AudioDecoderSimple::decode(uint8_t* input, uint32_t inputSize,
uint32_t& outputSize, uint32_t& decodedBytes, bool /*parse*/)
+uint8_t* AudioDecoderSimple::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool /*parse*/)
{
unsigned char* decodedData = NULL;
@@ -320,8 +320,8 @@
switch (_codec) {
case AUDIO_CODEC_ADPCM:
{
- //uint32_t sample_count = inputSize * ( _stereo ? 1 : 2 );
//(_sampleCount == 0 ? inputSize / ( _stereo ? 4 : 2 ) : _sampleCount);
- uint32_t sample_count = ADPCMDecoder::adpcm_expand(decodedData,
new BitsReader(input,inputSize), inputSize, _stereo);
+ //boost::uint32_t sample_count = inputSize * ( _stereo ? 1 : 2
); //(_sampleCount == 0 ? inputSize / ( _stereo ? 4 : 2 ) : _sampleCount);
+ boost::uint32_t sample_count =
ADPCMDecoder::adpcm_expand(decodedData, new BitsReader(input,inputSize),
inputSize, _stereo);
outsize = sample_count * (_stereo ? 4 : 2);
}
break;
@@ -359,7 +359,7 @@
// nothing and is less of a continual maintenance
headache
// than compile-time detection.
union u {
- uint16_t s;
+ boost::uint16_t s;
struct {
uint8_t c0;
uint8_t c1;
@@ -389,12 +389,12 @@
}
uint8_t* tmp_raw_buffer = decodedData;
- uint32_t tmp_raw_buffer_size = 0;
+ boost::uint32_t tmp_raw_buffer_size = 0;
// If we need to convert samplerate or/and from mono to stereo...
if (outsize > 0 && (_sampleRate != 44100 || !_stereo)) {
- int16_t* adjusted_data = 0;
+ boost::int16_t* adjusted_data = 0;
int adjusted_size = 0;
int sample_count = outsize / (_stereo ? 4 : 2); // samples are
of size 2
Index: libmedia/AudioDecoderSimple.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/AudioDecoderSimple.h 24 Nov 2007 17:21:42 -0000 1.4
+++ libmedia/AudioDecoderSimple.h 4 Dec 2007 11:45:25 -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: AudioDecoderSimple.h,v 1.4 2007/11/24 17:21:42 strk Exp $
+// $Id: AudioDecoderSimple.h,v 1.5 2007/12/04 11:45:25 strk Exp $
#ifndef __AUDIODECODERSIMPLE_H__
#define __AUDIODECODERSIMPLE_H__
@@ -42,7 +42,7 @@
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedBytes, bool parse);
+ uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
private:
@@ -50,10 +50,10 @@
audioCodecType _codec;
// samplerate
- uint16_t _sampleRate;
+ boost::uint16_t _sampleRate;
// sampleCount
- uint32_t _sampleCount;
+ boost::uint32_t _sampleCount;
// stereo
bool _stereo;
Index: libmedia/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/FLVParser.cpp 30 Nov 2007 00:13:00 -0000 1.3
+++ libmedia/FLVParser.cpp 4 Dec 2007 11:45:25 -0000 1.4
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.3 2007/11/30 00:13:00 tgc Exp $
+// $Id: FLVParser.cpp,v 1.4 2007/12/04 11:45:25 strk Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -54,7 +54,7 @@
}
-uint32_t FLVParser::getBufferLength()
+boost::uint32_t FLVParser::getBufferLength()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -72,7 +72,7 @@
}
return 0;
}
-uint16_t FLVParser::videoFrameRate()
+boost::uint16_t FLVParser::videoFrameRate()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -83,13 +83,13 @@
if (_videoFrames.size() < 2) return 0;
- uint32_t framedelay = _videoFrames[1]->timestamp -
_videoFrames[0]->timestamp;
+ boost::uint32_t framedelay = _videoFrames[1]->timestamp -
_videoFrames[0]->timestamp;
- return static_cast<int16_t>(1000 / framedelay);
+ return static_cast<boost::int16_t>(1000 / framedelay);
}
-uint32_t FLVParser::videoFrameDelay()
+boost::uint32_t FLVParser::videoFrameDelay()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -107,7 +107,7 @@
return _videoFrames[_nextVideoFrame-1]->timestamp -
_videoFrames[_nextVideoFrame-2]->timestamp;
}
-uint32_t FLVParser::audioFrameDelay()
+boost::uint32_t FLVParser::audioFrameDelay()
{
boost::mutex::scoped_lock lock(_mutex);
@@ -129,8 +129,8 @@
{
boost::mutex::scoped_lock lock(_mutex);
- uint32_t video_size = _videoFrames.size();
- uint32_t audio_size = _audioFrames.size();
+ boost::uint32_t video_size = _videoFrames.size();
+ boost::uint32_t audio_size = _audioFrames.size();
if (_audio && audio_size <= _nextAudioFrame)
{
@@ -242,7 +242,7 @@
}
// Make sure that there are parsed enough frames to return the need
frame
- while(_videoFrames.size() <= static_cast<uint32_t>(_nextVideoFrame) &&
!_parsingComplete)
+ while(_videoFrames.size() <=
static_cast<boost::uint32_t>(_nextVideoFrame) && !_parsingComplete)
{
if (!parseNextFrame()) break;
}
@@ -271,7 +271,7 @@
}
-uint32_t FLVParser::seekAudio(uint32_t time)
+boost::uint32_t FLVParser::seekAudio(boost::uint32_t time)
{
// Make sure that there are parsed some frames
@@ -325,7 +325,7 @@
}
-uint32_t FLVParser::seekVideo(uint32_t time)
+boost::uint32_t FLVParser::seekVideo(boost::uint32_t time)
{
// Make sure that there are parsed some frames
while(_videoFrames.size() < 1 && !_parsingComplete) {
@@ -378,13 +378,13 @@
}
#if 0
- uint32_t diff = abs(_videoFrames[bestFrame]->timestamp - time);
+ boost::uint32_t diff = abs(_videoFrames[bestFrame]->timestamp - time);
while (true)
{
- if (bestFrame+1 < numFrames &&
static_cast<uint32_t>(abs(_videoFrames[bestFrame+1]->timestamp - time)) < diff)
{
+ if (bestFrame+1 < numFrames &&
static_cast<boost::uint32_t>(abs(_videoFrames[bestFrame+1]->timestamp - time))
< diff) {
diff = abs(_videoFrames[bestFrame+1]->timestamp - time);
bestFrame = bestFrame + 1;
- } else if (bestFrame > 0 &&
static_cast<uint32_t>(abs(_videoFrames[bestFrame-1]->timestamp - time)) < diff)
{
+ } else if (bestFrame > 0 &&
static_cast<boost::uint32_t>(abs(_videoFrames[bestFrame-1]->timestamp - time))
< diff) {
diff = abs(_videoFrames[bestFrame-1]->timestamp - time);
bestFrame = bestFrame - 1;
} else {
@@ -417,8 +417,8 @@
}
else
{
- int32_t forwardDiff = _videoFrames[forwardKeyframe]->timestamp
- time;
- int32_t rewindDiff = time -
_videoFrames[rewindKeyframe]->timestamp;
+ boost::int32_t forwardDiff =
_videoFrames[forwardKeyframe]->timestamp - time;
+ boost::int32_t rewindDiff = time -
_videoFrames[rewindKeyframe]->timestamp;
if (forwardDiff < rewindDiff) bestFrame = forwardKeyframe;
else bestFrame = rewindKeyframe;
@@ -482,7 +482,7 @@
}
-bool FLVParser::isTimeLoaded(uint32_t time)
+bool FLVParser::isTimeLoaded(boost::uint32_t time)
{
boost::mutex::scoped_lock lock(_mutex);
@@ -507,7 +507,7 @@
}
-uint32_t FLVParser::seek(uint32_t time)
+boost::uint32_t FLVParser::seek(boost::uint32_t time)
{
boost::mutex::scoped_lock lock(_mutex);
@@ -537,8 +537,8 @@
_stream->read_bytes(tag, 12);
// Extract length and timestamp
- uint32_t bodyLength = getUInt24(&tag[1]);
- uint32_t timestamp = getUInt24(&tag[4]);
+ boost::uint32_t bodyLength = getUInt24(&tag[1]);
+ boost::uint32_t timestamp = getUInt24(&tag[4]);
_lastParsedPosition += HEADER_SKIP + bodyLength;
@@ -584,8 +584,8 @@
if (_videoInfo.get() == NULL) {
videoCodecType codec =
static_cast<videoCodecType>((tag[11] & 0x0f) >> 0);
// Set standard guessed size...
- uint16_t width = 320;
- uint16_t height = 240;
+ boost::uint16_t width = 320;
+ boost::uint16_t height = 240;
// Extract the video size from the videodata header
_stream->set_position(frame->dataPosition);
@@ -632,7 +632,7 @@
}
} else if (codec == VIDEO_CODEC_VP6) {
if (!(videohead[0] & 0x80)) {
- uint32_t index = 0;
+ boost::uint32_t index = 0;
if ((videohead[index] & 1) ||
!(videohead[index+1] & 0x06)) {
index += 2;
}
@@ -704,7 +704,7 @@
return true;
}
-inline uint32_t FLVParser::getUInt24(uint8_t* in)
+inline boost::uint32_t FLVParser::getUInt24(uint8_t* in)
{
// The bits are in big endian order
return (in[0] << 16) | (in[1] << 8) | in[2];
Index: libmedia/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/FLVParser.h 30 Nov 2007 00:13:01 -0000 1.4
+++ libmedia/FLVParser.h 4 Dec 2007 11:45:25 -0000 1.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.4 2007/11/30 00:13:01 tgc Exp $
+// $Id: FLVParser.h,v 1.5 2007/12/04 11:45:25 strk Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -40,12 +40,12 @@
class FLVVideoFrame
{
public:
- uint16_t frameType;
- uint32_t dataSize;
- uint64_t dataPosition;
+ boost::uint16_t frameType;
+ boost::uint32_t dataSize;
+ boost::uint64_t dataPosition;
/// in milliseconds
- uint32_t timestamp;
+ boost::uint32_t timestamp;
/// Return true if this video frame is a key frame
bool isKeyFrame() const
@@ -58,11 +58,11 @@
class FLVAudioFrame
{
public:
- uint32_t dataSize;
- uint64_t dataPosition;
+ boost::uint32_t dataSize;
+ boost::uint64_t dataPosition;
/// in milliseconds
- uint32_t timestamp;
+ boost::uint32_t timestamp;
};
@@ -156,7 +156,7 @@
/// @param time
/// Timestamp, in milliseconds.
///
- bool isTimeLoaded(uint32_t time);
+ bool isTimeLoaded(boost::uint32_t time);
/// \brief
/// Seeks to the closest possible position the given position,
@@ -164,14 +164,14 @@
//
/// Locks the _mutex
///
- uint32_t seek(uint32_t);
+ boost::uint32_t seek(boost::uint32_t);
/// Returns the framedelay from the last to the current
/// audioframe in milliseconds. This is used for framerate.
//
/// Locks the _mutex
///
- uint32_t audioFrameDelay();
+ boost::uint32_t audioFrameDelay();
/// \brief
/// Returns the framedelay from the last to the current
@@ -179,13 +179,13 @@
//
/// Locks the _mutex
///
- uint32_t videoFrameDelay();
+ boost::uint32_t videoFrameDelay();
/// Returns the framerate of the video
//
/// Locks the _mutex
///
- uint16_t videoFrameRate();
+ boost::uint16_t videoFrameRate();
/// Returns the "bufferlength", meaning the differens between the
/// current frames timestamp and the timestamp of the last parseable
@@ -193,24 +193,24 @@
//
/// Locks the _mutex
///
- uint32_t getBufferLength();
+ boost::uint32_t getBufferLength();
/// Setup the parser
//
/// @return whether we'll be able to parse the file.
bool setupParser() { return true; }
- uint32_t getLastParsedPos() { return _lastParsedPosition; }
+ boost::uint32_t getLastParsedPos() { return _lastParsedPosition; }
private:
/// seeks to the closest possible position the given position,
/// and returns the new position.
- uint32_t seekAudio(uint32_t time);
+ boost::uint32_t seekAudio(boost::uint32_t time);
/// seeks to the closest possible position the given position,
/// and returns the new position.
- uint32_t seekVideo(uint32_t time);
+ boost::uint32_t seekVideo(boost::uint32_t time);
/// Parses next frame from the file, returns true if a frame
@@ -221,7 +221,7 @@
bool parseHeader();
// Functions used to extract numbers from the file
- inline uint32_t getUInt24(uint8_t* in);
+ inline boost::uint32_t getUInt24(uint8_t* in);
/// The interface to the file, externally owned
// tu_file* _stream;
@@ -237,7 +237,7 @@
AudioFrames _audioFrames;
/// The position where the parsing should continue from.
- uint32_t _lastParsedPosition;
+ boost::uint32_t _lastParsedPosition;
/// Whether the parsing is complete or not
bool _parsingComplete;
Index: libmedia/MediaBuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaBuffer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/MediaBuffer.h 30 Nov 2007 00:13:01 -0000 1.6
+++ libmedia/MediaBuffer.h 4 Dec 2007 11:45:25 -0000 1.7
@@ -16,15 +16,17 @@
// 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.6 2007/11/30 00:13:01 tgc Exp $
+// $Id: MediaBuffer.h,v 1.7 2007/12/04 11:45:25 strk Exp $
#ifndef __MEDIABUFFER_H__
#define __MEDIABUFFER_H__
-#include <boost/thread/mutex.hpp>
-#include <queue>
#include "image.h"
+#include <queue>
+#include <boost/thread/mutex.hpp>
+#include <boost/cstdint.hpp> // for boost::?int??_t
+
namespace gnash {
namespace media {
@@ -50,7 +52,7 @@
// int m_stream_index;
/// Size of the data stored
- uint32_t m_size;
+ boost::uint32_t m_size;
/// Pointer to the data. The data is owned by this class.
uint8_t* m_data;
@@ -60,7 +62,7 @@
uint8_t* m_ptr;
/// Timestamp in millisec
- uint32_t m_pts;
+ boost::uint32_t m_pts;
};
/// This class is used to store decoded video data
@@ -82,7 +84,7 @@
std::auto_ptr<image::image_base> image;
/// Timestamp in millisec
- uint32_t timestamp;
+ boost::uint32_t timestamp;
};
/// Threadsafe elements-owning queue
@@ -206,7 +208,7 @@
/// @param size
/// The size of the buffer.
///
- void setBufferTime(uint32_t size) {
+ void setBufferTime(boost::uint32_t size) {
boost::mutex::scoped_lock lock(_mutex);
_bufferTime = size;
}
@@ -215,7 +217,7 @@
//
/// @return the requested size of the buffer.
///
- uint32_t getReqBufferTime() {
+ boost::uint32_t getReqBufferTime() {
boost::mutex::scoped_lock lock(_mutex);
return _bufferTime;
}
@@ -225,7 +227,7 @@
//
/// @return the current size of the buffer in milliseconds.
///
- uint32_t getBufferTime() {
+ boost::uint32_t getBufferTime() {
boost::mutex::scoped_lock lock(_mutex);
return calcBufferTime();
}
@@ -248,8 +250,8 @@
//
/// @return the real size of the buffer in milliseconds.
///
- uint32_t calcBufferTime() {
- uint32_t size = 0;
+ boost::uint32_t calcBufferTime() {
+ boost::uint32_t size = 0;
// Get the size of audio buffer
if (!audioQueue.empty()) {
@@ -259,7 +261,7 @@
// Get the size of video buffer, and use that if it is bigger
than
// the vaule from the audio buffer.
if (!videoQueue.empty()) {
- uint32_t vSize = videoQueue.back()->timestamp -
videoQueue.front()->timestamp;
+ boost::uint32_t vSize = videoQueue.back()->timestamp -
videoQueue.front()->timestamp;
if (vSize > size) size = vSize;
}
return size;
@@ -274,7 +276,7 @@
std::queue <raw_videodata_t*> videoQueue;
/// The requested size of the buffer in milliseconds
- uint32_t _bufferTime;
+ boost::uint32_t _bufferTime;
};
} // gnash.media namespace
Index: libmedia/MediaDecoder.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaDecoder.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/MediaDecoder.cpp 4 Dec 2007 09:20:29 -0000 1.2
+++ libmedia/MediaDecoder.cpp 4 Dec 2007 11:45:26 -0000 1.3
@@ -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.cpp,v 1.2 2007/12/04 09:20:29 bwy Exp $
+// $Id: MediaDecoder.cpp,v 1.3 2007/12/04 11:45:26 strk Exp $
#include "MediaDecoder.h"
@@ -99,7 +99,7 @@
bool MediaDecoder::decodeAndBufferFrame()
{
MediaFrame* frame = _parser->parseMediaFrame();
- uint32_t parserPosition = _parser->getLastParsedPos();
+ boost::uint32_t parserPosition = _parser->getLastParsedPos();
if (parserPosition > _lastConfirmedPosition) _lastConfirmedPosition =
parserPosition;
if (frame == NULL) {
@@ -132,8 +132,8 @@
// We don't handle audio
if (!_audioDecoder.get()) return;
- uint32_t datasize;
- uint32_t bufsize;
+ boost::uint32_t datasize;
+ boost::uint32_t bufsize;
uint8_t* ptr = _audioDecoder->decode(packet->data, packet->dataSize,
bufsize, datasize, false);
Index: libmedia/MediaDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaDecoder.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/MediaDecoder.h 30 Nov 2007 00:13:01 -0000 1.5
+++ libmedia/MediaDecoder.h 4 Dec 2007 11:45:26 -0000 1.6
@@ -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.5 2007/11/30 00:13:01 tgc Exp $
+// $Id: MediaDecoder.h,v 1.6 2007/12/04 11:45:26 strk Exp $
#ifndef __MEDIADECODER_H__
#define __MEDIADECODER_H__
@@ -121,7 +121,7 @@
/// The buffer we will use.
/// Ownership left to the caller.
///
- MediaDecoder(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
uint16_t swfVersion, int format)
+ MediaDecoder(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
boost::uint16_t swfVersion, int format)
:
_buffer(buffer),
_stream(stream),
@@ -147,18 +147,18 @@
virtual ~MediaDecoder() {}
#endif
/// Seeks to pos, returns the new position
- virtual uint32_t seek(uint32_t /*pos*/) { return 0;}
+ virtual boost::uint32_t seek(boost::uint32_t /*pos*/) { return 0;}
- virtual std::pair<uint32_t, uint32_t> getWidthAndHeight() { return
std::pair<uint32_t, uint32_t>(0,0); }
+ virtual std::pair<boost::uint32_t, boost::uint32_t> getWidthAndHeight()
{ return std::pair<boost::uint32_t, boost::uint32_t>(0,0); }
/// Returns the size of the file being loaded, in bytes
- uint32_t getBytesTotal()
+ boost::uint32_t getBytesTotal()
{
return _streamSize;
}
/// Returns the amount of bytes of the current file that has been
loaded.
- uint32_t getBytesLoaded() {
+ boost::uint32_t getBytesLoaded() {
return _lastConfirmedPosition;
}
@@ -217,7 +217,7 @@
boost::shared_ptr<tu_file> _stream;
/// Version of the SWF playing
- uint16_t _swfVersion;
+ boost::uint16_t _swfVersion;
/// The output format
int _videoFrameFormat;
@@ -226,10 +226,10 @@
std::auto_ptr<MediaParser> _parser;
/// The last confirmed size of the downloaded file
- uint32_t _lastConfirmedPosition;
+ boost::uint32_t _lastConfirmedPosition;
/// total size of the file being downloaded
- uint32_t _streamSize;
+ boost::uint32_t _streamSize;
/// Is everything ok?
MediaDecoderErrorCode _error;
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libmedia/MediaParser.h 3 Dec 2007 20:48:51 -0000 1.10
+++ libmedia/MediaParser.h 4 Dec 2007 11:45:26 -0000 1.11
@@ -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.10 2007/12/03 20:48:51 bwy Exp $
+// $Id: MediaParser.h,v 1.11 2007/12/04 11:45:26 strk Exp $
#ifndef __MEDIAPARSER_H__
#define __MEDIAPARSER_H__
@@ -125,7 +125,7 @@
class AudioInfo
{
public:
- AudioInfo(int codeci, uint16_t sampleRatei, uint16_t sampleSizei, bool
stereoi, uint64_t durationi, codecType typei)
+ AudioInfo(int codeci, boost::uint16_t sampleRatei, boost::uint16_t
sampleSizei, bool stereoi, boost::uint64_t durationi, codecType typei)
: codec(codeci),
sampleRate(sampleRatei),
sampleSize(sampleSizei),
@@ -139,10 +139,10 @@
}
int codec;
- uint16_t sampleRate;
- uint16_t sampleSize;
+ boost::uint16_t sampleRate;
+ boost::uint16_t sampleSize;
bool stereo;
- uint64_t duration;
+ boost::uint64_t duration;
#ifdef USE_FFMPEG
AVCodecContext* audioCodecCtx; // If videoCodecCtx is ugly, so is this.
#endif
@@ -157,7 +157,7 @@
class VideoInfo
{
public:
- VideoInfo(int codeci, uint16_t widthi, uint16_t heighti, uint16_t
frameRatei, uint64_t durationi, codecType typei)
+ VideoInfo(int codeci, boost::uint16_t widthi, boost::uint16_t heighti,
boost::uint16_t frameRatei, boost::uint64_t durationi, codecType typei)
: codec(codeci),
width(widthi),
height(heighti),
@@ -171,10 +171,10 @@
}
int codec;
- uint16_t width;
- uint16_t height;
- uint16_t frameRate;
- uint64_t duration;
+ boost::uint16_t width;
+ boost::uint16_t height;
+ boost::uint16_t frameRate;
+ boost::uint64_t duration;
#ifdef USE_FFMPEG
AVCodecContext* videoCodecCtx; // UGLY!!
#endif
@@ -187,9 +187,9 @@
class MediaFrame
{
public:
- uint32_t dataSize;
+ boost::uint32_t dataSize;
uint8_t* data;
- uint64_t timestamp;
+ boost::uint64_t timestamp;
uint8_t tag;
};
@@ -247,27 +247,27 @@
/// and returns the new position.
//
/// @return the position the seek reached
- virtual uint32_t seek(uint32_t) { return 0; }
+ virtual boost::uint32_t seek(boost::uint32_t) { return 0; }
/// Returns the framedelay from the last to the current
/// audioframe in milliseconds. This is used for framerate.
//
/// @return the diff between the current and last frame
- virtual uint32_t audioFrameDelay() { return 0; }
+ virtual boost::uint32_t audioFrameDelay() { return 0; }
/// Returns the framedelay from the last to the current
/// videoframe in milliseconds.
//
/// @return the diff between the current and last frame
- virtual uint32_t videoFrameDelay() { return 0; }
+ virtual boost::uint32_t videoFrameDelay() { return 0; }
/// Returns the framerate of the video
//
/// @return the framerate of the video
- virtual uint16_t videoFrameRate() { return 0; }
+ virtual boost::uint16_t videoFrameRate() { return 0; }
/// Returns the last parsed position in the file in bytes
- virtual uint32_t getLastParsedPos() { return 0; }
+ virtual boost::uint32_t getLastParsedPos() { return 0; }
protected:
Index: libmedia/SoundInfo.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/SoundInfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/SoundInfo.h 24 Nov 2007 17:21:42 -0000 1.3
+++ libmedia/SoundInfo.h 4 Dec 2007 11:45:26 -0000 1.4
@@ -18,7 +18,7 @@
//
//
-// $Id: SoundInfo.h,v 1.3 2007/11/24 17:21:42 strk Exp $
+// $Id: SoundInfo.h,v 1.4 2007/12/04 11:45:26 strk Exp $
#ifndef __SOUNDINFO_H__
#define __SOUNDINFO_H__
@@ -55,7 +55,7 @@
/// Defines whether the sound is in 16bit format (samplesize == 2)?
else it
/// is 8bit (samplesize == 1). Used for streams when decoding adpcm.
///
- SoundInfo(audioCodecType format, bool stereo, uint32_t sampleRate,
uint32_t sampleCount, bool is16bit)
+ SoundInfo(audioCodecType format, bool stereo, boost::uint32_t
sampleRate, boost::uint32_t sampleCount, bool is16bit)
: _format(format),
_stereo(stereo),
_sampleRate(sampleRate),
@@ -100,10 +100,10 @@
bool _stereo;
/// Sample rate, one of 5512, 11025, 22050, 44100
- uint32_t _sampleRate;
+ boost::uint32_t _sampleRate;
/// Number of samples
- uint32_t _sampleCount;
+ boost::uint32_t _sampleCount;
/// Is the audio in 16bit format (samplesize == 2)? else it
/// is 8bit (samplesize == 1). Used for streams when decoding adpcm.
Index: libmedia/VideoDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/VideoDecoder.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/VideoDecoder.h 24 Nov 2007 17:21:42 -0000 1.8
+++ libmedia/VideoDecoder.h 4 Dec 2007 11:45:26 -0000 1.9
@@ -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.8 2007/11/24 17:21:42 strk Exp $
+// $Id: VideoDecoder.h,v 1.9 2007/12/04 11:45:26 strk Exp $
#ifndef __VIDEODECODER_H__
#define __VIDEODECODER_H__
@@ -96,7 +96,7 @@
/// @return a pointer to the decoded data, or NULL if decoding fails.
/// The caller owns the decoded data.
///
- virtual uint8_t* decode(uint8_t* /*input*/, uint32_t /*inputSize*/,
uint32_t& /*outputSize*/) { return NULL; }
+ virtual uint8_t* decode(uint8_t* /*input*/, boost::uint32_t
/*inputSize*/, boost::uint32_t& /*outputSize*/) { return NULL; }
/// Decodes a frame and returns an image::base containing it
//
@@ -109,7 +109,7 @@
/// @return a pointer to the image with the decoded data, or NULL if
decoding fails.
/// The caller owns the decoded data.
///
- virtual std::auto_ptr<image::image_base> decodeToImage(uint8_t*
/*input*/, uint32_t /*inputSize*/) { return
std::auto_ptr<image::image_base>(NULL); }
+ virtual std::auto_ptr<image::image_base> decodeToImage(uint8_t*
/*input*/, boost::uint32_t /*inputSize*/) { return
std::auto_ptr<image::image_base>(NULL); }
};
Index: libmedia/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sound_handler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/sound_handler.h 30 Nov 2007 00:13:01 -0000 1.4
+++ libmedia/sound_handler.h 4 Dec 2007 11:45:26 -0000 1.5
@@ -18,7 +18,7 @@
//
//
-/* $Id: sound_handler.h,v 1.4 2007/11/30 00:13:01 tgc Exp $ */
+/* $Id: sound_handler.h,v 1.5 2007/12/04 11:45:26 strk Exp $ */
/// \page sound_handler_intro Sound handler introduction
///
@@ -33,7 +33,6 @@
#endif
#include "tu_config.h" // for DSOEXPORT
-#include "tu_types.h"
#include "SoundInfo.h"
#include <vector>
@@ -219,9 +218,9 @@
/// envelopes can be assigned to a sound to make a fade out or similar
stuff.
struct sound_envelope
{
- uint32_t m_mark44;
- uint16_t m_level0;
- uint16_t m_level1;
+ boost::uint32_t m_mark44;
+ boost::uint16_t m_level0;
+ boost::uint16_t m_level1;
};
// If stereo is true, samples are interleaved w/ left sample first.
Index: libmedia/gst/AudioDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/AudioDecoderGst.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/AudioDecoderGst.cpp 30 Nov 2007 00:13:01 -0000 1.1
+++ libmedia/gst/AudioDecoderGst.cpp 4 Dec 2007 11:45:26 -0000 1.2
@@ -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: AudioDecoderGst.cpp,v 1.1 2007/11/30 00:13:01 tgc Exp $
+// $Id: AudioDecoderGst.cpp,v 1.2 2007/12/04 11:45:26 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -145,7 +145,7 @@
}
-uint8_t* AudioDecoderGst::decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedData, bool /*parse*/)
+uint8_t* AudioDecoderGst::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedData, bool /*parse*/)
{
// If there is nothing to decode in the new data we return NULL
if (input == NULL || inputSize == 0 || !_decoder)
Index: libmedia/gst/AudioDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/AudioDecoderGst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/AudioDecoderGst.h 30 Nov 2007 00:13:01 -0000 1.1
+++ libmedia/gst/AudioDecoderGst.h 4 Dec 2007 11:45:26 -0000 1.2
@@ -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: AudioDecoderGst.h,v 1.1 2007/11/30 00:13:01 tgc Exp $
+// $Id: AudioDecoderGst.h,v 1.2 2007/12/04 11:45:26 strk Exp $
#ifndef __AUDIODECODERGST_H__
#define __AUDIODECODERGST_H__
@@ -46,7 +46,7 @@
bool setup(AudioInfo* info);
- uint8_t* decode(uint8_t* /*input*/, uint32_t /*inputSize*/, uint32_t&
/*outputSize*/, uint32_t& /*decodedData*/, bool /*parse*/);
+ uint8_t* decode(uint8_t* /*input*/, boost::uint32_t /*inputSize*/,
boost::uint32_t& /*outputSize*/, boost::uint32_t& /*decodedData*/, bool
/*parse*/);
static void callback_handoff (GstElement * /*c*/, GstBuffer *buffer,
GstPad* /*pad*/, gpointer user_data);
static void callback_output (GstElement * /*c*/, GstBuffer *buffer,
GstPad* /*pad*/, gpointer user_data);
@@ -74,16 +74,16 @@
/// Info from the video tag header. Might be usefull...
bool _stereo;
- uint32_t _sampleRate;
+ boost::uint32_t _sampleRate;
audioCodecType _format;
/// If we should stop this will be true
volatile bool _stop;
- uint32_t _undecodedDataSize;
+ boost::uint32_t _undecodedDataSize;
uint8_t* _undecodedData;
- uint32_t _decodedDataSize;
+ boost::uint32_t _decodedDataSize;
uint8_t* _decodedData;
};
Index: libmedia/gst/MediaDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/MediaDecoderGst.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/MediaDecoderGst.cpp 30 Nov 2007 00:13:01 -0000 1.1
+++ libmedia/gst/MediaDecoderGst.cpp 4 Dec 2007 11:45:26 -0000 1.2
@@ -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: MediaDecoderGst.cpp,v 1.1 2007/11/30 00:13:01 tgc Exp $
+// $Id: MediaDecoderGst.cpp,v 1.2 2007/12/04 11:45:26 strk Exp $
#include "MediaDecoderGst.h"
#include "AudioDecoderNellymoser.h"
@@ -32,7 +32,7 @@
namespace gnash {
namespace media {
-MediaDecoderGst::MediaDecoderGst(boost::shared_ptr<tu_file> stream,
MediaBuffer* buffer, uint16_t swfVersion, int format)
+MediaDecoderGst::MediaDecoderGst(boost::shared_ptr<tu_file> stream,
MediaBuffer* buffer, boost::uint16_t swfVersion, int format)
:
MediaDecoder(stream, buffer, swfVersion, format)
{
@@ -122,9 +122,9 @@
}
-uint32_t MediaDecoderGst::seek(uint32_t pos)
+boost::uint32_t MediaDecoderGst::seek(boost::uint32_t pos)
{
- uint32_t ret = 0;
+ boost::uint32_t ret = 0;
if (_parser.get()) ret = _parser->seek(pos);
else ret = 0;
@@ -167,14 +167,14 @@
decoder->decodingLoop();
}
-std::pair<uint32_t, uint32_t>
+std::pair<boost::uint32_t, boost::uint32_t>
MediaDecoderGst::getWidthAndHeight()
{
if (_parser.get()) {
std::auto_ptr<VideoInfo> vInfo = _parser->getVideoInfo();
- if (vInfo.get()) return std::pair<uint32_t,
uint32_t>(vInfo->width, vInfo->height);
+ if (vInfo.get()) return std::pair<boost::uint32_t,
boost::uint32_t>(vInfo->width, vInfo->height);
}
- return std::pair<uint32_t, uint32_t>(0,0);
+ return std::pair<boost::uint32_t, boost::uint32_t>(0,0);
}
Index: libmedia/gst/MediaDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/MediaDecoderGst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libmedia/gst/MediaDecoderGst.h 30 Nov 2007 00:13:01 -0000 1.1
+++ libmedia/gst/MediaDecoderGst.h 4 Dec 2007 11:45:26 -0000 1.2
@@ -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: MediaDecoderGst.h,v 1.1 2007/11/30 00:13:01 tgc Exp $
+// $Id: MediaDecoderGst.h,v 1.2 2007/12/04 11:45:26 strk Exp $
#ifndef __MEDIADECODERGST_H__
#define __MEDIADECODERGST_H__
@@ -38,13 +38,13 @@
/// Media decoding using Gstreamer
class MediaDecoderGst: public MediaDecoder {
public:
- MediaDecoderGst(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
uint16_t swfVersion, int format);
+ MediaDecoderGst(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
boost::uint16_t swfVersion, int format);
~MediaDecoderGst();
/// Seeks to pos
- uint32_t seek(uint32_t pos);
+ boost::uint32_t seek(boost::uint32_t pos);
- std::pair<uint32_t, uint32_t> getWidthAndHeight();
+ std::pair<boost::uint32_t, boost::uint32_t> getWidthAndHeight();
private:
/// Sets up the parser
Index: libmedia/gst/VideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/gst/VideoDecoderGst.cpp 30 Nov 2007 00:13:02 -0000 1.6
+++ libmedia/gst/VideoDecoderGst.cpp 4 Dec 2007 11:45:26 -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.cpp,v 1.6 2007/11/30 00:13:02 tgc Exp $
+// $Id: VideoDecoderGst.cpp,v 1.7 2007/12/04 11:45:26 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -192,7 +192,7 @@
// gnash calls this when it wants you to decode the given videoframe
std::auto_ptr<image::image_base>
-VideoDecoderGst::decodeToImage(uint8_t* data, uint32_t size)
+VideoDecoderGst::decodeToImage(uint8_t* data, boost::uint32_t size)
{
std::auto_ptr<image::image_base> ret_image(new image::rgb(width,
height));
Index: libmedia/gst/VideoDecoderGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/VideoDecoderGst.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/gst/VideoDecoderGst.h 30 Nov 2007 00:13:02 -0000 1.8
+++ libmedia/gst/VideoDecoderGst.h 4 Dec 2007 11:45:26 -0000 1.9
@@ -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.8 2007/11/30 00:13:02 tgc Exp $
+// $Id: VideoDecoderGst.h,v 1.9 2007/12/04 11:45:26 strk Exp $
#ifndef __VIDEODECODERGST_H__
#define __VIDEODECODERGST_H__
@@ -54,9 +54,9 @@
videoCodecType /*format*/,
int /*outputFormat*/);
- //uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize);
+ //uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize);
- std::auto_ptr<image::image_base> decodeToImage(uint8_t* /*input*/,
uint32_t /*inputSize*/);
+ std::auto_ptr<image::image_base> decodeToImage(uint8_t* /*input*/,
boost::uint32_t /*inputSize*/);
static void callback_handoff (GstElement * /*c*/, GstBuffer *buffer,
GstPad* /*pad*/, gpointer user_data);
static void callback_output (GstElement * /*c*/, GstBuffer *buffer,
GstPad* /*pad*/, gpointer user_data);
@@ -82,8 +82,8 @@
boost::mutex::scoped_lock* output_lock;
/// Info from the video tag header. Might be usefull...
- uint32_t width;
- uint32_t height;
+ boost::uint32_t width;
+ boost::uint32_t height;
int deblocking;
bool smoothing;
videoCodecType format;
Index: libmedia/gst/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/sound_handler_gst.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/gst/sound_handler_gst.cpp 1 Dec 2007 21:49:19 -0000 1.7
+++ libmedia/gst/sound_handler_gst.cpp 4 Dec 2007 11:45:26 -0000 1.8
@@ -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.7 2007/12/01 21:49:19 strk Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.8 2007/12/04 11:45:26 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -332,7 +332,7 @@
// Temp variables to make the code simpler and easier to read
audioCodecType soundFormat = sounddata->soundinfo->getFormat();
bool soundStereo = sounddata->soundinfo->isStereo();
- uint32_t soundSampleRate = sounddata->soundinfo->getSampleRate();
+ boost::uint32_t soundSampleRate = sounddata->soundinfo->getSampleRate();
if (soundFormat == AUDIO_CODEC_MP3) {
@@ -812,8 +812,8 @@
sound_data* sounddata = m_sound_data[sound_handle];
- uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
- uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
+ boost::uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
+ boost::uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
// Return the sound duration in milliseconds
if (sampleCount > 0 && sampleRate > 0) {
@@ -848,7 +848,7 @@
GstElement *pipeline,*audioconvert;
GstStateChangeReturn ret;
GstState current, pending;
- int64_t pos;
+ boost::int64_t pos;
GstFormat fmt = GST_FORMAT_TIME;
pipeline =
sounddata->m_gst_elements[sounddata->m_gst_elements.size()-1]->pipeline;
Index: libmedia/sdl/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/sdl/AudioDecoderFfmpeg.cpp 3 Dec 2007 20:48:51 -0000 1.9
+++ libmedia/sdl/AudioDecoderFfmpeg.cpp 4 Dec 2007 11:45:26 -0000 1.10
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderFfmpeg.cpp,v 1.9 2007/12/03 20:48:51 bwy Exp $
+// $Id: AudioDecoderFfmpeg.cpp,v 1.10 2007/12/04 11:45:26 strk Exp $
#include "AudioDecoderFfmpeg.h"
@@ -176,13 +176,13 @@
return true;
}
-uint8_t* AudioDecoderFfmpeg::decode(uint8_t* input, uint32_t inputSize,
uint32_t& outputSize, uint32_t& decodedBytes, bool parse)
+uint8_t* AudioDecoderFfmpeg::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse)
{
long bytes_decoded = 0;
int bufsize = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
uint8_t* output = new uint8_t[bufsize];
- uint32_t orgbufsize = bufsize;
+ boost::uint32_t orgbufsize = bufsize;
decodedBytes = 0;
if (parse) {
@@ -204,9 +204,9 @@
int tmp = 0;
#ifdef FFMPEG_AUDIO2
bufsize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- tmp = avcodec_decode_audio2(_audioCodecCtx,
reinterpret_cast<int16_t*>(output), &bufsize, frame, framesize);
+ tmp = avcodec_decode_audio2(_audioCodecCtx,
reinterpret_cast<boost::int16_t*>(output), &bufsize, frame, framesize);
#else
- tmp = avcodec_decode_audio(_audioCodecCtx,
reinterpret_cast<int16_t*>(output), &bufsize, frame, framesize);
+ tmp = avcodec_decode_audio(_audioCodecCtx,
reinterpret_cast<boost::int16_t*>(output), &bufsize, frame, framesize);
#endif
if (bytes_decoded < 0 || tmp < 0 || bufsize < 0) {
@@ -225,9 +225,9 @@
int tmp = 0;
#ifdef FFMPEG_AUDIO2
- tmp = avcodec_decode_audio2(_audioCodecCtx,
reinterpret_cast<int16_t*>(output), &bufsize, input, inputSize);
+ tmp = avcodec_decode_audio2(_audioCodecCtx,
reinterpret_cast<boost::int16_t*>(output), &bufsize, input, inputSize);
#else
- tmp = avcodec_decode_audio(_audioCodecCtx,
reinterpret_cast<int16_t*>(output), &bufsize, input, inputSize);
+ tmp = avcodec_decode_audio(_audioCodecCtx,
reinterpret_cast<boost::int16_t*>(output), &bufsize, input, inputSize);
#endif
@@ -261,8 +261,8 @@
uint8_t* tmp = new uint8_t[orgbufsize];
- samples =
_resampler.resample(reinterpret_cast<int16_t*>(output),
-
reinterpret_cast<int16_t*>(tmp),
+ samples =
_resampler.resample(reinterpret_cast<boost::int16_t*>(output),
+
reinterpret_cast<boost::int16_t*>(tmp),
samples);
outputSize = samples *2 *2; // the resampled audio has
samplesize 2, and is stereo
uint8_t* ret = new uint8_t[outputSize];
Index: libmedia/sdl/AudioDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/sdl/AudioDecoderFfmpeg.h 24 Nov 2007 17:21:43 -0000 1.4
+++ libmedia/sdl/AudioDecoderFfmpeg.h 4 Dec 2007 11:45:27 -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: AudioDecoderFfmpeg.h,v 1.4 2007/11/24 17:21:43 strk Exp $
+// $Id: AudioDecoderFfmpeg.h,v 1.5 2007/12/04 11:45:27 strk Exp $
#ifndef __AUDIODECODERFFMPEG_H__
#define __AUDIODECODERFFMPEG_H__
@@ -80,7 +80,7 @@
///
/// @return the number of samples in the output data.
///
- int resample(int16_t* input, int16_t* output, int samples)
+ int resample(boost::int16_t* input, boost::int16_t* output, int samples)
{
return audio_resample (_context, output, input, samples);
}
@@ -99,7 +99,7 @@
bool setup(AudioInfo* info);
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedBytes, bool parse);
+ uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
private:
Index: libmedia/sdl/AudioDecoderMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/AudioDecoderMad.cpp 24 Nov 2007 17:21:43 -0000 1.5
+++ libmedia/sdl/AudioDecoderMad.cpp 4 Dec 2007 11:45:27 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderMad.cpp,v 1.5 2007/11/24 17:21:43 strk Exp $
+// $Id: AudioDecoderMad.cpp,v 1.6 2007/12/04 11:45:27 strk Exp $
#include "AudioDecoderMad.h"
#include "utility.h"
@@ -64,7 +64,7 @@
}
}
-uint8_t* AudioDecoderMad::decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedBytes, bool parse)
+uint8_t* AudioDecoderMad::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse)
{
// Setup the mad decoder
mad_stream_buffer(&_stream, input, inputSize);
@@ -105,13 +105,13 @@
mad_synth_frame (&_synth, &_frame);
- uint32_t outsize = _synth.pcm.length * _synth.pcm.channels * 2;
+ boost::uint32_t outsize = _synth.pcm.length * _synth.pcm.channels * 2;
uint8_t* tmp_raw_buffer = new uint8_t[outsize];
- uint32_t tmp_raw_buffer_size = 0;
+ boost::uint32_t tmp_raw_buffer_size = 0;
int sample;
- int16_t* dst = reinterpret_cast<int16_t*>(tmp_raw_buffer);
+ boost::int16_t* dst = reinterpret_cast<boost::int16_t*>(tmp_raw_buffer);
// transfer the decoded samples into the sound-struct, and do some
// scaling while we're at it.
@@ -131,7 +131,7 @@
// quantize
sample = mad_sample >> (MAD_F_FRACBITS + 1 - 16);
- if ( sample != static_cast<int16_t>(sample) ) sample =
sample < 0 ? -32768 : 32767;
+ if ( sample != static_cast<boost::int16_t>(sample) )
sample = sample < 0 ? -32768 : 32767;
*dst++ = sample;
}
@@ -140,7 +140,7 @@
// If we need to convert samplerate or/and from mono to stereo...
if (outsize > 0 && ( _synth.pcm.samplerate != 44100 ||
_synth.pcm.channels != 2)) {
- int16_t* adjusted_data = 0;
+ boost::int16_t* adjusted_data = 0;
int adjusted_size = 0;
int sample_count = outsize / (_synth.pcm.channels * 2); //
samples are of size 2
Index: libmedia/sdl/AudioDecoderMad.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderMad.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/sdl/AudioDecoderMad.h 24 Nov 2007 17:21:43 -0000 1.4
+++ libmedia/sdl/AudioDecoderMad.h 4 Dec 2007 11:45:27 -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: AudioDecoderMad.h,v 1.4 2007/11/24 17:21:43 strk Exp $
+// $Id: AudioDecoderMad.h,v 1.5 2007/12/04 11:45:27 strk Exp $
#ifndef __AUDIODECODERMAD_H__
#define __AUDIODECODERMAD_H__
@@ -39,7 +39,7 @@
bool setup(AudioInfo* info);
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize, uint32_t& decodedBytes, bool parse);
+ uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
private:
Index: libmedia/sdl/MediaDecoderSdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/sdl/MediaDecoderSdl.cpp 3 Dec 2007 16:50:25 -0000 1.6
+++ libmedia/sdl/MediaDecoderSdl.cpp 4 Dec 2007 11:45:27 -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: MediaDecoderSdl.cpp,v 1.6 2007/12/03 16:50:25 bwy Exp $
+// $Id: MediaDecoderSdl.cpp,v 1.7 2007/12/04 11:45:27 strk Exp $
#include "MediaDecoderSdl.h"
#include "AudioDecoderNellymoser.h"
@@ -39,7 +39,7 @@
namespace gnash {
namespace media {
-MediaDecoderSdl::MediaDecoderSdl(boost::shared_ptr<tu_file> stream,
MediaBuffer* buffer, uint16_t swfVersion, int format)
+MediaDecoderSdl::MediaDecoderSdl(boost::shared_ptr<tu_file> stream,
MediaBuffer* buffer, boost::uint16_t swfVersion, int format)
:
MediaDecoder(stream, buffer, swfVersion, format)
{
@@ -153,9 +153,9 @@
return _parser->setupParser();
}
-uint32_t MediaDecoderSdl::seek(uint32_t pos)
+boost::uint32_t MediaDecoderSdl::seek(boost::uint32_t pos)
{
- uint32_t ret = 0;
+ boost::uint32_t ret = 0;
if (_parser.get()) ret = _parser->seek(pos);
else ret = 0;
@@ -192,14 +192,14 @@
decoder->decodingLoop();
}
-std::pair<uint32_t, uint32_t>
+std::pair<boost::uint32_t, boost::uint32_t>
MediaDecoderSdl::getWidthAndHeight()
{
if (_parser.get()) {
std::auto_ptr<VideoInfo> vInfo = _parser->getVideoInfo();
- if (vInfo.get()) return std::pair<uint32_t,
uint32_t>(vInfo->width, vInfo->height);
+ if (vInfo.get()) return std::pair<boost::uint32_t,
boost::uint32_t>(vInfo->width, vInfo->height);
}
- return std::pair<uint32_t, uint32_t>(0,0);
+ return std::pair<boost::uint32_t, boost::uint32_t>(0,0);
}
Index: libmedia/sdl/MediaDecoderSdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaDecoderSdl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/MediaDecoderSdl.h 30 Nov 2007 00:13:02 -0000 1.5
+++ libmedia/sdl/MediaDecoderSdl.h 4 Dec 2007 11:45:27 -0000 1.6
@@ -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.5 2007/11/30 00:13:02 tgc Exp $
+// $Id: MediaDecoderSdl.h,v 1.6 2007/12/04 11:45:27 strk Exp $
#ifndef __MEDIADECODERSDL_H__
#define __MEDIADECODERSDL_H__
@@ -42,13 +42,13 @@
/// Media decoding using libs, used with sdl soundhandler.
class MediaDecoderSdl: public MediaDecoder {
public:
- MediaDecoderSdl(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
uint16_t swfVersion, int format);
+ MediaDecoderSdl(boost::shared_ptr<tu_file> stream, MediaBuffer* buffer,
boost::uint16_t swfVersion, int format);
~MediaDecoderSdl();
/// Seeks to pos
- uint32_t seek(uint32_t pos);
+ boost::uint32_t seek(boost::uint32_t pos);
- std::pair<uint32_t, uint32_t> getWidthAndHeight();
+ std::pair<boost::uint32_t, boost::uint32_t> getWidthAndHeight();
private:
/// Sets up the parser
Index: libmedia/sdl/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/sdl/MediaParserFfmpeg.cpp 3 Dec 2007 20:48:51 -0000 1.8
+++ libmedia/sdl/MediaParserFfmpeg.cpp 4 Dec 2007 11:45:27 -0000 1.9
@@ -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.cpp,v 1.8 2007/12/03 20:48:51 bwy Exp $
+// $Id: MediaParserFfmpeg.cpp,v 1.9 2007/12/04 11:45:27 strk Exp $
#include "MediaParserFfmpeg.h"
#include "log.h"
@@ -230,7 +230,7 @@
// set presentation timestamp
if (packet.dts != static_cast<signed
long>(AV_NOPTS_VALUE))
{
- ret->timestamp =
static_cast<uint64_t>(as_double(_audioStream->time_base) * packet.dts * 1000.0);
+ ret->timestamp =
static_cast<boost::uint64_t>(as_double(_audioStream->time_base) * packet.dts *
1000.0);
}
if (ret->timestamp != 0)
@@ -242,8 +242,8 @@
}
// update video clock for next frame
- uint32_t frame_delay;
- frame_delay =
static_cast<uint32_t>((as_double(_audioStream->time_base) * packet.dts) *
1000.0);
+ boost::uint32_t frame_delay;
+ frame_delay =
static_cast<boost::uint32_t>((as_double(_audioStream->time_base) * packet.dts)
* 1000.0);
_lastAudioTimestamp += frame_delay;
@@ -255,7 +255,7 @@
// set presentation timestamp
if (packet.dts != static_cast<signed
long>(AV_NOPTS_VALUE))
{
- ret->timestamp =
static_cast<uint32_t>((as_double(_videoStream->time_base) * packet.dts) *
1000.0);
+ ret->timestamp =
static_cast<boost::uint32_t>((as_double(_videoStream->time_base) * packet.dts)
* 1000.0);
}
if (ret->timestamp != 0)
@@ -267,11 +267,11 @@
}
// update video clock for next frame
- uint32_t frame_delay;
- frame_delay =
static_cast<uint32_t>(as_double(_videoStream->codec->time_base) * 1000.0);
+ boost::uint32_t frame_delay;
+ frame_delay =
static_cast<boost::uint32_t>(as_double(_videoStream->codec->time_base) *
1000.0);
// for MPEG2, the frame can be repeated, so we update
the clock accordingly
- //frame_delay +=
static_cast<uint32_t>(_frame->repeat_pict * (frame_delay * 0.5) * 1000.0);
+ //frame_delay +=
static_cast<boost::uint32_t>(_frame->repeat_pict * (frame_delay * 0.5) *
1000.0);
_lastVideoTimestamp += frame_delay;
@@ -287,11 +287,11 @@
}
-uint32_t MediaParserFfmpeg::seek(uint32_t pos)
+boost::uint32_t MediaParserFfmpeg::seek(boost::uint32_t pos)
{
long newpos = 0;
double timebase = 0;
- uint32_t ret = 0;
+ boost::uint32_t ret = 0;
AVStream* videostream = _formatCtx->streams[_videoIndex];
timebase = static_cast<double>(videostream->time_base.num /
videostream->time_base.den);
@@ -318,7 +318,7 @@
av_free_packet(&Packet);
av_seek_frame(_formatCtx, _videoIndex, newpos, 0);
- uint32_t newtime_ms = static_cast<int32_t>(newtime / 1000.0);
+ boost::uint32_t newtime_ms = static_cast<boost::int32_t>(newtime /
1000.0);
_lastAudioTimestamp = newtime_ms;
_lastVideoTimestamp = newtime_ms;
@@ -335,7 +335,7 @@
std::auto_ptr<VideoInfo> ret (new VideoInfo(_videoCodecCtx->codec_id,
_videoCodecCtx->width,
_videoCodecCtx->height,
-
static_cast<int16_t>(as_double(_videoStream->r_frame_rate)), //
Is this correct? What do we use the framerate for?
+
static_cast<boost::int16_t>(as_double(_videoStream->r_frame_rate)), // Is this
correct? What do we use the framerate for?
_videoStream->duration,
FFMPEG));
ret->videoCodecCtx = _videoCodecCtx;
Index: libmedia/sdl/MediaParserFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/sdl/MediaParserFfmpeg.h 3 Dec 2007 20:48:51 -0000 1.6
+++ libmedia/sdl/MediaParserFfmpeg.h 4 Dec 2007 11:45:27 -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: MediaParserFfmpeg.h,v 1.6 2007/12/03 20:48:51 bwy Exp $
+// $Id: MediaParserFfmpeg.h,v 1.7 2007/12/04 11:45:27 strk Exp $
#ifndef __MEDIAPARSERFFMPEG_H__
#define __MEDIAPARSERFFMPEG_H__
@@ -60,7 +60,7 @@
/// Try to seek to the given millisecond. Returns the millisecond where
the
/// seek got to.
- uint32_t seek(uint32_t);
+ boost::uint32_t seek(boost::uint32_t);
/// Returns a VideoInfo class about the videostream
//
@@ -79,7 +79,7 @@
static offset_t seekMedia(void *opaque, offset_t offset, int whence);
/// Returns the last parsed position in the file in bytes
- uint32_t getLastParsedPos() { return _maxInputPos; }
+ boost::uint32_t getLastParsedPos() { return _maxInputPos; }
private:
@@ -107,16 +107,16 @@
ByteIOContext _byteIOCxt;
// The timestamp of the last parsed video frame, in milliseconds.
- uint32_t _lastVideoTimestamp;
+ boost::uint32_t _lastVideoTimestamp;
// The timestamp of the last parsed audio frame, in seconds.
- uint32_t _lastAudioTimestamp;
+ boost::uint32_t _lastAudioTimestamp;
// The position of the parserhead.
- uint32_t _inputPos;
+ boost::uint32_t _inputPos;
// The max value inputPos ever had.
- uint32_t _maxInputPos;
+ boost::uint32_t _maxInputPos;
};
Index: libmedia/sdl/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/sdl/VideoDecoderFfmpeg.cpp 24 Nov 2007 17:21:43 -0000 1.9
+++ libmedia/sdl/VideoDecoderFfmpeg.cpp 4 Dec 2007 11:45:27 -0000 1.10
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: VideoDecoderFfmpeg.cpp,v 1.9 2007/11/24 17:21:43 strk Exp $
+// $Id: VideoDecoderFfmpeg.cpp,v 1.10 2007/12/04 11:45:27 strk Exp $
#include "VideoDecoderFfmpeg.h"
@@ -212,7 +212,7 @@
return buffer;
}
-uint8_t* VideoDecoderFfmpeg::decode(uint8_t* input, uint32_t inputSize,
uint32_t& outputSize)
+uint8_t* VideoDecoderFfmpeg::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize)
{
// Allocate a frame to store the decoded frame in
AVFrame* frame = avcodec_alloc_frame();
@@ -272,7 +272,7 @@
video->m_stream_index = _videoIndex;
video->m_pts = 0;
- video->m_pts =
static_cast<uint32_t>((as_double(_videoStream->time_base) * packet->dts) *
1000.0);
+ video->m_pts =
static_cast<boost::uint32_t>((as_double(_videoStream->time_base) * packet->dts)
* 1000.0);
if (_videoFrameFormat == YUV) {
@@ -320,9 +320,9 @@
}
std::auto_ptr<image::image_base>
-VideoDecoderFfmpeg::decodeToImage(uint8_t* input, uint32_t inputSize)
+VideoDecoderFfmpeg::decodeToImage(uint8_t* input, boost::uint32_t inputSize)
{
- uint32_t outputSize = 0;
+ boost::uint32_t outputSize = 0;
uint8_t* decodedData = decode(input, inputSize, outputSize);
if (!decodedData || outputSize == 0) {
Index: libmedia/sdl/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/sdl/VideoDecoderFfmpeg.h 24 Nov 2007 17:21:43 -0000 1.8
+++ libmedia/sdl/VideoDecoderFfmpeg.h 4 Dec 2007 11:45:27 -0000 1.9
@@ -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.8 2007/11/24 17:21:43 strk Exp $
+// $Id: VideoDecoderFfmpeg.h,v 1.9 2007/12/04 11:45:27 strk Exp $
#ifndef __VIDEODECODERFFMPEG_H__
#define __VIDEODECODERFFMPEG_H__
@@ -55,9 +55,9 @@
videoCodecType /*format*/,
int /*outputFormat*/);
- uint8_t* decode(uint8_t* input, uint32_t inputSize, uint32_t&
outputSize);
+ uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize);
- std::auto_ptr<image::image_base> decodeToImage(uint8_t* /*input*/,
uint32_t /*inputSize*/);
+ std::auto_ptr<image::image_base> decodeToImage(uint8_t* /*input*/,
boost::uint32_t /*inputSize*/);
static uint8_t* convertRGB24(AVCodecContext* srcCtx, AVFrame* srcFrame);
Index: libmedia/sdl/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/sdl/sound_handler_sdl.cpp 1 Dec 2007 21:54:24 -0000 1.7
+++ libmedia/sdl/sound_handler_sdl.cpp 4 Dec 2007 11:45:27 -0000 1.8
@@ -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.7 2007/12/01 21:54:24 strk Exp $
+// $Id: sound_handler_sdl.cpp,v 1.8 2007/12/04 11:45:27 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -278,7 +278,7 @@
sound_data* sounddata = m_sound_data[sound_handle];
- for (int32_t i = (int32_t) sounddata->m_active_sounds.size()-1;
i >-1; i--) {
+ for (boost::int32_t i = (boost::int32_t)
sounddata->m_active_sounds.size()-1; i >-1; i--) {
//active_sound* sound = sounddata->m_active_sounds[i];
@@ -315,11 +315,11 @@
{
boost::mutex::scoped_lock lock(_mutex);
- int32_t num_sounds = (int32_t) m_sound_data.size()-1;
- for (int32_t j = num_sounds; j > -1; j--) {//Optimized
+ boost::int32_t num_sounds = (boost::int32_t) m_sound_data.size()-1;
+ for (boost::int32_t j = num_sounds; j > -1; j--) {//Optimized
sound_data* sounddata = m_sound_data[j];
- int32_t num_active_sounds = (int32_t)
sounddata->m_active_sounds.size()-1;
- for (int32_t i = num_active_sounds; i > -1; i--) {
+ boost::int32_t num_active_sounds = (boost::int32_t)
sounddata->m_active_sounds.size()-1;
+ for (boost::int32_t i = num_active_sounds; i > -1; i--) {
//active_sound* sound = sounddata->m_active_sounds[i];
@@ -452,8 +452,8 @@
sound_data* sounddata = m_sound_data[sound_handle];
- uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
- uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
+ boost::uint32_t sampleCount = sounddata->soundinfo->getSampleCount();
+ boost::uint32_t sampleRate = sounddata->soundinfo->getSampleRate();
// Return the sound duration in milliseconds
if (sampleCount > 0 && sampleRate > 0) {
@@ -528,7 +528,7 @@
}
// AS-volume adjustment
-void adjust_volume(int16_t* data, int size, int volume)
+void adjust_volume(boost::int16_t* data, int size, int volume)
{
for (int i=0; i < size*0.5; i++) {
data[i] = data[i] * volume/100;
@@ -552,10 +552,10 @@
}
// Current envelope position
- int32_t cur_env_pos =
sound->envelopes->operator[](sound->current_env).m_mark44;
+ boost::int32_t cur_env_pos =
sound->envelopes->operator[](sound->current_env).m_mark44;
// Next envelope position
- uint32_t next_env_pos = 0;
+ boost::uint32_t next_env_pos = 0;
if (sound->current_env == (sound->envelopes->size()-1)) {
// If there is no "next envelope" then set the next envelope
start point to be unreachable
next_env_pos = cur_env_pos + length;
@@ -571,14 +571,14 @@
startpos = sound->raw_position;
}
- int16_t* data =
reinterpret_cast<int16_t*>(sound->get_raw_data_ptr(startpos));
+ boost::int16_t* data =
reinterpret_cast<boost::int16_t*>(sound->get_raw_data_ptr(startpos));
for (unsigned int i=0; i < length/2; i+=2) {
float left =
static_cast<float>((*sound->envelopes)[sound->current_env].m_level0 / 32768.0);
float right =
static_cast<float>((*sound->envelopes)[sound->current_env].m_level1 / 32768.0);
- data[i] = static_cast<int16_t>(data[i] * left); // Left
- data[i+1] = static_cast<int16_t>(data[i+1] * right); // Right
+ data[i] = static_cast<boost::int16_t>(data[i] * left); // Left
+ data[i+1] = static_cast<boost::int16_t>(data[i+1] * right); //
Right
if ((sound->samples_played+(length/2-i)) >= next_env_pos &&
sound->current_env != (sound->envelopes->size()-1)) {
sound->current_env++;
@@ -599,7 +599,7 @@
do_mixing(Uint8* stream, active_sound* sound, Uint8* data, unsigned int
mix_length, unsigned int volume) {
// If the volume needs adjustments we call a function to do that
if (volume != 100) {
- adjust_volume(reinterpret_cast<int16_t*>(data), mix_length,
volume);
+ adjust_volume(reinterpret_cast<boost::int16_t*>(data),
mix_length, volume);
} else if (sound->envelopes != NULL) {
use_envelopes(sound, mix_length);
}
@@ -679,9 +679,9 @@
}
// Run through all the sounds. TODO: don't call .size() at every
iteration !
- for(uint32_t i=0; i < handler->m_sound_data.size(); i++) {
+ for(boost::uint32_t i=0; i < handler->m_sound_data.size(); i++) {
sound_data* sounddata = handler->m_sound_data[i];
- for(uint32_t j = 0; j < sounddata->m_active_sounds.size(); j++)
{
+ for(boost::uint32_t j = 0; j <
sounddata->m_active_sounds.size(); j++) {
// Temp variables to make the code simpler and easier
to read
active_sound* sound = sounddata->m_active_sounds[j];
@@ -729,10 +729,10 @@
// temp raw buffer
Uint8* tmp_raw_buffer;
- uint32_t tmp_raw_buffer_size = 0;
- uint32_t decodedBytes = 0;
+ boost::uint32_t tmp_raw_buffer_size = 0;
+ boost::uint32_t decodedBytes = 0;
- uint32_t inputSize = 0;
+ boost::uint32_t inputSize = 0;
bool parse = true;
if (sounddata->soundinfo->getFormat()
== AUDIO_CODEC_ADPCM) {
parse = false;
Index: libmedia/sdl/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/sdl/sound_handler_sdl.h 1 Dec 2007 21:54:24 -0000 1.6
+++ libmedia/sdl/sound_handler_sdl.h 4 Dec 2007 11:45:27 -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: sound_handler_sdl.h,v 1.6 2007/12/01 21:54:24 strk Exp $
+// $Id: sound_handler_sdl.h,v 1.7 2007/12/04 11:45:27 strk Exp $
#ifndef SOUND_HANDLER_SDL_H
#define SOUND_HANDLER_SDL_H
@@ -64,7 +64,7 @@
/// Object holding information about the sound
std::auto_ptr<SoundInfo> soundinfo;
- std::map<uint32_t,uint32_t> m_frames_size;
+ std::map<boost::uint32_t,boost::uint32_t> m_frames_size;
/// Append size bytes to this sound
//
@@ -176,7 +176,7 @@
const std::vector<sound_handler::sound_envelope>* envelopes;
/// Index of current envelope.
- uint32_t current_env;
+ boost::uint32_t current_env;
/// Number of samples played so far.
unsigned long samples_played;
Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/BevelFilter.h 26 Sep 2007 19:00:46 -0000 1.5
+++ server/BevelFilter.h 4 Dec 2007 11:45:27 -0000 1.6
@@ -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: BevelFilter.h,v 1.5 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: BevelFilter.h,v 1.6 2007/12/04 11:45:27 strk Exp $ */
#ifndef GNASH_BEVELFILTER_H
#define GNASH_BEVELFILTER_H
@@ -53,8 +53,8 @@
m_type(FULL_BEVEL), m_knockout(false)
{ return; }
- BevelFilter(float distance, float angle, uint32_t hcolor,
- uint8_t halpha, uint32_t scolor, uint8_t salpha,
+ BevelFilter(float distance, float angle, boost::uint32_t hcolor,
+ uint8_t halpha, boost::uint32_t scolor, uint8_t salpha,
float blurX, float blurY, float strength,
uint8_t quality, bevel_type type, bool knockout) :
m_distance(distance), m_angle(angle), m_highlightColor(hcolor),
@@ -66,9 +66,9 @@
protected:
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
- uint32_t m_highlightColor; // Color of the highlight.
+ boost::uint32_t m_highlightColor; // Color of the highlight.
uint8_t m_highlightAlpha; // Alpha of the highlight.
- uint32_t m_shadowColor; // RGB color.
+ boost::uint32_t m_shadowColor; // RGB color.
uint8_t m_shadowAlpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
Index: server/ConvolutionFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/ConvolutionFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/ConvolutionFilter.h 4 Dec 2007 11:45:27 -0000 1.5
@@ -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: ConvolutionFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: ConvolutionFilter.h,v 1.5 2007/12/04 11:45:27 strk Exp $ */
#ifndef GNASH_CONVOLUTIONFILTER_H
#define GNASH_CONVOLUTIONFILTER_H
@@ -47,7 +47,7 @@
ConvolutionFilter(uint8_t matrixX, uint8_t matrixY,
std::vector<float> a_matrix,
- float divisor, float bias, bool preserveAlpha, bool clamp, uint32_t
color,
+ float divisor, float bias, bool preserveAlpha, bool clamp,
boost::uint32_t color,
uint8_t alpha) :
m_matrixX(matrixX), m_matrixY(matrixY), m_matrix(a_matrix),
m_divisor(divisor), m_bias(bias), m_preserveAlpha(preserveAlpha),
@@ -62,7 +62,7 @@
float m_bias;
bool m_preserveAlpha; // If true, don't convolute the alpha channel
bool m_clamp; // Whether or not to clamp
- uint32_t m_color; // For off-image pixels
+ boost::uint32_t m_color; // For off-image pixels
uint8_t m_alpha; // For off-image pixels
};
Index: server/DropShadowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/DropShadowFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/DropShadowFilter.h 4 Dec 2007 11:45:27 -0000 1.5
@@ -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: DropShadowFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: DropShadowFilter.h,v 1.5 2007/12/04 11:45:27 strk Exp $ */
#ifndef GNASH_DROPSHADOWFILTER_H
#define GNASH_DROPSHADOWFILTER_H
@@ -45,7 +45,7 @@
m_inner(false), m_knockout(false), m_hideObject(false)
{ return; }
- DropShadowFilter(float distance, float angle, uint32_t color,
+ DropShadowFilter(float distance, float angle, boost::uint32_t color,
uint8_t alpha, float blurX, float blurY, float strength,
uint8_t quality, bool inner, bool knockout, bool hideObject) :
m_distance(distance), m_angle(angle), m_color(color),
@@ -57,7 +57,7 @@
protected:
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
- uint32_t m_color; // RGB color.
+ boost::uint32_t m_color; // RGB color.
uint8_t m_alpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/DynamicShape.cpp 3 Dec 2007 16:17:49 -0000 1.13
+++ server/DynamicShape.cpp 4 Dec 2007 11:45:27 -0000 1.14
@@ -17,7 +17,7 @@
-/* $Id: DynamicShape.cpp,v 1.13 2007/12/03 16:17:49 strk Exp $ */
+/* $Id: DynamicShape.cpp,v 1.14 2007/12/04 11:45:27 strk Exp $ */
#include "DynamicShape.h"
@@ -127,7 +127,7 @@
}
void
-DynamicShape::lineStyle(uint16_t thickness, const rgba& color)
+DynamicShape::lineStyle(boost::uint16_t thickness, const rgba& color)
{
line_style style(thickness, color);
_currline = add_line_style(style);
Index: server/DynamicShape.h
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/DynamicShape.h 9 Nov 2007 09:31:22 -0000 1.7
+++ server/DynamicShape.h 4 Dec 2007 11:45:27 -0000 1.8
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: DynamicShape.h,v 1.7 2007/11/09 09:31:22 strk Exp $ */
+/* $Id: DynamicShape.h,v 1.8 2007/12/04 11:45:27 strk Exp $ */
#ifndef GNASH_DYNAMIC_SHAPE_H
#define GNASH_DYNAMIC_SHAPE_H
@@ -59,7 +59,7 @@
void endFill();
/// Set current line style and start a new path.
- void lineStyle(uint16_t thickness, const rgba& color);
+ void lineStyle(boost::uint16_t thickness, const rgba& color);
/// Reset line style to no style and start a new path.
void resetLineStyle();
Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/FreetypeGlyphsProvider.cpp 6 Nov 2007 09:06:01 -0000 1.16
+++ server/FreetypeGlyphsProvider.cpp 4 Dec 2007 11:45:27 -0000 1.17
@@ -399,7 +399,7 @@
#ifdef USE_FREETYPE
boost::intrusive_ptr<shape_character_def>
-FreetypeGlyphsProvider::getGlyph(uint16_t code, float& advance)
+FreetypeGlyphsProvider::getGlyph(boost::uint16_t code, float& advance)
{
boost::intrusive_ptr<DynamicShape> sh;
@@ -462,7 +462,7 @@
}
#else // ndef(USE_FREETYPE)
boost::intrusive_ptr<shape_character_def>
-FreetypeGlyphsProvider::getGlyph(uint16_t, float& advance)
+FreetypeGlyphsProvider::getGlyph(boost::uint16_t, float& advance)
{
abort(); // should never be called...
}
Index: server/FreetypeGlyphsProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/FreetypeGlyphsProvider.h 14 Sep 2007 08:49:56 -0000 1.5
+++ server/FreetypeGlyphsProvider.h 4 Dec 2007 11:45:28 -0000 1.6
@@ -105,7 +105,7 @@
/// @return A shape_character_def in 1024 EM coordinates, or a NULL
pointer if the given
/// character code doesn't exist in this font.
///
- boost::intrusive_ptr<shape_character_def> getGlyph(uint16_t code,
float& advance);
+ boost::intrusive_ptr<shape_character_def> getGlyph(boost::uint16_t
code, float& advance);
private:
Index: server/GlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/GlowFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/GlowFilter.h 4 Dec 2007 11:45:28 -0000 1.5
@@ -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: GlowFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: GlowFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
#ifndef GNASH_GLOWFILTER_H
#define GNASH_GLOWFILTER_H
@@ -26,7 +26,7 @@
#include "BitmapFilter.h"
-#include <boost/cstdint.hpp> // for uint32_t
+#include <boost/cstdint.hpp> // for boost::uint32_t
namespace gnash {
@@ -45,7 +45,7 @@
m_inner(false), m_knockout(false)
{ return; }
- GlowFilter(uint32_t color,
+ GlowFilter(boost::uint32_t color,
uint8_t alpha, float blurX, float blurY, float strength,
uint8_t quality, bool inner, bool knockout) :
m_color(color),
@@ -54,7 +54,7 @@
{ return; }
protected:
- uint32_t m_color; // RGB color.
+ boost::uint32_t m_color; // RGB color.
uint8_t m_alpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
Index: server/GradientBevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/GradientBevelFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/GradientBevelFilter.h 4 Dec 2007 11:45:28 -0000 1.5
@@ -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: GradientBevelFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: GradientBevelFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
#ifndef GNASH_GRADIENTBEVELFILTER_H
#define GNASH_GRADIENTBEVELFILTER_H
@@ -54,7 +54,7 @@
{ return; }
GradientBevelFilter(float distance, float angle,
- std::vector<uint32_t> colors,
+ std::vector<boost::uint32_t> colors,
std::vector<uint8_t> alphas,
std::vector<uint8_t> ratios,
float blurX, float blurY, float strength,
@@ -68,7 +68,7 @@
protected:
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
- std::vector<uint32_t> m_colors; // Colors of the gradients.
+ std::vector<boost::uint32_t> m_colors; // Colors of the gradients.
std::vector<uint8_t> m_alphas; // Alphas of the gradients.
std::vector<uint8_t> m_ratios; // Ratios of the gradients.
float m_blurX; // horizontal blur
Index: server/GradientGlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/GradientGlowFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/GradientGlowFilter.h 4 Dec 2007 11:45:28 -0000 1.5
@@ -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: GradientGlowFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: GradientGlowFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
#ifndef GNASH_GRADIENTGLOWFILTER_H
#define GNASH_GRADIENTGLOWFILTER_H
@@ -55,7 +55,7 @@
{ return; }
GradientGlowFilter(float distance, float angle,
- std::vector<uint32_t> colors,
+ std::vector<boost::uint32_t> colors,
std::vector<uint8_t> alphas,
std::vector<uint8_t> ratios,
float blurX, float blurY, float strength,
@@ -68,7 +68,7 @@
protected:
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
- std::vector<uint32_t> m_colors; // Colors of the gradients.
+ std::vector<boost::uint32_t> m_colors; // Colors of the gradients.
std::vector<uint8_t> m_alphas; // Alphas of the gradients.
std::vector<uint8_t> m_ratios; // Ratios of the gradients.
float m_blurX; // horizontal blur
Index: server/asClass.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asClass.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asClass.cpp 18 Oct 2007 11:47:54 -0000 1.2
+++ server/asClass.cpp 4 Dec 2007 11:45:28 -0000 1.3
@@ -43,7 +43,7 @@
}
bool
-asMethod::addValue(string_table::key name, asNamespace *ns, uint32_t slotId,
+asMethod::addValue(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, as_value& val, bool isconst)
{
if (val.is_object())
@@ -61,7 +61,7 @@
}
bool
-asClass::addValue(string_table::key name, asNamespace *ns, uint32_t slotId,
+asClass::addValue(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, as_value& val, bool isconst, bool isstatic)
{
if (val.is_object())
@@ -81,20 +81,20 @@
bool
asMethod::addMemberClass(string_table::key name, asNamespace *ns,
- uint32_t slotId, asClass *type)
+ boost::uint32_t slotId, asClass *type)
{
return addSlot(name, ns, slotId, type);
}
bool
asClass::addMemberClass(string_table::key name, asNamespace *ns,
- uint32_t slotId, asClass *type, bool isstatic)
+ boost::uint32_t slotId, asClass *type, bool isstatic)
{
return addSlot(name, ns, slotId, type, isstatic);
}
bool
-asMethod::addSlot(string_table::key name, asNamespace* ns, uint32_t slotId,
+asMethod::addSlot(string_table::key name, asNamespace* ns, boost::uint32_t
slotId,
asClass */*type*/)
{
string_table::key nsname = ns ? ns->getURI() : 0;
@@ -106,7 +106,7 @@
bool
asMethod::addSlotFunction(string_table::key name, asNamespace *ns,
- uint32_t slotId, asMethod *method)
+ boost::uint32_t slotId, asMethod *method)
{
asClass a;
a.setName(NSV::CLASS_FUNCTION);
@@ -116,7 +116,7 @@
bool
asClass::addSlotFunction(string_table::key name, asNamespace *ns,
- uint32_t slotId, asMethod *method, bool isstatic)
+ boost::uint32_t slotId, asMethod *method, bool isstatic)
{
asClass a;
a.setName(NSV::CLASS_FUNCTION);
@@ -125,7 +125,7 @@
}
bool
-asClass::addSlot(string_table::key name, asNamespace* ns, uint32_t slotId,
+asClass::addSlot(string_table::key name, asNamespace* ns, boost::uint32_t
slotId,
asClass */*type*/, bool isstatic)
{
string_table::key nsname = ns ? ns->getURI() : 0;
@@ -278,7 +278,7 @@
}
bool
-asClass::addValue(string_table::key name, asNamespace *ns, uint32_t slotId,
+asClass::addValue(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, as_value& val, bool isconst, bool isstatic,
ClassHierarchy *CH)
{
@@ -291,7 +291,7 @@
}
bool
-asClass::addSlot(string_table::key name, asNamespace *ns, uint32_t slotId,
+asClass::addSlot(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, bool isstatic, ClassHierarchy *CH)
{
asBoundValue *bv = CH->newBoundValue();
@@ -313,7 +313,7 @@
bool
asClass::addMemberClass(string_table::key name, asNamespace *ns,
- uint32_t slotId, asClass *type, bool isstatic)
+ boost::uint32_t slotId, asClass *type, bool isstatic)
{
if (!isstatic)
return addBinding(name, asBinding(ns, type, slotId, isstatic));
@@ -323,7 +323,7 @@
// TODO: Figure out how this differs from addMethod
bool
asClass::addSlotFunction(string_table::key name, asNamespace *ns,
- uint32_t slotId, asMethod *method, bool isstatic)
+ boost::uint32_t slotId, asMethod *method, bool isstatic)
{
if (!isstatic)
return addBinding(name, asBinding(ns, method, slotId,
isstatic));
Index: server/asClass.h
===================================================================
RCS file: /sources/gnash/gnash/server/asClass.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asClass.h 18 Oct 2007 11:47:54 -0000 1.2
+++ server/asClass.h 4 Dec 2007 11:45:28 -0000 1.3
@@ -46,18 +46,18 @@
class asException
{
public:
- void setStart(uint32_t i) { mStart = i; }
- void setEnd(uint32_t i) { mEnd = i; }
- void setCatch(uint32_t i) { mCatch = i; }
+ void setStart(boost::uint32_t i) { mStart = i; }
+ void setEnd(boost::uint32_t i) { mEnd = i; }
+ void setCatch(boost::uint32_t i) { mCatch = i; }
void catchAny() { mCatchAny = true; }
void setCatchType(asClass* p) { mCatchType = p; }
void setNamespace(asNamespace* n) { mNamespace = n; }
void setName(string_table::key name) { mName = name; }
private:
- uint32_t mStart;
- uint32_t mEnd;
- uint32_t mCatch;
+ boost::uint32_t mStart;
+ boost::uint32_t mEnd;
+ boost::uint32_t mCatch;
bool mCatchAny;
asClass *mCatchType;
asNamespace *mNamespace;
@@ -78,8 +78,8 @@
void unsetStatic() { mStatic = false; }
bool isStatic() { return mStatic; }
- uint32_t getSlotId() { return mSlotId; }
- void setSlotId(uint32_t s) { mSlotId = s; }
+ boost::uint32_t getSlotId() { return mSlotId; }
+ void setSlotId(boost::uint32_t s) { mSlotId = s; }
// Chad: Document
string_table::key getName() { return mName; }
@@ -104,17 +104,17 @@
{/**/}
// As an assignable function.
- asBinding(asNamespace *ns, asMethod *pMethod, uint32_t sid, bool
isstatic) :
+ asBinding(asNamespace *ns, asMethod *pMethod, boost::uint32_t sid, bool
isstatic) :
mNamespace(ns), mType(T_METHOD), mSlotId(sid), mConst(false),
mStatic(isstatic), mMethod(pMethod)
{/**/}
- asBinding(asNamespace *ns, asBoundValue *pValue, uint32_t sid, bool
isconstant,
+ asBinding(asNamespace *ns, asBoundValue *pValue, boost::uint32_t sid,
bool isconstant,
bool isstatic) : mNamespace(ns), mType(T_VALUE), mSlotId(sid),
mConst(isconstant),
mStatic(isstatic), mValue(pValue)
{/**/}
- asBinding(asNamespace *ns, asBoundValue *pValue, uint32_t sid, bool
isstatic) :
+ asBinding(asNamespace *ns, asBoundValue *pValue, boost::uint32_t sid,
bool isstatic) :
mNamespace(ns), mType(T_VALUE), mSlotId(sid), mConst(false),
mStatic(isstatic),
mValue(pValue)
{/**/}
@@ -124,7 +124,7 @@
mAccess(pAccess)
{/**/}
- asBinding(asNamespace *ns, asClass *pClass, uint32_t sid, bool
isstatic) :
+ asBinding(asNamespace *ns, asClass *pClass, boost::uint32_t sid, bool
isstatic) :
mNamespace(ns), mType(T_CLASS), mSlotId(sid), mConst(true),
mStatic(isstatic),
mClass(pClass)
{/**/}
@@ -170,7 +170,7 @@
} types;
types mType;
- uint32_t mSlotId;
+ boost::uint32_t mSlotId;
bool mConst;
bool mStatic;
string_table::key mName;
@@ -356,10 +356,10 @@
CodeStream *getBody() { return mBody; }
void setBody(CodeStream *b) { mBody = b; }
- bool addValue(string_table::key name, asNamespace *ns, uint32_t slotId,
+ bool addValue(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, as_value& val, bool isconst);
- bool addSlot(string_table::key name, asNamespace *ns, uint32_t slotId,
+ bool addSlot(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type);
bool addMethod(string_table::key name, asNamespace *ns, asMethod
*method);
@@ -369,10 +369,10 @@
bool addSetter(string_table::key name, asNamespace *ns, asMethod
*method);
bool addMemberClass(string_table::key name, asNamespace *ns,
- uint32_t slotId, asClass *type);
+ boost::uint32_t slotId, asClass *type);
bool addSlotFunction(string_table::key name, asNamespace *ns,
- uint32_t slotId, asMethod *method);
+ boost::uint32_t slotId, asMethod *method);
/// \brief
/// Set the owner of this method.
@@ -482,10 +482,10 @@
void dump();
- bool addValue(string_table::key name, asNamespace *ns, uint32_t slotId,
+ bool addValue(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, as_value& val, bool isconst, bool isstatic);
- bool addSlot(string_table::key name, asNamespace *ns, uint32_t slotId,
+ bool addSlot(string_table::key name, asNamespace *ns, boost::uint32_t
slotId,
asClass *type, bool isstatic);
bool addMethod(string_table::key name, asNamespace *ns, asMethod
*method,
@@ -498,11 +498,11 @@
bool isstatic);
bool addMemberClass(string_table::key name, asNamespace *ns,
- uint32_t slotId, asClass *type, bool isstatic);
+ boost::uint32_t slotId, asClass *type, bool isstatic);
// TODO: Figure out how this differs from addMethod
bool addSlotFunction(string_table::key name, asNamespace *ns,
- uint32_t slotId, asMethod *method, bool isstatic);
+ boost::uint32_t slotId, asMethod *method, bool isstatic);
/// Is the class final?
bool isFinal() const { return mFinal; }
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/as_value.cpp 30 Nov 2007 19:12:49 -0000 1.101
+++ server/as_value.cpp 4 Dec 2007 11:45:28 -0000 1.102
@@ -473,7 +473,7 @@
/* NOTREACHED */
}
-int32_t
+boost::int32_t
as_value::to_int() const
{
double d = to_number();
@@ -483,11 +483,11 @@
if (d < 0)
{
- i = - (uint32_t) fmod (-d, 4294967296.0);
+ i = - (boost::uint32_t) fmod (-d, 4294967296.0);
}
else
{
- i = (uint32_t) fmod (d, 4294967296.0);
+ i = (boost::uint32_t) fmod (d, 4294967296.0);
}
return i;
Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/as_value.h 1 Dec 2007 00:14:59 -0000 1.78
+++ server/as_value.h 4 Dec 2007 11:45:28 -0000 1.79
@@ -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: as_value.h,v 1.78 2007/12/01 00:14:59 strk Exp $ */
+/* $Id: as_value.h,v 1.79 2007/12/04 11:45:28 strk Exp $ */
#ifndef GNASH_AS_VALUE_H
#define GNASH_AS_VALUE_H
@@ -302,13 +302,13 @@
/// Conversion to 32bit integer
//
/// Use this conversion whenever an int is needed.
- /// This is NOT the same as calling to_number<int32_t>().
+ /// This is NOT the same as calling to_number<boost::int32_t>().
///
/// @param env
/// The environment to use for running the valueOf() method
/// for object values.
///
- int32_t to_int() const;
+ boost::int32_t to_int() const;
/// Shorthand: casts the result of to_number() to the requested number
/// type.
Index: server/cxform.h
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/cxform.h 1 Jul 2007 10:54:21 -0000 1.8
+++ server/cxform.h 4 Dec 2007 11:45:28 -0000 1.9
@@ -23,10 +23,10 @@
#endif
#include "tu_config.h" // for DSOEXPORT
-#include "tu_types.h" // for uint8_t
#include <string>
#include <iosfwd>
+#include <boost/cstdint.hpp> // for boost::?int??_t
namespace gnash {
class rgba;
@@ -60,7 +60,7 @@
rgba transform(const rgba& in) const;
/// Faster transform() method for loops (avoids creation of rgba object)
- void transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const;
+ void transform(boost::uint8_t& r, boost::uint8_t& g, boost::uint8_t& b,
boost::uint8_t& a) const;
/// Read RGB from the SWF input stream.
void read_rgb(stream* in);
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/edit_text_character.cpp 30 Nov 2007 23:11:11 -0000 1.135
+++ server/edit_text_character.cpp 4 Dec 2007 11:45:28 -0000 1.136
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.135 2007/11/30 23:11:11 bjacques Exp $ */
+/* $Id: edit_text_character.cpp,v 1.136 2007/12/04 11:45:28 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -460,11 +460,11 @@
void
edit_text_character::show_cursor(const matrix& mat)
{
- uint16_t x = static_cast<uint16_t>(m_xcursor);
- uint16_t y = static_cast<uint16_t>(m_ycursor);
- uint16_t h = m_def->get_font_height();
+ boost::uint16_t x = static_cast<boost::uint16_t>(m_xcursor);
+ boost::uint16_t y = static_cast<boost::uint16_t>(m_ycursor);
+ boost::uint16_t h = m_def->get_font_height();
- int16_t box[4];
+ boost::int16_t box[4];
box[0] = x;
box[1] = y;
box[2] = x;
@@ -1134,10 +1134,10 @@
float scale = m_def->get_font_height() / 1024.0f; // the EM
square is 1024 x 1024
float fontDescent = _font->get_descent() * scale;
float fontLeading = _font->get_leading() * scale;
- uint16_t fontHeight = m_def->get_font_height();
- uint16_t leftMargin = m_def->get_left_margin();
- uint16_t rightMargin = m_def->get_right_margin();
- uint16_t indent = m_def->get_indent();
+ boost::uint16_t fontHeight = m_def->get_font_height();
+ boost::uint16_t leftMargin = m_def->get_left_margin();
+ boost::uint16_t rightMargin = m_def->get_right_margin();
+ boost::uint16_t indent = m_def->get_indent();
text_glyph_record rec; // one to work on
rec.m_style.setFont(_font);
@@ -1169,7 +1169,7 @@
assert(! _text.empty() );
const char* text = &_text[0];
- while (uint32_t code = utf8::decode_next_unicode_character(&text))
+ while (boost::uint32_t code =
utf8::decode_next_unicode_character(&text))
{
if ( _embedFonts )
{
@@ -1297,7 +1297,7 @@
{ // need a sub-scope to avoid the 'goto' in TAB handling to
cross
// initialization of the 'index' variable
- int index = _font->get_glyph_index((uint16_t) code,
_embedFonts);
+ int index = _font->get_glyph_index((boost::uint16_t) code,
_embedFonts);
IF_VERBOSE_MALFORMED_SWF (
if (index == -1)
@@ -1382,7 +1382,7 @@
break;
}
- int index =
_font->get_glyph_index((uint16_t) code, _embedFonts);
+ int index =
_font->get_glyph_index((boost::uint16_t) code, _embedFonts);
x += scale *
_font->get_advance(index, _embedFonts);
}
@@ -1847,7 +1847,7 @@
else // setter
{
rgba newColor;
- newColor.parseRGB( fn.arg(0).to_number<uint32_t>() );
+ newColor.parseRGB( fn.arg(0).to_number<boost::uint32_t>() );
ptr->setBackgroundColor(newColor);
}
@@ -1866,7 +1866,7 @@
else // setter
{
rgba newColor;
- newColor.parseRGB( fn.arg(0).to_number<uint32_t>() );
+ newColor.parseRGB( fn.arg(0).to_number<boost::uint32_t>() );
ptr->setBorderColor(newColor);
}
@@ -1885,7 +1885,7 @@
else // setter
{
rgba newColor;
- newColor.parseRGB( fn.arg(0).to_number<uint32_t>() );
+ newColor.parseRGB( fn.arg(0).to_number<boost::uint32_t>() );
ptr->setTextColor(newColor);
}
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/font.cpp 1 Dec 2007 10:19:39 -0000 1.51
+++ server/font.cpp 4 Dec 2007 11:45:28 -0000 1.52
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: font.cpp,v 1.51 2007/12/01 10:19:39 strk Exp $ */
+/* $Id: font.cpp,v 1.52 2007/12/04 11:45:28 strk Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -240,21 +240,21 @@
delete [] name;
}
- uint16_t glyph_count = in->read_u16();
+ boost::uint16_t glyph_count = in->read_u16();
unsigned long table_base = in->get_position();
// Read the glyph offsets. Offsets
// are measured from the start of the
// offset table. Make sure wide offsets fit into elements
- std::vector<uint32_t> offsets;
+ std::vector<boost::uint32_t> offsets;
int font_code_offset;
if (wide_offsets)
{
// 32-bit offsets.
for (unsigned int i = 0; i < glyph_count; i++)
{
- uint32_t off = in->read_u32();
+ boost::uint32_t off = in->read_u32();
IF_VERBOSE_PARSE (
log_parse(_("Glyph %d at offset %u"), i, off);
@@ -269,7 +269,7 @@
// 16-bit offsets.
for (unsigned int i = 0; i < glyph_count; i++)
{
- uint16_t off = in->read_u16();
+ boost::uint16_t off = in->read_u16();
IF_VERBOSE_PARSE (
log_parse(_("Glyph %d at offset %u"), i, off);
@@ -357,7 +357,7 @@
int kerning_count = in->read_u16();
for (int i = 0; i < kerning_count; i++)
{
- uint16_t char0, char1;
+ boost::uint16_t char0, char1;
if (m_wide_codes)
{
char0 = in->read_u16();
@@ -457,10 +457,10 @@
if (m_wide_codes)
{
- // Code table is made of uint16_t's.
+ // Code table is made of boost::uint16_t's.
for (size_t i=0, n=_embedGlyphTable.size(); i<n; ++i)
{
- uint16_t code = in->read_u16();
+ boost::uint16_t code = in->read_u16();
_embedded_code_table.insert(std::make_pair(code, i));
}
}
@@ -475,7 +475,7 @@
}
}
- int font::get_glyph_index(uint16_t code, bool embedded) const
+ int font::get_glyph_index(boost::uint16_t code, bool embedded) const
{
const code_table& ctable = embedded ? _embedded_code_table :
_device_code_table;
@@ -544,7 +544,7 @@
int
- font::add_os_glyph(uint16_t code)
+ font::add_os_glyph(boost::uint16_t code)
{
assert ( _ftProvider.get() );
assert(_device_code_table.find(code) ==
_device_code_table.end());
Index: server/font.h
===================================================================
RCS file: /sources/gnash/gnash/server/font.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/font.h 1 Dec 2007 10:19:39 -0000 1.33
+++ server/font.h 4 Dec 2007 11:45:28 -0000 1.34
@@ -51,7 +51,7 @@
class kerning_pair
{
public:
- uint16_t m_char0, m_char1;
+ boost::uint16_t m_char0, m_char1;
bool operator==(const kerning_pair& k) const
{
@@ -201,7 +201,7 @@
/// positive index to use in subsequent calls to other
glyph-index-based
/// methods.
///
- int get_glyph_index(uint16_t code, bool embedded) const;
+ int get_glyph_index(boost::uint16_t code, bool embedded) const;
/// Return the advance value for the given glyph index
//
@@ -250,7 +250,7 @@
///
/// @return index of the newly added glyph, or -1 on error.
///
- int add_os_glyph(uint16_t code);
+ int add_os_glyph(boost::uint16_t code);
/// Initialize the freetype rasterizer
//
@@ -281,7 +281,7 @@
bool m_subpixel_font;
// This table maps from Unicode character number to glyph index.
- typedef std::map<uint16_t, int> code_table;
+ typedef std::map<boost::uint16_t, int> code_table;
/// Code to index table for embedded glyphs
code_table _embedded_code_table;
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/impl.cpp 1 Dec 2007 01:08:09 -0000 1.128
+++ server/impl.cpp 4 Dec 2007 11:45:28 -0000 1.129
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: impl.cpp,v 1.128 2007/12/01 01:08:09 strk Exp $ */
+/* $Id: impl.cpp,v 1.129 2007/12/04 11:45:28 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -312,10 +312,10 @@
return;
}
- uint32_t file_start_pos = in->get_position();
- uint32_t header = in->read_le32();
- uint32_t file_length = in->read_le32();
- uint32_t file_end_pos = file_start_pos + file_length;
+ boost::uint32_t file_start_pos = in->get_position();
+ boost::uint32_t header = in->read_le32();
+ boost::uint32_t file_length = in->read_le32();
+ boost::uint32_t file_end_pos = file_start_pos + file_length;
int local_version = (header >> 24) & 255;
if ((header & 0x0FFFFFF) != 0x00535746
@@ -364,7 +364,7 @@
{
// Count tags.
int local_tag_count = 0;
- while ((uint32_t) str.get_position() < file_end_pos)
+ while ((boost::uint32_t) str.get_position() < file_end_pos)
{
str.open_tag();
str.close_tag();
Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/impl.h 1 Dec 2007 00:14:59 -0000 1.49
+++ server/impl.h 4 Dec 2007 11:45:28 -0000 1.50
@@ -19,7 +19,7 @@
//
//
-/* $Id: impl.h,v 1.49 2007/12/01 00:14:59 strk Exp $ */
+/* $Id: impl.h,v 1.50 2007/12/04 11:45:28 strk Exp $ */
#ifndef GNASH_IMPL_H
#define GNASH_IMPL_H
@@ -76,7 +76,7 @@
cxform m_color_transform;
matrix m_matrix;
float m_ratio;
- uint16_t m_clip_depth;
+ boost::uint16_t m_clip_depth;
display_info()
:
Index: server/render.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/render.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/render.cpp 3 Dec 2007 05:29:34 -0000 1.22
+++ server/render.cpp 4 Dec 2007 11:45:29 -0000 1.23
@@ -133,7 +133,7 @@
}
- void draw_line_strip(const int16_t coords[], int
vertex_count, const rgba& color, const matrix& mat)
+ void draw_line_strip(const boost::int16_t coords[], int
vertex_count, const rgba& color, const matrix& mat)
{
#ifdef DEBUG_RENDER_CALLS
GNASH_REPORT_FUNCTION;
Index: server/render.h
===================================================================
RCS file: /sources/gnash/gnash/server/render.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/render.h 3 Dec 2007 05:29:35 -0000 1.20
+++ server/render.h 4 Dec 2007 11:45:29 -0000 1.21
@@ -84,11 +84,11 @@
/// triangle-strip order. The type of the array should
/// be float[vertex_count*2]
///
- void draw_mesh_strip(const int16_t coords[],
+ void draw_mesh_strip(const boost::int16_t coords[],
int vertex_count);
/// See render_handler::draw_line_strip (in
backend/render_handler.h)
- void draw_line_strip(const int16_t coords[],
+ void draw_line_strip(const boost::int16_t coords[],
int vertex_count, const rgba& color, const
matrix& mat);
/// See render_handler::draw_poly (in backend/render_handler.h)
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- server/sprite_instance.cpp 4 Dec 2007 07:30:43 -0000 1.404
+++ server/sprite_instance.cpp 4 Dec 2007 11:45:29 -0000 1.405
@@ -242,7 +242,7 @@
const std::string& newname = fn.arg(1).to_string();
// should we support negative depths ? YES !
- int depth_val = uint16_t(fn.arg(2).to_number());
+ int depth_val = boost::uint16_t(fn.arg(2).to_number());
boost::intrusive_ptr<character> newch =
exported_movie->create_character_instance(sprite.get(), depth_val);
assert( newch.get() > (void*)0xFFFF );
@@ -1206,7 +1206,7 @@
{
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
- uint16_t thickness = 0;
+ boost::uint16_t thickness = 0;
uint8_t r = 0;
uint8_t g = 0;
uint8_t b = 0;
@@ -1219,12 +1219,12 @@
return as_value();
}
- thickness =
uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(), 0, 255))));
+ thickness =
boost::uint16_t(PIXELS_TO_TWIPS(boost::uint16_t(fclamp(fn.arg(0).to_number(),
0, 255))));
if ( fn.nargs > 1 )
{
// 2^24 is the max here
- uint32_t rgbval = uint32_t(fclamp(fn.arg(1).to_number(), 0,
16777216));
+ boost::uint32_t rgbval =
boost::uint32_t(fclamp(fn.arg(1).to_number(), 0, 16777216));
r = uint8_t( (rgbval&0xFF0000) >> 16);
g = uint8_t( (rgbval&0x00FF00) >> 8);
b = uint8_t( (rgbval&0x0000FF) );
@@ -1300,7 +1300,7 @@
if ( fn.nargs > 0 )
{
// 2^24 is the max here
- uint32_t rgbval = uint32_t(fclamp(fn.arg(0).to_number(), 0,
16777216));
+ boost::uint32_t rgbval =
boost::uint32_t(fclamp(fn.arg(0).to_number(), 0, 16777216));
r = uint8_t( (rgbval&0xFF0000) >> 16);
g = uint8_t( (rgbval&0x00FF00) >> 8);
b = uint8_t( (rgbval&0x0000FF) );
@@ -2806,7 +2806,7 @@
character*
sprite_instance::add_display_object(
- uint16_t character_id,
+ boost::uint16_t character_id,
const char* name,
const std::vector<swf_event*>& event_handlers,
int depth,
@@ -2869,7 +2869,7 @@
void
sprite_instance::replace_display_object(
- uint16_t character_id,
+ boost::uint16_t character_id,
const char* name,
int depth,
const cxform* color_transform,
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- server/sprite_instance.h 3 Dec 2007 07:18:20 -0000 1.153
+++ server/sprite_instance.h 4 Dec 2007 11:45:29 -0000 1.154
@@ -379,7 +379,7 @@
/// or in a no-op due to is_jumping_back being false.
///
character* add_display_object(
- uint16_t character_id,
+ boost::uint16_t character_id,
const char* name,
const SWFEventsVector& event_handlers,
int depth,
@@ -471,7 +471,7 @@
/// If NULL the default matrix will be kept.
///
void replace_display_object(
- uint16_t character_id,
+ boost::uint16_t character_id,
const char* name,
int depth,
const cxform* color_xform,
@@ -744,7 +744,7 @@
/// @{ Drawing API
- void lineStyle(uint16_t thickness, const rgba& color)
+ void lineStyle(boost::uint16_t thickness, const rgba& color)
{
_drawable->lineStyle(thickness, color);
}
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/stream.cpp 4 Dec 2007 06:19:30 -0000 1.37
+++ server/stream.cpp 4 Dec 2007 11:45:29 -0000 1.38
@@ -1,10 +1,20 @@
-// stream.cpp -- Thatcher Ulrich <address@hidden> 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// SWF stream wrapper class, for loading variable-length data from a
-// stream, and keeping track of SWF tag boundaries.
+// stream.cpp - SWF stream reading clas, for Gnash
+//
+// 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 3 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 "stream.h"
@@ -13,29 +23,30 @@
#include "types.h"
#include "tu_file.h"
#include "swf.h"
+#include "Property.h"
+
#include <cstring>
//#include <iostream> // debugging only
-#include "Property.h"
namespace gnash {
- stream::stream(tu_file* input)
+stream::stream(tu_file* input)
:
m_input(input),
m_current_byte(0),
m_unused_bits(0)
- {
- }
+{
+}
- stream::~stream()
- {
- }
+stream::~stream()
+{
+}
- unsigned stream::read(char *buf, unsigned count)
- {
+unsigned stream::read(char *buf, unsigned count)
+{
return m_input->read_bytes(buf, count);
- }
+}
// @@ better?
// int stream::read_uint(int bitcount)
@@ -56,8 +67,8 @@
// }
- bool stream::read_bit()
- {
+bool stream::read_bit()
+{
if (!m_unused_bits)
{
m_current_byte = m_input->read_byte();
@@ -68,10 +79,10 @@
{
return ( m_current_byte & (1<<(--m_unused_bits)) );
}
- }
+}
- unsigned stream::read_uint(unsigned short bitcount)
- {
+unsigned stream::read_uint(unsigned short bitcount)
+{
//assert(bitcount <= 24);
// should be 24, check why htf_sweet.swf fails this assertion
assert(bitcount <= 32);
@@ -86,7 +97,7 @@
{
typedef unsigned char byte;
- uint32_t value = 0;
+ boost::uint32_t value = 0;
if (m_unused_bits) // Consume all the unused bits.
{
@@ -154,7 +165,7 @@
#else // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
- uint32_t value = 0;
+ boost::uint32_t value = 0;
unsigned short bits_needed = bitcount;
do
@@ -200,14 +211,14 @@
return value;
#endif // ndef OPTIMIZE_FOR_MULTIBYTE_BITS_READ
- }
+}
- int stream::read_sint(unsigned short bitcount)
- {
+int stream::read_sint(unsigned short bitcount)
+{
//assert(bitcount <= 32); // already asserted in read_uint
- int32_t value = int32_t(read_uint(bitcount));
+ boost::int32_t value = boost::int32_t(read_uint(bitcount));
// Sign extend...
if (value & (1 << (bitcount - 1))) {
@@ -217,73 +228,73 @@
// IF_DEBUG(log_msg("stream::read_sint(%d) == %d\n", bitcount,
value));
return value;
- }
+}
- float stream::read_fixed()
- {
+float stream::read_fixed()
+{
align();
return static_cast<float> (static_cast<double>
(static_cast<long int> (m_input->read_le32())) / 65536.0f);
- }
+}
- // float is not large enough to hold a 32 bit value without doing the
wrong thing with the sign.
- // So we upgrade to double for the calculation and then resize when we
know it's small enough.
- float stream::read_ufixed()
- {
+// float is not large enough to hold a 32 bit value without doing the wrong
thing with the sign.
+// So we upgrade to double for the calculation and then resize when we know
it's small enough.
+float stream::read_ufixed()
+{
align();
return static_cast<float> (static_cast<double>
(static_cast<unsigned long int> (m_input->read_le32())) / 65536.0f);
- }
+}
- // Read a short fixed value, unsigned.
- float stream::read_short_ufixed()
- {
+// Read a short fixed value, unsigned.
+float stream::read_short_ufixed()
+{
align();
- return static_cast<float> (static_cast<uint16_t>
(m_input->read_le16())) / 256.0f;
- }
+ return static_cast<float> (static_cast<boost::uint16_t>
(m_input->read_le16())) / 256.0f;
+}
- // Read a short fixed value, signed.
- float stream::read_short_sfixed()
- {
+// Read a short fixed value, signed.
+float stream::read_short_sfixed()
+{
align();
- return static_cast<float> (static_cast<int16_t>
(m_input->read_le16())) / 256.0f;
- }
+ return static_cast<float> (static_cast<boost::int16_t>
(m_input->read_le16())) / 256.0f;
+}
- // Read a signed float value.
- float stream::read_float()
- {
+// Read a signed float value.
+float stream::read_float()
+{
align();
return static_cast<float> (m_input->read_le32());
- }
+}
- // Read a 64-bit double value
- long double stream::read_d64()
- {
+// Read a 64-bit double value
+long double stream::read_d64()
+{
align();
return m_input->read_le_double64();
- }
+}
- uint8_t stream::read_u8() { align(); return m_input->read_byte(); }
- int8_t stream::read_s8() { align(); return m_input->read_byte(); }
- uint16_t stream::read_u16()
- {
+uint8_t stream::read_u8() { align(); return m_input->read_byte(); }
+int8_t stream::read_s8() { align(); return m_input->read_byte(); }
+boost::uint16_t stream::read_u16()
+{
align();
// IF_DEBUG(printf("filepos = %d ", SDL_RWtell(m_input)));
int val = m_input->read_le16();
// IF_DEBUG(log_msg("val = 0x%X\n", val));
return val;
- }
- int16_t stream::read_s16() { align(); return m_input->read_le16(); }
- uint32_t stream::read_u32()
- {
+}
+boost::int16_t stream::read_s16() { align(); return m_input->read_le16(); }
+boost::uint32_t stream::read_u32()
+{
align();
- uint32_t val = m_input->read_le32();
+ boost::uint32_t val = m_input->read_le32();
return val;
- }
- int32_t stream::read_s32() { align(); return m_input->read_le32(); }
+}
+boost::int32_t stream::read_s32() { align(); return m_input->read_le32(); }
- char* stream::read_string()
- {
+char* stream::read_string()
+{
align();
std::vector<char> buffer;
@@ -303,11 +314,11 @@
strcpy(retval, &buffer[0]);
return retval;
- }
+}
- void
- stream::read_string(std::string& to)
- {
+void
+stream::read_string(std::string& to)
+{
align();
to.clear();
@@ -318,11 +329,11 @@
to += c;
}
- }
+}
- char* stream::read_string_with_length()
- {
+char* stream::read_string_with_length()
+{
align();
int len = read_u8();
@@ -343,18 +354,18 @@
return buffer;
}
- }
+}
- void stream::read_string_with_length(std::string& to)
- {
+void stream::read_string_with_length(std::string& to)
+{
align();
unsigned int len = read_u8();
read_string_with_length(len, to);
- }
+}
- void stream::read_string_with_length(unsigned len, std::string& to)
- {
+void stream::read_string_with_length(unsigned len, std::string& to)
+{
align();
to.resize(len);
@@ -364,17 +375,17 @@
to[i] = read_u8();
}
- }
+}
- unsigned long stream::get_position()
- {
+unsigned long stream::get_position()
+{
return m_input->get_position();
- }
+}
- bool stream::set_position(unsigned long pos)
- {
+bool stream::set_position(unsigned long pos)
+{
align();
// If we're in a tag, make sure we're not seeking outside the
tag.
@@ -410,19 +421,19 @@
}
return true;
- }
+}
- unsigned long stream::get_tag_end_position()
- {
+unsigned long stream::get_tag_end_position()
+{
assert(_tagBoundsStack.size() > 0);
return _tagBoundsStack.back().second;
- }
+}
- SWF::tag_type stream::open_tag()
- {
+SWF::tag_type stream::open_tag()
+{
align();
unsigned long tagStart=get_position();
@@ -474,11 +485,11 @@
);
return static_cast<SWF::tag_type>(tag_type);
- }
+}
- void stream::close_tag()
- {
+void stream::close_tag()
+{
assert(_tagBoundsStack.size() > 0);
unsigned long end_pos = _tagBoundsStack.back().second;
_tagBoundsStack.pop_back();
@@ -489,7 +500,7 @@
}
m_unused_bits = 0;
- }
+}
} // end namespace gnash
Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/stream.h 4 Dec 2007 06:37:38 -0000 1.34
+++ server/stream.h 4 Dec 2007 11:45:29 -0000 1.35
@@ -1,22 +1,32 @@
-// stream.h -- Thatcher Ulrich <address@hidden> 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// A class to handle reading the elements of SWF files.
-
+// stream.h - SWF stream reading clas, for Gnash
+//
+// 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 3 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_STREAM_H
#define GNASH_STREAM_H
#include "swf.h"
-#include "tu_config.h"
-#include "tu_types.h" // for uint32_t, uint8_t used in this file
+#include "tu_config.h" // still neded ?
#include "GnashException.h"
#include <string>
#include <sstream>
#include <vector> // for composition
+#include <boost/cstdint.hpp> // for boost::?int??_t
// Define the following macro if you want to want Gnash parser
// to assume the underlying SWF is well-formed. It would make
@@ -33,10 +43,14 @@
namespace gnash {
- /// stream is used to encapsulate bit-packed file reads.
- class DSOEXPORT stream
- {
- public:
+/// SWF stream wrapper class
+//
+/// This class is used for loading variable-length data from
+/// a stream, and keeping track of SWF tag boundaries.
+///
+class DSOEXPORT stream
+{
+public:
stream(tu_file* input);
~stream();
@@ -99,27 +113,27 @@
/// \brief
/// Read a aligned unsigned 16-bit value from the stream.
- uint16_t read_u16();
+ boost::uint16_t read_u16();
/// \brief
/// Read a aligned signed 16-bit value from the stream.
- int16_t read_s16();
+ boost::int16_t read_s16();
/// \brief
/// Read a aligned unsigned 32-bit value from the stream.
- uint32_t read_u32();
+ boost::uint32_t read_u32();
/// \brief
/// Read a aligned signed 32-bit value from the stream.
- int32_t read_s32();
+ boost::int32_t read_s32();
/// \brief
/// Read a variable length unsigned 32-bit value from the
stream.
/// These values continue until either the high bit is not set
or
/// until 5 bytes have been read.
- uint32_t read_V32()
+ boost::uint32_t read_V32()
{
- uint32_t res = read_u8();
+ boost::uint32_t res = read_u8();
if (!(res & 0x00000080))
return res;
res = (res & 0x0000007F) | read_u8() << 7;
@@ -238,8 +252,6 @@
/// Seek to the end of the most-recently-opened tag.
void close_tag();
- //tu_file* get_underlying_stream() { return m_input; }
-
/// Discard given number of bytes
//
///
@@ -286,7 +298,7 @@
#endif
}
- private:
+private:
tu_file* m_input;
uint8_t m_current_byte;
@@ -295,10 +307,10 @@
typedef std::pair<unsigned long,unsigned long> TagBoundaries;
// position of start and end of tag
std::vector<TagBoundaries> _tagBoundsStack;
- };
+};
-} // end namespace gnash
+} // namespace gnash
#endif // GNASH_STREAM_H
Index: server/styles.h
===================================================================
RCS file: /sources/gnash/gnash/server/styles.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/styles.h 4 Sep 2007 11:27:42 -0000 1.22
+++ server/styles.h 4 Dec 2007 11:45:29 -0000 1.23
@@ -5,7 +5,7 @@
// line style types.
-/* $Id: styles.h,v 1.22 2007/09/04 11:27:42 cmusick Exp $ */
+/* $Id: styles.h,v 1.23 2007/12/04 11:45:29 strk Exp $ */
#ifndef GNASH_STYLES_H
#define GNASH_STYLES_H
@@ -42,7 +42,7 @@
/// @param color
/// Line color
///
- line_style(uint16_t width, const rgba& color)
+ line_style(boost::uint16_t width, const rgba& color)
:
m_width(width),
m_color(color)
@@ -65,7 +65,7 @@
line_style *pOther);
/// Return thickness of the line, in TWIPS
- uint16_t get_width() const { return m_width; }
+ boost::uint16_t get_width() const { return m_width; }
/// Return line color and alpha
const rgba& get_color() const { return m_color; }
@@ -74,7 +74,7 @@
friend class morph2_character_def;
friend class triangulating_render_handler;
- uint16_t m_width; // in TWIPS
+ boost::uint16_t m_width; // in TWIPS
rgba m_color;
};
@@ -87,7 +87,7 @@
void read(stream* in);
private:
- uint16_t m_width[2];
+ boost::uint16_t m_width[2];
rgba m_color[2];
};
Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/swf_function.h 20 Nov 2007 01:32:34 -0000 1.18
+++ server/swf_function.h 4 Dec 2007 11:45:29 -0000 1.19
@@ -82,7 +82,7 @@
/// used by function2 to control implicit arg register assignments
//
/// See
http://sswf.sourceforge.net/SWFalexref.html#action_declare_function2
- uint16_t m_function2_flags;
+ boost::uint16_t m_function2_flags;
/// Return an 'arguments' object.
//
@@ -202,7 +202,7 @@
void set_local_register_count(uint8_t ct) { assert(m_is_function2);
m_local_register_count = ct; }
- void set_function2_flags(uint16_t flags) { assert(m_is_function2);
m_function2_flags = flags; }
+ void set_function2_flags(boost::uint16_t flags) {
assert(m_is_function2); m_function2_flags = flags; }
void add_arg(int arg_register, const char* name)
{
Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/text.cpp 1 Dec 2007 10:19:39 -0000 1.40
+++ server/text.cpp 4 Dec 2007 11:45:30 -0000 1.41
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: text.cpp,v 1.40 2007/12/01 10:19:39 strk Exp $ */
+/* $Id: text.cpp,v 1.41 2007/12/04 11:45:30 strk Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -163,7 +163,7 @@
// We'll use about half the width, and
around 3/4 the height.
// Values adjusted by eye.
// The Y baseline is at 0; negative Y
is up.
- static const int16_t
s_empty_char_box[5 * 2] =
+ static const boost::int16_t
s_empty_char_box[5 * 2] =
{
32, 32,
480, 32,
Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/textformat.cpp 23 Sep 2007 08:48:18 -0000 1.30
+++ server/textformat.cpp 4 Dec 2007 11:45:30 -0000 1.31
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: textformat.cpp,v 1.30 2007/09/23 08:48:18 cmusick Exp $
+// $Id: textformat.cpp,v 1.31 2007/12/04 11:45:30 strk Exp $
#include "log.h"
#include "textformat.h"
@@ -188,7 +188,7 @@
if (obj->get_member(NSV::PROP_COLOR, &method)) {
//log_msg(_("Color exists and is set to %f", method.to_number());
- obj->obj.colorSet((uint32_t)method.to_number());
+ obj->obj.colorSet((boost::uint32_t)method.to_number());
}
if (obj->get_member(NSV::PROP_INDENT, &method)) {
Index: server/textformat.h
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/textformat.h 1 Jul 2007 10:54:25 -0000 1.19
+++ server/textformat.h 4 Dec 2007 11:45:30 -0000 1.20
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: textformat.h,v 1.19 2007/07/01 10:54:25 bjacques Exp $
+// $Id: textformat.h,v 1.20 2007/12/04 11:45:30 strk Exp $
//
#ifndef __TEXTFORMAT_H__
@@ -59,7 +59,7 @@
//
/// A number containing three 8-bit RGB components; for example,
/// 0xFF0000 is red, 0x00FF00 is green.
- uint32_t color() const { return _color; }
+ boost::uint32_t color() const { return _color; }
/// \brief
/// Return ann integer that indicates the indentation from the left
@@ -99,7 +99,7 @@
void italicedSet(bool x) { _italic = x; }
void boldSet(bool x) { _bold = x; }
void bulletSet(bool x) { _bullet = x; }
- void colorSet(uint32_t x) { _color = x; }
+ void colorSet(boost::uint32_t x) { _color = x; }
void indentSet(float x) { _indent = x; }
void alignSet(const std::string& x) { _align = x; }
@@ -152,7 +152,7 @@
//
/// A number containing three 8-bit RGB components; for example,
/// 0xFF0000 is red, 0x00FF00 is green.
- uint32_t _color;
+ boost::uint32_t _color;
// The name of a font for text as a string.
std::string _font;
Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/timers.cpp 20 Nov 2007 00:44:04 -0000 1.39
+++ server/timers.cpp 4 Dec 2007 11:45:30 -0000 1.40
@@ -19,7 +19,7 @@
//
//
-/* $Id: timers.cpp,v 1.39 2007/11/20 00:44:04 cmusick Exp $ */
+/* $Id: timers.cpp,v 1.40 2007/12/04 11:45:30 strk Exp $ */
#include "timers.h"
#include "as_function.h" // for class as_function
@@ -49,7 +49,7 @@
void
- Timer::setInterval(as_function& method, uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr)
+ Timer::setInterval(as_function& method, boost::uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr)
{
_function = &method;
_interval = ms; // keep milliseconds
@@ -59,7 +59,7 @@
}
void
- Timer::setInterval(as_function& method, uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr,
+ Timer::setInterval(as_function& method, boost::uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr,
std::vector<as_value>& args)
{
_function = &method;
@@ -90,7 +90,7 @@
{
if (_start)
{
- uint64_t now = VM::get().getTime();
+ boost::uint64_t now = VM::get().getTime();
assert(now >= _start); // it is possible for now to be ==
_start
//cout << "Start is " << _start << " interval is " << _interval
<< " now is " << now << endl;
@@ -229,7 +229,7 @@
}
// Get interval time
- uint64_t ms = uint64_t(fn.arg(timer_arg).to_number());
+ boost::uint64_t ms = boost::uint64_t(fn.arg(timer_arg).to_number());
// Parse arguments
Timer::ArgsContainer args;
Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/timers.h 1 Dec 2007 00:15:00 -0000 1.28
+++ server/timers.h 4 Dec 2007 11:45:30 -0000 1.29
@@ -86,7 +86,7 @@
/// It is allowed to be NULL as long as fn_call is allowed
/// a NULL as 'this_ptr' (we might want to change this).
///
- void setInterval(as_function& method, uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr);
+ void setInterval(as_function& method, boost::uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr);
/// Setup the Timer, enabling it.
//
@@ -106,7 +106,7 @@
/// @param args
/// The list of arguments to pass to the function being invoked.
///
- void setInterval(as_function& method, uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr,
+ void setInterval(as_function& method, boost::uint64_t ms,
boost::intrusive_ptr<as_object> this_ptr,
std::vector<as_value>& args);
/// Clear the timer, ready for reuse
@@ -137,10 +137,10 @@
typedef std::vector<as_value> ArgsContainer;
/// Return number of microseconds between expirations
- uint64_t getInterval() const { return _interval; }
+ boost::uint64_t getInterval() const { return _interval; }
/// Return number of milliseconds after VM start this timer was last
reset
- uint64_t getStart() const { return _start; }
+ boost::uint64_t getStart() const { return _start; }
#ifdef GNASH_USE_GC
/// Mark all reachable resources (for GC)
@@ -163,10 +163,10 @@
void start();
/// Number of milliseconds between expirations
- uint64_t _interval;
+ boost::uint64_t _interval;
/// Number of microseconds since epoch at Timer start (?)
- uint64_t _start;
+ boost::uint64_t _start;
/// The associated function, stored in an intrusive pointer
boost::intrusive_ptr<as_function> _function;
Index: server/tools.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tools.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/tools.cpp 30 Oct 2007 18:55:43 -0000 1.6
+++ server/tools.cpp 4 Dec 2007 11:45:30 -0000 1.7
@@ -82,7 +82,7 @@
};
- void write_placeholder_bitmap(tu_file* out, uint16_t character_id)
+ void write_placeholder_bitmap(tu_file* out, boost::uint16_t
character_id)
// Write a minimal bitmap character tag into the given stream,
// with the given character_id.
{
@@ -133,10 +133,10 @@
// @@ Copied & adapted from movie_def_impl::read()
// @@ TODO share this wrapper code somehow (also with parser)
- uint32_t file_start_pos = in->get_position();
- uint32_t header = in->read_le32();
- uint32_t file_length = in->read_le32();
- uint32_t file_end_pos = file_start_pos + file_length;
+ boost::uint32_t file_start_pos = in->get_position();
+ boost::uint32_t header = in->read_le32();
+ boost::uint32_t file_length = in->read_le32();
+ boost::uint32_t file_end_pos = file_start_pos + file_length;
int version = (header >> 24) & 255;
if ((header & 0x0FFFFFF) != 0x00535746
@@ -215,7 +215,7 @@
// IF_VERBOSE_PARSE(m_frame_size.print());
IF_VERBOSE_PARSE(log_msg("frame rate = %f, frames = %d\n", frame_rate,
frame_count));
- while ((uint32_t) str.get_position() < file_end_pos)
+ while ((boost::uint32_t) str.get_position() < file_end_pos)
{
copy_helper cp(in, swf_out);
@@ -234,7 +234,7 @@
|| tag_type == 36))
{
// Some type of bitmap character tag; replace it with a
minimal stand-in.
- uint16_t cid = str.read_u16();
+ boost::uint16_t cid = str.read_u16();
str.close_tag();
// Insert substitute tag.
Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/types.h 7 Aug 2007 20:53:10 -0000 1.17
+++ server/types.h 4 Dec 2007 11:45:30 -0000 1.18
@@ -9,10 +9,10 @@
#define __TYPES_H__
-#include "gnash.h"
-#include "tu_types.h"
+#include "gnash.h" // what for ?
#include <string>
+#include <boost/cstdint.hpp> // for boost::?int??_t
namespace gnash {
@@ -64,7 +64,7 @@
/// This function is meant to be used to
/// parse ActionScript colors in numeric format.
///
- void parseRGB(uint32_t rgbCol)
+ void parseRGB(boost::uint32_t rgbCol)
{
m_r = (uint8_t)(rgbCol>>16);
m_g = (uint8_t)(rgbCol>>8);
@@ -80,7 +80,7 @@
/// This function is meant to be used to
/// output ActionScript colors in numeric format.
///
- uint32_t toRGB() const
+ boost::uint32_t toRGB() const
{
return (m_r<<16) + (m_g<<8) + m_b;
}
Index: server/asobj/BevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/BevelFilter_as.cpp 14 Sep 2007 01:23:56 -0000 1.4
+++ server/asobj/BevelFilter_as.cpp 4 Dec 2007 11:45:30 -0000 1.5
@@ -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: BevelFilter_as.cpp,v 1.4 2007/09/14 01:23:56 nihilus Exp $ */
+/* $Id: BevelFilter_as.cpp,v 1.5 2007/12/04 11:45:30 strk Exp $ */
#include "as_object.h"
#include "BevelFilter.h"
@@ -76,9 +76,9 @@
phelp_property(float, number<float>, distance)
phelp_property(float, number<float>, angle)
-phelp_property(uint32_t, number<uint32_t>, highlightColor)
+phelp_property(boost::uint32_t, number<boost::uint32_t>, highlightColor)
phelp_property(uint8_t, number<uint8_t>, highlightAlpha)
-phelp_property(uint32_t, number<uint32_t>, shadowColor)
+phelp_property(boost::uint32_t, number<boost::uint32_t>, shadowColor)
phelp_property(uint8_t, number<uint8_t>, shadowAlpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
Index: server/asobj/Color.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Color.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/Color.cpp 20 Nov 2007 12:04:55 -0000 1.19
+++ server/asobj/Color.cpp 4 Dec 2007 11:45:30 -0000 1.20
@@ -187,7 +187,7 @@
log_debug ("Color.getRGB found Color transform with rgb = %d/%d/%d
(%f,%f,%f)", r, g, b, trans.m_[0][1], trans.m_[1][1], trans.m_[2][1]);
#endif
- int32_t rgb = (r<<16) | (g<<8) | b;
+ boost::int32_t rgb = (r<<16) | (g<<8) | b;
return as_value(rgb);
}
@@ -239,7 +239,7 @@
return as_value();
}
- int32_t color = fn.arg(0).to_int();
+ boost::int32_t color = fn.arg(0).to_int();
int r = (color&0xFF0000) >> 16;
int g = (color&0x00FF00) >> 8;
Index: server/asobj/ConvolutionFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ConvolutionFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/ConvolutionFilter_as.cpp 14 Sep 2007 01:39:31 -0000
1.3
+++ server/asobj/ConvolutionFilter_as.cpp 4 Dec 2007 11:45:30 -0000
1.4
@@ -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: ConvolutionFilter_as.cpp,v 1.3 2007/09/14 01:39:31 nihilus Exp $ */
+/* $Id: ConvolutionFilter_as.cpp,v 1.4 2007/12/04 11:45:30 strk Exp $ */
#include "as_object.h"
#include "ConvolutionFilter.h"
@@ -71,7 +71,7 @@
phelp_property(float, number<float>, bias)
phelp_property(bool, bool, preserveAlpha)
phelp_property(bool, bool, clamp)
-phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
phelp_property(uint8_t, number<uint8_t>, alpha)
phelp_array_property(matrix)
Index: server/asobj/DropShadowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/DropShadowFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/DropShadowFilter_as.cpp 14 Sep 2007 01:39:31 -0000
1.3
+++ server/asobj/DropShadowFilter_as.cpp 4 Dec 2007 11:45:30 -0000
1.4
@@ -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: DropShadowFilter_as.cpp,v 1.3 2007/09/14 01:39:31 nihilus Exp $ */
+/* $Id: DropShadowFilter_as.cpp,v 1.4 2007/12/04 11:45:30 strk Exp $ */
#include "as_object.h"
#include "DropShadowFilter.h"
@@ -74,7 +74,7 @@
phelp_property(float, number<float>, distance)
phelp_property(float, number<float>, angle)
-phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
phelp_property(uint8_t, number<uint8_t>, alpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
Index: server/asobj/GlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GlowFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/GlowFilter_as.cpp 14 Sep 2007 01:39:31 -0000 1.3
+++ server/asobj/GlowFilter_as.cpp 4 Dec 2007 11:45:31 -0000 1.4
@@ -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: GlowFilter_as.cpp,v 1.3 2007/09/14 01:39:31 nihilus Exp $ */
+/* $Id: GlowFilter_as.cpp,v 1.4 2007/12/04 11:45:31 strk Exp $ */
#include "as_object.h"
#include "GlowFilter.h"
@@ -65,7 +65,7 @@
phelp_gs_attach(knockout);
phelp_gs_attach_end
-phelp_property(uint32_t, number<uint32_t>, color)
+phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
phelp_property(uint8_t, number<uint8_t>, alpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
Index: server/asobj/Math.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Math.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/Math.cpp 1 Jul 2007 10:54:28 -0000 1.23
+++ server/asobj/Math.cpp 4 Dec 2007 11:45:31 -0000 1.24
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: Math.cpp,v 1.23 2007/07/01 10:54:28 bjacques Exp $ */
+/* $Id: Math.cpp,v 1.24 2007/12/04 11:45:31 strk Exp $ */
//
// This file implements methods of the ActionScript Math class.
@@ -145,7 +145,7 @@
as_value math_random(const fn_call& /* fn */)
{
// Random number between 0 and 1.
- return as_value(tu_random::next_random() / double(uint32_t(0x0FFFFFFFF)));
+ return as_value(tu_random::next_random() /
double(boost::uint32_t(0x0FFFFFFFF)));
}
as_value math_round(const fn_call& fn)
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- server/asobj/NetStream.cpp 23 Nov 2007 15:14:35 -0000 1.76
+++ server/asobj/NetStream.cpp 4 Dec 2007 11:45:31 -0000 1.77
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStream.cpp,v 1.76 2007/11/23 15:14:35 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.77 2007/12/04 11:45:31 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -160,12 +160,12 @@
static as_value netstream_seek(const fn_call& fn) {
boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
- uint32_t time = 0;
+ boost::uint32_t time = 0;
if (fn.nargs > 0)
{
- time = fn.arg(0).to_number<uint32_t>();
+ time = fn.arg(0).to_number<boost::uint32_t>();
}
- ns->seek(static_cast<uint32_t>(time*1000.0));
+ ns->seek(static_cast<boost::uint32_t>(time*1000.0));
return as_value();
}
@@ -184,7 +184,7 @@
{
time = fn.arg(0).to_number();
}
- ns->setBufferTime(uint32_t(time*1000));
+ ns->setBufferTime(boost::uint32_t(time*1000));
return as_value();
}
@@ -510,7 +510,7 @@
}
void
-NetStream::setBufferTime(uint32_t time)
+NetStream::setBufferTime(boost::uint32_t time)
{
// The argument is in milliseconds,
m_bufferTime = time;
Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/asobj/NetStream.h 17 Oct 2007 04:58:59 -0000 1.52
+++ server/asobj/NetStream.h 4 Dec 2007 11:45:31 -0000 1.53
@@ -19,7 +19,7 @@
//
//
-/* $Id: NetStream.h,v 1.52 2007/10/17 04:58:59 nihilus Exp $ */
+/* $Id: NetStream.h,v 1.53 2007/12/04 11:45:31 strk Exp $ */
#ifndef __NETSTREAM_H__
#define __NETSTREAM_H__
@@ -131,7 +131,7 @@
as_environment* m_env;
// The size of the buffer in milliseconds
- uint32_t m_bufferTime;
+ boost::uint32_t m_bufferTime;
// The video outputformat
int m_videoFrameFormat;
@@ -217,13 +217,13 @@
/// @param position
/// Defines in milliseconds where to seek to
///
- virtual void seek(uint32_t /*pos*/){}
+ virtual void seek(boost::uint32_t /*pos*/){}
/// Tells where the playhead currently is
//
/// @return The time in milliseconds of the current playhead position
///
- virtual int32_t time() { return 0; }
+ virtual boost::int32_t time() { return 0; }
/// Called at the SWF framerate. Used to process queued status messages
/// and (re)start after a buffering pause. In NetStreamFfmpeg it is also
@@ -255,13 +255,13 @@
/// @param time
/// The time in milliseconds that should be buffered.
///
- void setBufferTime(uint32_t time);
+ void setBufferTime(boost::uint32_t time);
/// Returns what the buffer time has been set to. (100 miliseconds is
default)
//
/// @return The size of the buffer in milliseconds.
///
- uint32_t bufferTime() { return m_bufferTime; }
+ boost::uint32_t bufferTime() { return m_bufferTime; }
/// Returns the number of bytes loaded of the media file
//
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/asobj/NetStreamFfmpeg.cpp 27 Nov 2007 11:08:23 -0000 1.100
+++ server/asobj/NetStreamFfmpeg.cpp 4 Dec 2007 11:45:31 -0000 1.101
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.100 2007/11/27 11:08:23 bwy Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.101 2007/12/04 11:45:31 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -804,7 +804,7 @@
packet->size = frame->dataSize;
packet->data = frame->data;
// FIXME: is this the right value for packet.dts?
- packet->pts = packet->dts = static_cast<int64_t>(frame->timestamp);
+ packet->pts = packet->dts =
static_cast<boost::int64_t>(frame->timestamp);
if (frame->tag == 9)
{
@@ -829,9 +829,9 @@
uint8_t* ptr = new uint8_t[bufsize];
#ifdef FFMPEG_AUDIO2
frame_size = bufsize;
- if (avcodec_decode_audio2(m_ACodecCtx, (int16_t*) ptr, &frame_size,
packet->data, packet->size) >= 0)
+ if (avcodec_decode_audio2(m_ACodecCtx, (boost::int16_t*) ptr,
&frame_size, packet->data, packet->size) >= 0)
#else
- if (avcodec_decode_audio(m_ACodecCtx, (int16_t*) ptr, &frame_size,
packet->data, packet->size) >= 0)
+ if (avcodec_decode_audio(m_ACodecCtx, (boost::int16_t*) ptr,
&frame_size, packet->data, packet->size) >= 0)
#endif
{
@@ -844,8 +844,8 @@
uint8_t* output = new uint8_t[bufsize];
- samples =
_resampler.resample(reinterpret_cast<int16_t*>(ptr),
-
reinterpret_cast<int16_t*>(output),
+ samples =
_resampler.resample(reinterpret_cast<boost::int16_t*>(ptr),
+
reinterpret_cast<boost::int16_t*>(output),
samples);
delete [] ptr;
ptr = reinterpret_cast<uint8_t*>(output);
@@ -861,8 +861,8 @@
// set presentation timestamp
if (packet->dts != static_cast<signed long>(AV_NOPTS_VALUE))
{
- if (!m_isFLV) raw->m_pts =
static_cast<uint32_t>(as_double(m_audio_stream->time_base) * packet->dts *
1000.0);
- else raw->m_pts =
static_cast<uint32_t>((as_double(m_ACodecCtx->time_base) * packet->dts) *
1000.0);
+ if (!m_isFLV) raw->m_pts =
static_cast<boost::uint32_t>(as_double(m_audio_stream->time_base) * packet->dts
* 1000.0);
+ else raw->m_pts =
static_cast<boost::uint32_t>((as_double(m_ACodecCtx->time_base) * packet->dts)
* 1000.0);
}
if (raw->m_pts != 0)
@@ -876,10 +876,10 @@
}
// update video clock for next frame
- uint32_t frame_delay;
+ boost::uint32_t frame_delay;
if (!m_isFLV)
{
- frame_delay =
static_cast<uint32_t>((as_double(m_audio_stream->time_base) * packet->dts) *
1000.0);
+ frame_delay =
static_cast<boost::uint32_t>((as_double(m_audio_stream->time_base) *
packet->dts) * 1000.0);
}
else
{
@@ -953,8 +953,8 @@
// set presentation timestamp
if (packet->dts != static_cast<signed long>(AV_NOPTS_VALUE))
{
- if (!m_isFLV) video->m_pts =
static_cast<uint32_t>((as_double(m_video_stream->time_base) * packet->dts) *
1000.0);
- else video->m_pts =
static_cast<uint32_t>((as_double(m_VCodecCtx->time_base) * packet->dts) *
1000.0);
+ if (!m_isFLV) video->m_pts =
static_cast<boost::uint32_t>((as_double(m_video_stream->time_base) *
packet->dts) * 1000.0);
+ else video->m_pts =
static_cast<boost::uint32_t>((as_double(m_VCodecCtx->time_base) * packet->dts)
* 1000.0);
}
if (video->m_pts != 0)
@@ -968,12 +968,12 @@
}
// update video clock for next frame
- uint32_t frame_delay;
- if (!m_isFLV) frame_delay =
static_cast<uint32_t>(as_double(m_video_stream->codec->time_base) * 1000.0);
+ boost::uint32_t frame_delay;
+ if (!m_isFLV) frame_delay =
static_cast<boost::uint32_t>(as_double(m_video_stream->codec->time_base) *
1000.0);
else frame_delay = m_parser->videoFrameDelay();
// for MPEG2, the frame can be repeated, so we update the clock
accordingly
- frame_delay += static_cast<uint32_t>(m_Frame->repeat_pict *
(frame_delay * 0.5) * 1000.0);
+ frame_delay +=
static_cast<boost::uint32_t>(m_Frame->repeat_pict * (frame_delay * 0.5) *
1000.0);
m_last_video_timestamp += frame_delay;
@@ -1085,7 +1085,7 @@
}
void
-NetStreamFfmpeg::seek(uint32_t pos)
+NetStreamFfmpeg::seek(boost::uint32_t pos)
{
long newpos = 0;
double timebase = 0;
@@ -1157,7 +1157,7 @@
}
av_seek_frame(m_FormatCtx, m_video_index, newpos, 0);
- uint32_t newtime_ms = static_cast<int32_t>(newtime / 1000.0);
+ boost::uint32_t newtime_ms =
static_cast<boost::int32_t>(newtime / 1000.0);
m_start_clock += m_last_audio_timestamp - newtime_ms;
m_last_audio_timestamp = newtime_ms;
@@ -1191,7 +1191,7 @@
}
// Caclulate the current time
- uint32_t current_clock;
+ boost::uint32_t current_clock;
if (m_ACodecCtx && get_sound_handler())
{
current_clock = m_current_timestamp;
@@ -1202,7 +1202,7 @@
m_current_timestamp = current_clock;
}
- uint32_t video_clock = video->m_pts;
+ boost::uint32_t video_clock = video->m_pts;
// If the timestamp on the videoframe is smaller than the
// current time, we put it in the output image.
@@ -1272,14 +1272,14 @@
refreshVideoFrame();
}
-int32_t
+boost::int32_t
NetStreamFfmpeg::time()
{
if (m_FormatCtx && m_FormatCtx->nb_streams > 0)
{
double time = as_double(m_FormatCtx->streams[0]->time_base) *
(double)m_FormatCtx->streams[0]->cur_dts;
- return static_cast<int32_t>(time);
+ return static_cast<boost::int32_t>(time);
}
else if
(m_isFLV)
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/asobj/NetStreamFfmpeg.h 27 Nov 2007 08:45:33 -0000 1.53
+++ server/asobj/NetStreamFfmpeg.h 4 Dec 2007 11:45:31 -0000 1.54
@@ -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: NetStreamFfmpeg.h,v 1.53 2007/11/27 08:45:33 bwy Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.54 2007/12/04 11:45:31 strk Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -69,10 +69,10 @@
}
int m_stream_index;
- uint32_t m_size;
+ boost::uint32_t m_size;
uint8_t* m_data;
uint8_t* m_ptr;
- uint32_t m_pts; // presentation timestamp in millisec
+ boost::uint32_t m_pts; // presentation timestamp in millisec
};
/// Threadsafe elements-owning queue
@@ -228,7 +228,7 @@
///
/// @return the number of samples in the output data.
///
- int resample(int16_t* input, int16_t* output, int samples)
+ int resample(boost::int16_t* input, boost::int16_t* output, int samples)
{
return audio_resample (_context, output, input, samples);
}
@@ -259,10 +259,10 @@
// - ::startPlayback() non locking but called by av_streamer which
locks
// - ::seekMedia() set as a callback with init_put_byte (??)
//
- void seek(uint32_t pos);
+ void seek(boost::uint32_t pos);
// See dox in NetStream.h
- int32_t time();
+ boost::int32_t time();
// See dox in NetStream.h
void advance();
@@ -412,21 +412,21 @@
boost::thread* _decodeThread;
// The timestamp of the last decoded video frame, in seconds.
- volatile uint32_t m_last_video_timestamp;
+ volatile boost::uint32_t m_last_video_timestamp;
// The timestamp of the last decoded audio frame, in seconds.
- volatile uint32_t m_last_audio_timestamp;
+ volatile boost::uint32_t m_last_audio_timestamp;
// The timestamp of the last played audio (default) or video (if no
audio) frame.
// Misured in seconds.
- uint32_t m_current_timestamp;
+ boost::uint32_t m_current_timestamp;
// The queues of audio and video data.
multithread_queue <raw_mediadata_t*> m_qaudio;
multithread_queue <raw_mediadata_t*> m_qvideo;
// The time we started playing in seconds (since VM start ?)
- volatile uint64_t m_start_clock;
+ volatile boost::uint64_t m_start_clock;
// When the queues are full, this is where we keep the audio/video frame
// there wasn't room for on its queue
@@ -435,7 +435,7 @@
ByteIOContext ByteIOCxt;
// Time of when pause started, in seconds since VM started
- volatile uint64_t m_time_of_pause;
+ volatile boost::uint64_t m_time_of_pause;
};
} // gnash namespace
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/asobj/NetStreamGst.cpp 24 Nov 2007 17:21:44 -0000 1.62
+++ server/asobj/NetStreamGst.cpp 4 Dec 2007 11:45:31 -0000 1.63
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamGst.cpp,v 1.62 2007/11/24 17:21:44 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.63 2007/12/04 11:45:31 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -658,7 +658,7 @@
return false;
}
- uint32_t fps = m_parser->videoFrameRate();
+ boost::uint32_t fps = m_parser->videoFrameRate();
GstCaps* videonincaps;
if (videoInfo->codec == media::VIDEO_CODEC_H263) {
@@ -1119,7 +1119,7 @@
}
void
-NetStreamGst::seek(uint32_t pos)
+NetStreamGst::seek(boost::uint32_t pos)
{
if (!pipeline) {
if (m_parser.get()) {
@@ -1131,9 +1131,9 @@
if (m_isFLV) {
assert(m_parser.get()); // why assumed here and not above ?
- uint32_t newpos = m_parser->seek(pos);
+ boost::uint32_t newpos = m_parser->seek(pos);
GstClock* clock = GST_ELEMENT_CLOCK(pipeline);
- uint64_t currenttime = gst_clock_get_time (clock);
+ boost::uint64_t currenttime = gst_clock_get_time (clock);
gst_object_unref(clock);
m_clock_offset = (currenttime / GST_MSECOND) - newpos;
@@ -1205,7 +1205,7 @@
log_error("Could not pause pipeline");
}
- int64_t pos;
+ boost::int64_t pos;
GstState current, pending;
GstStateChangeReturn ret;
GstFormat fmt = GST_FORMAT_TIME;
@@ -1233,14 +1233,14 @@
processStatusNotifications();
}
-int32_t
+boost::int32_t
NetStreamGst::time()
{
if (!pipeline) return 0;
GstFormat fmt = GST_FORMAT_TIME;
- int64_t pos;
+ boost::int64_t pos;
GstStateChangeReturn ret;
GstState current, pending;
Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/NetStreamGst.h 1 Jul 2007 10:54:29 -0000 1.28
+++ server/asobj/NetStreamGst.h 4 Dec 2007 11:45:31 -0000 1.29
@@ -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: NetStreamGst.h,v 1.28 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetStreamGst.h,v 1.29 2007/12/04 11:45:31 strk Exp $ */
#ifndef __NETSTREAMGST_H__
#define __NETSTREAMGST_H__
@@ -53,8 +53,8 @@
void close();
void pause(int mode);
void play(const std::string& source);
- void seek(uint32_t pos);
- int32_t time();
+ void seek(boost::uint32_t pos);
+ boost::int32_t time();
void advance();
// Used for gstreamer data read and seek callbacks
Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/SoundFfmpeg.cpp 24 Nov 2007 17:21:44 -0000 1.17
+++ server/asobj/SoundFfmpeg.cpp 4 Dec 2007 11:45:31 -0000 1.18
@@ -274,16 +274,16 @@
int frame_size;
#ifdef FFMPEG_AUDIO2
frame_size =
(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
- if
(avcodec_decode_audio2(so->audioCodecCtx, (int16_t*) ptr, &frame_size,
packet.data, packet.size) >= 0)
+ if
(avcodec_decode_audio2(so->audioCodecCtx, (boost::int16_t*) ptr, &frame_size,
packet.data, packet.size) >= 0)
#else
- if
(avcodec_decode_audio(so->audioCodecCtx, (int16_t*) ptr, &frame_size,
packet.data, packet.size) >= 0)
+ if
(avcodec_decode_audio(so->audioCodecCtx, (boost::int16_t*) ptr, &frame_size,
packet.data, packet.size) >= 0)
#endif
{
bool stereo =
so->audioCodecCtx->channels > 1 ? true : false;
int samples = stereo ?
frame_size >> 2 : frame_size >> 1;
int newDataSize = 0;
- int16_t* output_data = NULL;
+ boost::int16_t* output_data =
NULL;
bool output_data_allocated =
false;
// Resample if needed
@@ -294,12 +294,12 @@
so->resampleCtx
= audio_resample_init (2, so->audioCodecCtx->channels, 44100,
so->audioCodecCtx->sample_rate);
}
// The size of this is
a guess, we don't know yet... Lets hope it's big enough
- output_data = new
int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+ output_data = new
boost::int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE];
output_data_allocated =
true;
- samples =
audio_resample (so->resampleCtx, output_data, (int16_t*)ptr, samples);
+ samples =
audio_resample (so->resampleCtx, output_data, (boost::int16_t*)ptr, samples);
newDataSize = samples
* 2 * 2; // 2 for stereo and 2 for samplesize = 2 bytes
} else {
- output_data =
(int16_t*)ptr;
+ output_data =
(boost::int16_t*)ptr;
newDataSize = samples *
2 * 2;
}
Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/SoundGst.cpp 24 Nov 2007 17:21:44 -0000 1.13
+++ server/asobj/SoundGst.cpp 4 Dec 2007 11:45:31 -0000 1.14
@@ -312,7 +312,7 @@
}
GstFormat fmt = GST_FORMAT_TIME;
- int64_t len;
+ boost::int64_t len;
if (pipeline && gst_element_query_duration (pipeline, &fmt, &len)) {
return static_cast<unsigned int>(len / GST_MSECOND);
@@ -339,7 +339,7 @@
if (!pipeline) return 0;
GstFormat fmt = GST_FORMAT_TIME;
- int64_t pos;
+ boost::int64_t pos;
GstStateChangeReturn ret;
GstState current, pending;
Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/SoundMad.cpp 24 Nov 2007 17:21:44 -0000 1.13
+++ server/asobj/SoundMad.cpp 4 Dec 2007 11:45:31 -0000 1.14
@@ -229,7 +229,7 @@
tmp_raw_buffer = new uint8_t[outsize];
int sample;
- int16_t* dst =
reinterpret_cast<int16_t*>(tmp_raw_buffer);
+ boost::int16_t* dst =
reinterpret_cast<boost::int16_t*>(tmp_raw_buffer);
// transfer the decoded samples into the
sound-struct, and do some
// scaling while we're at it.
@@ -249,7 +249,7 @@
// quantize
sample = mad_sample >>
(MAD_F_FRACBITS + 1 - 16);
- if ( sample !=
static_cast<int16_t>(sample) ) sample = sample < 0 ? -32768 : 32767;
+ if ( sample !=
static_cast<boost::int16_t>(sample) ) sample = sample < 0 ? -32768 : 32767;
*dst++ = sample;
}
@@ -258,7 +258,7 @@
// If we need to convert samplerate or/and from
mono to stereo...
if (outsize > 0 && (so->frame.header.samplerate
!= 44100 || !so->frame.header.mode)) {
- int16_t* adjusted_data = 0;
+ boost::int16_t* adjusted_data = 0;
int adjusted_size = 0;
int sample_count = outsize /
((so->frame.header.mode) ? 4 : 2);
Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/string.cpp 2 Dec 2007 14:54:33 -0000 1.45
+++ server/asobj/string.cpp 4 Dec 2007 11:45:31 -0000 1.46
@@ -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: string.cpp,v 1.45 2007/12/02 14:54:33 strk Exp $ */
+/* $Id: string.cpp,v 1.46 2007/12/04 11:45:31 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -463,7 +463,7 @@
// isn't this function supposed to take one argument?
for (unsigned int i = 0; i < fn.nargs; i++) {
- uint32_t c = fn.arg(i).to_number<uint32_t>();
+ boost::uint32_t c = fn.arg(i).to_number<boost::uint32_t>();
result += c;
}
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/asobj/xml.cpp 20 Nov 2007 12:04:56 -0000 1.55
+++ server/asobj/xml.cpp 4 Dec 2007 11:45:32 -0000 1.56
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: xml.cpp,v 1.55 2007/11/20 12:04:56 cmusick Exp $ */
+/* $Id: xml.cpp,v 1.56 2007/12/04 11:45:32 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -160,7 +160,7 @@
{
if ( ! val.is_number() )
{
- _status =
static_cast<XML::Status>(std::numeric_limits<int32_t>::min());
+ _status =
static_cast<XML::Status>(std::numeric_limits<boost::int32_t>::min());
}
else
{
Index: server/parser/abc_block.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/abc_block.cpp 18 Oct 2007 11:47:55 -0000 1.8
+++ server/parser/abc_block.cpp 4 Dec 2007 11:45:32 -0000 1.9
@@ -161,7 +161,7 @@
bool
abc_Trait::read(stream* in, abc_block *pBlock)
{
- uint32_t name = in->read_V32();
+ boost::uint32_t name = in->read_V32();
if (name >= pBlock->mMultinamePool.size())
{
ERR((_("ABC: Bad name for trait.\n")));
@@ -185,7 +185,7 @@
{
mSlotId = in->read_V32();
mTypeIndex = in->read_V32();
- uint32_t vindex = in->read_V32();
+ boost::uint32_t vindex = in->read_V32();
if (vindex)
{
if (!pBlock->pool_value(vindex, in->read_u8(), mValue))
@@ -203,7 +203,7 @@
// Ignore the 'disp_id'
in->skip_V32();
- uint32_t moffset = in->read_V32();
+ boost::uint32_t moffset = in->read_V32();
if (moffset >= pBlock->mMethods.size())
{
ERR((_("Bad method id in trait.\n")));
@@ -226,7 +226,7 @@
case KIND_FUNCTION:
{
mSlotId = in->read_V32();
- uint32_t moffset = in->read_V32();
+ boost::uint32_t moffset = in->read_V32();
if (moffset >= pBlock->mMethods.size())
{
ERR((_("Bad method id in trait.\n")));
@@ -245,7 +245,7 @@
// Ignore the metadata, but it must be read to know how to ignore it.
if ((kind >> 4) & 0x04) // has metadata
{
- uint32_t mcount = in->read_V32();
+ boost::uint32_t mcount = in->read_V32();
for (unsigned int i = 0; i < mcount; ++i)
{
in->skip_V32();
@@ -317,13 +317,13 @@
abc_block::read_integer_constants()
{
// count overestimates by 1.
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mIntegerPool.resize(count);
if (count)
mIntegerPool[0] = 0;
for (unsigned int i = 1; i < count; ++i)
{
- mIntegerPool[i] = static_cast<int32_t> (mS->read_V32());
+ mIntegerPool[i] = static_cast<boost::int32_t> (mS->read_V32());
}
return true;
}
@@ -333,7 +333,7 @@
abc_block::read_unsigned_integer_constants()
{
// count overestimates by 1.
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mUIntegerPool.resize(count);
if (count)
mUIntegerPool[0] = 0;
@@ -348,7 +348,7 @@
bool
abc_block::read_double_constants()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mDoublePool.resize(count);
if (count)
mDoublePool[0] = 0.0;
@@ -363,7 +363,7 @@
bool
abc_block::read_string_constants()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mStringPool.resize(count);
mStringPoolTableIds.resize(count);
if (count)
@@ -373,7 +373,7 @@
}
for (unsigned int i = 1; i < count; ++i)
{
- uint32_t length = mS->read_V32();
+ boost::uint32_t length = mS->read_V32();
mS->read_string_with_length(length, mStringPool[i]);
mStringPoolTableIds[i] = 0;
}
@@ -386,7 +386,7 @@
bool
abc_block::read_namespaces()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mNamespacePool.resize(count);
if (count)
{
@@ -395,7 +395,7 @@
for (unsigned int i = 1; i < count; ++i)
{
uint8_t kind = mS->read_u8();
- uint32_t nameIndex = mS->read_V32();
+ boost::uint32_t nameIndex = mS->read_V32();
if (nameIndex && nameIndex < mStringPool.size())
{
@@ -434,7 +434,7 @@
bool
abc_block::read_namespace_sets()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mNamespaceSetPool.resize(count);
if (count)
{
@@ -442,11 +442,11 @@
}
for (unsigned int i = 1; i < count; ++i)
{
- uint32_t icount = mS->read_V32();
+ boost::uint32_t icount = mS->read_V32();
mNamespaceSetPool[i].resize(icount);
for (unsigned int j = 0; j < icount; ++j)
{
- uint32_t selection = mS->read_V32();
+ boost::uint32_t selection = mS->read_V32();
if (!selection || selection >= mNamespacePool.size())
{
ERR((_("ABC: Out of bounds namespace for
namespace set.\n")));
@@ -462,7 +462,7 @@
bool
abc_block::read_multinames()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mMultinamePool.resize(count);
if (count)
{
@@ -472,9 +472,9 @@
for (unsigned int i = 1; i < count; ++i)
{
uint8_t kind = mS->read_u8();
- uint32_t ns = 0;
- uint32_t name = 0;
- uint32_t nsset = 0;
+ boost::uint32_t ns = 0;
+ boost::uint32_t name = 0;
+ boost::uint32_t nsset = 0;
mMultinamePool[i].mFlags = 0;
@@ -583,7 +583,7 @@
}
bool
-abc_block::pool_value(uint32_t index, uint8_t type, as_value &v)
+abc_block::pool_value(boost::uint32_t index, uint8_t type, as_value &v)
{
if (!index)
return true;
@@ -668,15 +668,15 @@
bool
abc_block::read_method_infos()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mMethods.resize(count);
for (unsigned int i = 0; i < count; ++i)
{
asMethod *pMethod = mCH->newMethod();
mMethods[i] = pMethod;
- uint32_t param_count = mS->read_V32();
- uint32_t return_type = mS->read_V32();
+ boost::uint32_t param_count = mS->read_V32();
+ boost::uint32_t return_type = mS->read_V32();
pMethod->setMinArgumentCount(param_count);
pMethod->setMaxArgumentCount(param_count);
@@ -699,7 +699,7 @@
for (unsigned int j = 0; j < param_count; ++j)
{
// The parameter type.
- uint32_t ptype = mS->read_V32();
+ boost::uint32_t ptype = mS->read_V32();
if (ptype >= mMultinamePool.size())
{
ERR((_("ABC: Out of bounds parameter type in
method.\n")));
@@ -724,11 +724,11 @@
// be assigned to the corresponding parameters.
if (flags & METHOD_OPTIONAL_ARGS)
{
- uint32_t ocount = mS->read_V32();
+ boost::uint32_t ocount = mS->read_V32();
pMethod->setMinArgumentCount(pMethod->maxArgumentCount() - ocount);
for (unsigned int j = 0; j < ocount; ++j)
{
- uint32_t index = mS->read_V32();
+ boost::uint32_t index = mS->read_V32();
uint8_t kindof = mS->read_u8();
as_value v;
if (!pool_value(index, kindof, v))
@@ -753,11 +753,11 @@
bool
abc_block::skip_metadata()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
for (unsigned int i = 0; i < count; ++i)
{
mS->skip_V32(); // A name index.
- uint32_t icount = mS->read_V32();
+ boost::uint32_t icount = mS->read_V32();
for (unsigned int j = 0; j < icount; ++j)
{
// key/values may not be stored together, but this
still works.
@@ -772,13 +772,13 @@
bool
abc_block::read_instances()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mClasses.resize(count);
for (unsigned int i = 0; i < count; ++i)
{
asClass *pClass;
- uint32_t index = mS->read_V32();
+ boost::uint32_t index = mS->read_V32();
// 0 is allowed as a name, typically for the last entry.
if (index >= mMultinamePool.size())
{
@@ -810,7 +810,7 @@
}
pClass->setDeclared();
mClasses[i] = pClass;
- uint32_t super_index = mS->read_V32();
+ boost::uint32_t super_index = mS->read_V32();
if (super_index && super_index >= mMultinamePool.size())
{
@@ -869,7 +869,7 @@
if (flags & INSTANCE_PROTECTED_NS) // Protected Namespace
{
- uint32_t ns_index = mS->read_V32();
+ boost::uint32_t ns_index = mS->read_V32();
if (ns_index >= mNamespacePool.size())
{
ERR((_("ABC: Out of bounds namespace for
protected.\n")));
@@ -883,11 +883,11 @@
// This is the list of interfaces which the instances has
agreed to
// implement. They must be interfaces, and they must exist.
- uint32_t intcount = mS->read_V32();
+ boost::uint32_t intcount = mS->read_V32();
for (unsigned int j = 0; j < intcount; ++j)
{
- uint32_t i_index = mS->read_V32();
+ boost::uint32_t i_index = mS->read_V32();
// 0 is allowed as an interface, typically for the last
one.
if (i_index >= mMultinamePool.size())
{
@@ -907,7 +907,7 @@
// The next thing should be the constructor.
// TODO: What does this mean exactly? How does it differ from
the one in
// the class info block?
- uint32_t moffset = mS->read_V32();
+ boost::uint32_t moffset = mS->read_V32();
if (moffset >= mMethods.size())
{
ERR((_("ABC: Out of bounds method for
initializer.\n")));
@@ -918,7 +918,7 @@
mMethods[moffset]->setOwner(pClass);
// Next come the 'traits' of the instance. (The members.)
- uint32_t tcount = mS->read_V32();
+ boost::uint32_t tcount = mS->read_V32();
for (unsigned int j = 0; j < tcount; ++j)
{
abc_Trait &aTrait = newTrait();
@@ -935,12 +935,12 @@
abc_block::read_classes()
{
// Count was found in read_instances().
- uint32_t count = mClasses.size();
+ boost::uint32_t count = mClasses.size();
for (unsigned int i = 0; i < count; ++i)
{
asClass *pClass = mClasses[i];
- uint32_t moffset = mS->read_V32();
+ boost::uint32_t moffset = mS->read_V32();
if (moffset >= mMethods.size())
{
ERR((_("ABC: Out of bound static constructor for
class.\n")));
@@ -950,7 +950,7 @@
pClass->setStaticConstructor(mMethods[moffset]);
mMethods[moffset]->setOwner(pClass);
- uint32_t tcount = mS->read_V32();
+ boost::uint32_t tcount = mS->read_V32();
for (unsigned int j = 0; j < tcount; ++j)
{
abc_Trait &aTrait = newTrait();
@@ -967,7 +967,7 @@
bool
abc_block::read_scripts()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
mScripts.resize(count);
for (unsigned int i = 0; i < count; ++i)
@@ -975,7 +975,7 @@
asClass *pScript = mCH->newClass();
mScripts[i] = pScript;
- uint32_t moffset = mS->read_V32();
+ boost::uint32_t moffset = mS->read_V32();
if (moffset >= mMethods.size())
{
ERR((_("ABC: Out of bounds method for script.\n")));
@@ -986,7 +986,7 @@
pScript->setConstructor(mMethods[moffset]);
pScript->setSuper(mTheObject);
- uint32_t tcount = mS->read_V32();
+ boost::uint32_t tcount = mS->read_V32();
for (unsigned int j = 0; j < tcount; ++j)
{
abc_Trait &aTrait = newTrait();
@@ -1002,11 +1002,11 @@
bool
abc_block::read_method_bodies()
{
- uint32_t count = mS->read_V32();
+ boost::uint32_t count = mS->read_V32();
for (unsigned int i = 0; i < count; ++i)
{
- uint32_t moffset = mS->read_V32();
+ boost::uint32_t moffset = mS->read_V32();
if (moffset >= mMethods.size())
{
ERR((_("ABC: Out of bounds for method body.\n")));
@@ -1028,7 +1028,7 @@
// Max scope depth.
mS->skip_V32();
// Code length
- uint32_t clength = mS->read_V32();
+ boost::uint32_t clength = mS->read_V32();
// The code.
std::vector<char> body(clength);
body.resize(clength);
@@ -1042,7 +1042,7 @@
else
mMethods[moffset]->getBody()->reInitialize(&body.front(), clength, true);
- uint32_t ecount = mS->read_V32();
+ boost::uint32_t ecount = mS->read_V32();
for (unsigned int j = 0; j < ecount; ++j)
{
asException *pExcept = mCH->newException();
@@ -1055,7 +1055,7 @@
pExcept->setCatch(mS->read_V32());
// What types should be caught.
- uint32_t catch_type = mS->read_V32();
+ boost::uint32_t catch_type = mS->read_V32();
if (catch_type >= mMultinamePool.size())
{
ERR((_("ABC: Out of bound type for
exception.\n")));
@@ -1086,7 +1086,7 @@
// In version 46.15, no names.
if (mVersion != (46 << 16) | 15)
{
- uint32_t cvn = mS->read_V32();
+ boost::uint32_t cvn = mS->read_V32();
if (cvn >= mMultinamePool.size())
{
ERR((_("ABC: Out of bound name for
caught exception.\n")));
@@ -1097,7 +1097,7 @@
}
} // end of exceptions
- uint32_t tcount = mS->read_V32();
+ boost::uint32_t tcount = mS->read_V32();
for (unsigned int j = 0; j < tcount; ++j)
{
abc_Trait &aTrait = newTrait();
Index: server/parser/abc_block.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/abc_block.h 18 Oct 2007 11:47:55 -0000 1.6
+++ server/parser/abc_block.h 4 Dec 2007 11:45:32 -0000 1.7
@@ -58,9 +58,9 @@
bool mHasValue;
kinds mKind;
- uint32_t mSlotId;
- uint32_t mTypeIndex;
- uint32_t mClassInfoIndex;
+ boost::uint32_t mSlotId;
+ boost::uint32_t mTypeIndex;
+ boost::uint32_t mClassInfoIndex;
as_value mValue;
string_table::key mName;
asNamespace *mNamespace;
@@ -127,8 +127,8 @@
POOL_NULL = 0x0C
} constants;
- std::vector<int32_t> mIntegerPool;
- std::vector<uint32_t> mUIntegerPool;
+ std::vector<boost::int32_t> mIntegerPool;
+ std::vector<boost::uint32_t> mUIntegerPool;
std::vector<double> mDoublePool;
std::vector<std::string> mStringPool;
std::vector<string_table::key> mStringPoolTableIds;
@@ -146,7 +146,7 @@
asClass *mTheObject;
ClassHierarchy *mCH;
- uint32_t mVersion;
+ boost::uint32_t mVersion;
asClass *locateClass(asName &m);
@@ -175,7 +175,7 @@
bool read(stream* in);
- bool pool_value(uint32_t index, uint8_t type, as_value &v);
+ bool pool_value(boost::uint32_t index, uint8_t type, as_value &v);
abc_block();
};
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/action_buffer.cpp 30 Oct 2007 18:55:43 -0000 1.27
+++ server/parser/action_buffer.cpp 4 Dec 2007 11:45:32 -0000 1.28
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: action_buffer.cpp,v 1.27 2007/10/30 18:55:43 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.28 2007/12/04 11:45:32 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -120,10 +120,10 @@
if (action_id & 0x80) {
// Action contains extra data. Read it.
- uint16_t length = in->read_u16();
+ boost::uint16_t length = in->read_u16();
m_buffer.push_back(length & 0x0FF);
m_buffer.push_back((length >> 8) & 0x0FF);
- for (uint16_t i = 0; i < length; i++) {
+ for (boost::uint16_t i = 0; i < length; i++) {
uint8_t b = in->read_u8(); // bytes ensured outside loop
m_buffer.push_back(b);
}
@@ -164,8 +164,8 @@
// Actual processing.
size_t i = start_pc;
- uint16_t length = uint16_t(read_int16(i+1));
- uint16_t count = uint16_t(read_int16(i+3));
+ boost::uint16_t length = boost::uint16_t(read_int16(i+1));
+ boost::uint16_t count = boost::uint16_t(read_int16(i+3));
i += 2;
//log_msg(_("Start at %d, stop at %d, length read was %d, count read was %d"),
start_pc, stop_pc, length, count);
@@ -355,8 +355,8 @@
}
else if (type == 7)
{
- // int32_t
- int32_t val = instruction_data[3 + i]
+ // boost::int32_t
+ boost::int32_t val = instruction_data[3 + i]
| (instruction_data[3 + i + 1] << 8)
| (instruction_data[3 + i + 2] << 16)
| (instruction_data[3 + i + 3] << 24);
@@ -425,7 +425,7 @@
<< " arg_count = " << arg_count
<< " reg_count = " << reg_count;
- uint16_t flags = (instruction_data[3 + i]) | (instruction_data[3
+ i + 1] << 8);
+ boost::uint16_t flags = (instruction_data[3 + i]) |
(instruction_data[3 + i + 1] << 8);
i += 2;
// @@ What is the difference between "super" and "_parent"?
@@ -502,10 +502,10 @@
// Hairy union for endian detection and munging
union {
float f;
- uint32_t i;
+ boost::uint32_t i;
struct { // for endian detection
- uint16_t s0;
- uint16_t s1;
+ boost::uint16_t s0;
+ boost::uint16_t s1;
} s;
struct { // for byte-swapping
uint8_t c0;
@@ -546,16 +546,16 @@
const uint8_t *cp = (const uint8_t *)p; // Handy uchar version
union {
double d;
- uint64_t i;
+ boost::uint64_t i;
struct {
- uint32_t l0;
- uint32_t l1;
+ boost::uint32_t l0;
+ boost::uint32_t l1;
} l;
struct {
- uint16_t s0;
- uint16_t s1;
- uint16_t s2;
- uint16_t s3;
+ boost::uint16_t s0;
+ boost::uint16_t s1;
+ boost::uint16_t s2;
+ boost::uint16_t s3;
} s;
struct {
uint8_t c0;
Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/parser/action_buffer.h 1 Dec 2007 00:15:00 -0000 1.21
+++ server/parser/action_buffer.h 4 Dec 2007 11:45:32 -0000 1.22
@@ -98,9 +98,9 @@
/// Get a variable length 32-bit integer from the stream.
/// Store its length in the passed uint8_t.
- uint32_t read_V32(size_t pc, uint8_t& length) const
+ boost::uint32_t read_V32(size_t pc, uint8_t& length) const
{
- uint32_t res = m_buffer[pc];
+ boost::uint32_t res = m_buffer[pc];
if (!(res & 0x00000080))
{
length = 1;
@@ -151,9 +151,9 @@
//
/// Useful to hide complexity of underlying buffer access.
///
- int16_t read_int16(size_t pc) const
+ boost::int16_t read_int16(size_t pc) const
{
- int16_t ret = m_buffer[pc] | (m_buffer[pc + 1] << 8);
+ boost::int16_t ret = m_buffer[pc] | (m_buffer[pc + 1] << 8);
return ret;
}
@@ -161,18 +161,18 @@
//
/// Useful to hide complexity of underlying buffer access.
///
- uint16_t read_uint16(size_t pc) const
+ boost::uint16_t read_uint16(size_t pc) const
{
- return static_cast<uint16_t>(read_int16(pc));
+ return static_cast<boost::uint16_t>(read_int16(pc));
}
/// Read a 32-bit integer starting at given offset.
//
/// Useful to hide complexity of underlying buffer access.
///
- int32_t read_int32(size_t pc) const
+ boost::int32_t read_int32(size_t pc) const
{
- int32_t val = m_buffer[pc]
+ boost::int32_t val = m_buffer[pc]
| (m_buffer[pc + 1] << 8)
| (m_buffer[pc + 2] << 16)
| (m_buffer[pc + 3] << 24);
Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/button_character_def.h 24 Nov 2007 17:21:44 -0000
1.19
+++ server/parser/button_character_def.h 4 Dec 2007 11:45:32 -0000
1.20
@@ -123,15 +123,15 @@
bool m_has_loops;
bool m_has_out_point;
bool m_has_in_point;
- uint32_t m_in_point;
- uint32_t m_out_point;
- uint16_t m_loop_count;
+ boost::uint32_t m_in_point;
+ boost::uint32_t m_out_point;
+ boost::uint16_t m_loop_count;
std::vector<media::sound_handler::sound_envelope> m_envelopes;
};
struct button_sound_info
{
- uint16_t m_sound_id;
+ boost::uint16_t m_sound_id;
sound_sample* m_sam;
sound_info m_sound_style;
Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/parser/edit_text_character_def.h 21 Aug 2007 14:42:12 -0000
1.20
+++ server/parser/edit_text_character_def.h 4 Dec 2007 11:45:32 -0000
1.21
@@ -148,23 +148,23 @@
}
/// Get right margin in twips
- uint16_t get_right_margin() const {
+ boost::uint16_t get_right_margin() const {
return m_right_margin;
}
/// Get left margin in twips
- uint16_t get_left_margin() const {
+ boost::uint16_t get_left_margin() const {
return m_left_margin;
}
/// Get indentation in twips
- uint16_t get_indent() const {
+ boost::uint16_t get_indent() const {
return m_indent;
}
/// Get height of font in twips.
// @@ what if has_font is false ??
- uint16_t get_font_height() const {
+ boost::uint16_t get_font_height() const {
return m_text_height;
}
@@ -172,7 +172,7 @@
//
/// Used by dynamically created textfields.
///
- void set_font_height(uint16_t h) {
+ void set_font_height(boost::uint16_t h) {
m_text_height = h;
}
@@ -197,7 +197,7 @@
/// Get extra space between lines (in twips).
//
/// This is in addition to default font line spacing.
- uint16_t get_leading() const {
+ boost::uint16_t get_leading() const {
return m_leading;
}
@@ -324,7 +324,7 @@
font* m_font;
/// height of font text, in twips
- uint16_t m_text_height;
+ boost::uint16_t m_text_height;
/// Text color
rgba m_color;
@@ -338,18 +338,18 @@
alignment m_alignment;
/// extra space between box's left border and text (in twips)
- uint16_t m_left_margin;
+ boost::uint16_t m_left_margin;
/// extra space between box's right border and text (in twips)
- uint16_t m_right_margin;
+ boost::uint16_t m_right_margin;
/// how much to indent the first line of multiline text (in twips)
- uint16_t m_indent;
+ boost::uint16_t m_indent;
/// \brief
/// Extra space between lines
/// (in addition to default font line spacing)
- uint16_t m_leading;
+ boost::uint16_t m_leading;
/// The default text to be displayed
std::string m_default_text;
Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/morph2_character_def.cpp 1 Dec 2007 15:40:59 -0000
1.19
+++ server/parser/morph2_character_def.cpp 4 Dec 2007 11:45:32 -0000
1.20
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: morph2_character_def.cpp,v 1.19 2007/12/01 15:40:59 strk Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.20 2007/12/04 11:45:32 strk Exp $ */
// Based on the public domain morph2.cpp of:
// Thatcher Ulrich <address@hidden>, Mike Shaver <address@hidden> 2003,
@@ -139,7 +139,7 @@
line_style& ls = m_line_styles[i];
const line_style& ls1 = m_shape1->get_line_styles()[i];
const line_style& ls2 = m_shape2->get_line_styles()[i];
- ls.m_width = (uint16_t)frnd(flerp(ls1.get_width(),
ls2.get_width(), ratio));
+ ls.m_width =
(boost::uint16_t)frnd(flerp(ls1.get_width(), ls2.get_width(), ratio));
ls.m_color.set_lerp(ls1.get_color(), ls2.get_color(),
ratio);
}
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/parser/movie_def_impl.cpp 3 Dec 2007 10:53:22 -0000 1.92
+++ server/parser/movie_def_impl.cpp 4 Dec 2007 11:45:32 -0000 1.93
@@ -421,8 +421,8 @@
if ( url == "" ) _url = "<anonymous>";
else _url = url;
- uint32_t file_start_pos = _in->get_position();
- uint32_t header = _in->read_le32();
+ boost::uint32_t file_start_pos = _in->get_position();
+ boost::uint32_t header = _in->read_le32();
m_file_length = _in->read_le32();
_swf_end_pos = file_start_pos + m_file_length;
@@ -721,7 +721,7 @@
try {
//size_t it=0;
- while ( (uint32_t) str.get_position() < _swf_end_pos )
+ while ( (boost::uint32_t) str.get_position() < _swf_end_pos )
{
if ( _loadingCanceled )
{
@@ -737,7 +737,7 @@
if (s_progress_function != NULL)
{
- s_progress_function((uint32_t)str.get_position(),
+ s_progress_function((boost::uint32_t)str.get_position(),
_swf_end_pos);
}
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/parser/movie_def_impl.h 3 Dec 2007 10:53:22 -0000 1.63
+++ server/parser/movie_def_impl.h 4 Dec 2007 11:45:32 -0000 1.64
@@ -286,7 +286,7 @@
int m_loading_sound_stream;
- uint32_t m_file_length;
+ boost::uint32_t m_file_length;
std::auto_ptr<jpeg::input> m_jpeg_in;
Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/parser/shape_character_def.cpp 1 Dec 2007 15:40:59 -0000
1.54
+++ server/parser/shape_character_def.cpp 4 Dec 2007 11:45:32 -0000
1.55
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: shape_character_def.cpp,v 1.54 2007/12/01 15:40:59 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.55 2007/12/04 11:45:32 strk Exp $ */
// Based on the public domain shape.cpp of Thatcher Ulrich <address@hidden>
2003
@@ -80,7 +80,7 @@
// Get the count.
in->ensureBytes(1);
- uint16_t fill_style_count = in->read_u8();
+ boost::uint16_t fill_style_count = in->read_u8();
if (tag_type > 2)
{
if (fill_style_count == 0xFF)
@@ -96,7 +96,7 @@
// Read the styles.
styles.reserve(styles.size()+fill_style_count);
- for (uint16_t i = 0; i < fill_style_count; ++i)
+ for (boost::uint16_t i = 0; i < fill_style_count; ++i)
{
// TODO: add a fill_style constructor directly
// reading from stream
Index: server/parser/sound_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/sound_definition.h 23 Nov 2007 23:47:36 -0000 1.9
+++ server/parser/sound_definition.h 4 Dec 2007 11:45:32 -0000 1.10
@@ -77,7 +77,7 @@
class start_stream_sound_tag : public ControlTag
{
public:
- uint16_t m_handler_id;
+ boost::uint16_t m_handler_id;
long m_start;
int latency;
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/parser/sprite_definition.cpp 23 Nov 2007 12:21:27 -0000 1.23
+++ server/parser/sprite_definition.cpp 4 Dec 2007 11:45:32 -0000 1.24
@@ -78,7 +78,7 @@
m_loading_frame = 0;
- while ((uint32_t) in->get_position() < (uint32_t) tag_end)
+ while ((boost::uint32_t) in->get_position() < (boost::uint32_t) tag_end)
{
SWF::tag_type tag_type = in->open_tag();
Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/parser/text_character_def.cpp 18 Aug 2007 13:24:14 -0000
1.7
+++ server/parser/text_character_def.cpp 4 Dec 2007 11:45:32 -0000
1.8
@@ -65,7 +65,7 @@
if (has_font)
{
- uint16_t font_id = in->read_u16();
+ boost::uint16_t font_id = in->read_u16();
if ( ! style.setFont(font_id, *m) )
{
// setFont would have already printed
an swferror on failure
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/video_stream_def.cpp 24 Nov 2007 17:21:45 -0000 1.26
+++ server/parser/video_stream_def.cpp 4 Dec 2007 11:45:33 -0000 1.27
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.cpp,v 1.26 2007/11/24 17:21:45 strk Exp $
+// $Id: video_stream_def.cpp,v 1.27 2007/12/04 11:45:33 strk Exp $
#include "video_stream_def.h"
#include "video_stream_instance.h"
@@ -31,7 +31,7 @@
namespace gnash {
-video_stream_definition::video_stream_definition(uint16_t char_id)
+video_stream_definition::video_stream_definition(boost::uint16_t char_id)
:
m_char_id(char_id),
m_last_decoded_frame(-1),
@@ -118,7 +118,7 @@
// 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));
- uint32_t tmp = br->read_uint(30);
+ boost::uint32_t tmp = br->read_uint(30);
tmp = br->read_uint(3);
if (tmp == 0) tmp = br->read_uint(32);
else if (tmp == 1) tmp = br->read_uint(16);
@@ -151,7 +151,7 @@
}
std::auto_ptr<image::image_base>
-video_stream_definition::get_frame_data(uint32_t frameNum)
+video_stream_definition::get_frame_data(boost::uint32_t frameNum)
{
// Check if the requested frame hold any video data.
@@ -163,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 != media::KEY_FRAME && it != m_video_frames.begin()) it--;
+ while (static_cast<boost::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);
@@ -185,7 +185,7 @@
}
void
-video_stream_definition::setFrameData(uint32_t frameNum,
boost::shared_array<uint8_t> data, uint32_t size, media::videoFrameType ft)
+video_stream_definition::setFrameData(boost::uint32_t frameNum,
boost::shared_array<uint8_t> data, boost::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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/video_stream_def.h 24 Nov 2007 17:21:45 -0000 1.18
+++ server/parser/video_stream_def.h 4 Dec 2007 11:45:33 -0000 1.19
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.h,v 1.18 2007/11/24 17:21:45 strk Exp $
+// $Id: video_stream_def.h,v 1.19 2007/12/04 11:45:33 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,
media::videoFrameType ft)
+ VideoData(boost::shared_array<uint8_t> data, boost::uint32_t size,
media::videoFrameType ft)
:
videoData(data),
dataSize(size),
@@ -59,7 +59,7 @@
}
boost::shared_array<uint8_t> videoData;
- uint32_t dataSize;
+ boost::uint32_t dataSize;
media::videoFrameType frameType;
};
@@ -73,7 +73,7 @@
/// you can use an id of -1. See character_def constructor, as
that's the
/// one which will eventually get passed the id.
///
- video_stream_definition(uint16_t char_id);
+ video_stream_definition(boost::uint16_t char_id);
~video_stream_definition();
@@ -112,7 +112,7 @@
///
/// @return pointer (possibly NULL) to an image. The ownership is with
the callee
///
- std::auto_ptr<image::image_base> get_frame_data(uint32_t frameNum);
+ std::auto_ptr<image::image_base> get_frame_data(boost::uint32_t
frameNum);
private:
@@ -121,7 +121,7 @@
/// The id is currently set to -1 when the definition is actually
/// created dynamically (instantiating the ActionScript Video class)
///
- uint16_t m_char_id;
+ boost::uint16_t m_char_id;
/// Reserved flags read from DEFINEVIDEOSTREAM tag
uint8_t m_reserved_flags;
@@ -133,12 +133,12 @@
bool m_smoothing_flags;
/// Frame in which the DEFINEVIDEOSTREAM was found
- uint16_t m_start_frame;
+ boost::uint16_t m_start_frame;
/// Number of frames in the embedded video, as reported
/// by the DEFINEVIDEOSTREAM tag
///
- uint16_t m_num_frames;
+ boost::uint16_t m_num_frames;
/// Codec ID as read from DEFINEVIDEOSTREAM tag
//
@@ -157,11 +157,11 @@
/// Elements of this map are owned by this instance, and will be
deleted
/// at instance destruction time.
///
- typedef std::map<uint32_t, boost::shared_ptr<VideoData> > EmbedFrameMap;
+ typedef std::map<boost::uint32_t, boost::shared_ptr<VideoData> >
EmbedFrameMap;
EmbedFrameMap m_video_frames;
/// Last decoded frame number
- int32_t m_last_decoded_frame;
+ boost::int32_t m_last_decoded_frame;
/// Set data for the given frame
//
@@ -177,13 +177,13 @@
/// @param img
/// Frame data. Ownership is transferred.
///
- void setFrameData(uint32_t frameNum, boost::shared_array<uint8_t> data,
uint32_t size, media::videoFrameType ft);
+ void setFrameData(boost::uint32_t frameNum,
boost::shared_array<uint8_t> data, boost::uint32_t size, media::videoFrameType
ft);
/// Width of the video
- uint32_t _width;
+ boost::uint32_t _width;
/// Height of the video
- uint32_t _height;
+ boost::uint32_t _height;
/// The decoder used to decode the video frames
boost::scoped_ptr<media::VideoDecoder> _decoder;
Index: server/swf/ControlTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ControlTag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/ControlTag.h 23 Nov 2007 12:21:27 -0000 1.1
+++ server/swf/ControlTag.h 4 Dec 2007 11:45:33 -0000 1.2
@@ -26,8 +26,6 @@
#include "config.h"
#endif
-#include "tu_types.h" // for uint32_t typedef
-
#include <cstdarg>
#include <cassert>
Index: server/swf/DisplayListTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DisplayListTag.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/swf/DisplayListTag.h 23 Nov 2007 12:21:27 -0000 1.6
+++ server/swf/DisplayListTag.h 4 Dec 2007 11:45:33 -0000 1.7
@@ -20,7 +20,7 @@
//
//
-/* $Id: DisplayListTag.h,v 1.6 2007/11/23 12:21:27 strk Exp $ */
+/* $Id: DisplayListTag.h,v 1.7 2007/12/04 11:45:33 strk Exp $ */
#ifndef GNASH_SWF_DISPLAYLISTTAG_H
#define GNASH_SWF_DISPLAYLISTTAG_H
@@ -31,9 +31,7 @@
#include "ControlTag.h" // for inheritance
#include "swf.h" // for tag_type definition
-//#include "tu_types.h" // for uint16_t, uint32_t etc. definition
-//#include <vector>
// Forward declarations
namespace gnash {
Index: server/swf/DoActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoActionTag.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/swf/DoActionTag.h 23 Nov 2007 12:21:27 -0000 1.8
+++ server/swf/DoActionTag.h 4 Dec 2007 11:45:33 -0000 1.9
@@ -30,7 +30,6 @@
#include "swf.h" // for tag_type definition
#include "action_buffer.h" // for composition
#include "sprite_instance.h" // for inlines
-//#include "tu_types.h" // for uint16_t, uint32_t etc. definition
// Forward declarations
namespace gnash {
Index: server/swf/DoInitActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoInitActionTag.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/DoInitActionTag.h 27 Nov 2007 09:36:31 -0000 1.3
+++ server/swf/DoInitActionTag.h 4 Dec 2007 11:45:33 -0000 1.4
@@ -30,7 +30,6 @@
#include "swf.h" // for tag_type definition
#include "action_buffer.h" // for composition
#include "sprite_instance.h" // for inlines
-//#include "tu_types.h" // for uint16_t, uint32_t etc. definition
// Forward declarations
namespace gnash {
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/swf/PlaceObject2Tag.cpp 23 Nov 2007 12:21:27 -0000 1.23
+++ server/swf/PlaceObject2Tag.cpp 4 Dec 2007 11:45:33 -0000 1.24
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: PlaceObject2Tag.cpp,v 1.23 2007/11/23 12:21:27 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.24 2007/12/04 11:45:33 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -67,7 +67,7 @@
PlaceObject2Tag::readPlaceActions(stream* in, int movie_version)
{
- uint16_t reserved = in->read_u16();
+ boost::uint16_t reserved = in->read_u16();
IF_VERBOSE_MALFORMED_SWF (
if ( reserved != 0 ) // must be 0
{
@@ -88,14 +88,14 @@
// Read event.
in->align();
- uint32_t flags = (movie_version >= 6) ? in->read_u32() :
in->read_u16();
+ boost::uint32_t flags = (movie_version >= 6) ? in->read_u32() :
in->read_u16();
if (flags == 0) // no other events
{
break;
}
- uint32_t event_length = in->read_u32();
+ boost::uint32_t event_length = in->read_u32();
if ( in->get_tag_end_position()-in->get_position() <
event_length )
{
IF_VERBOSE_MALFORMED_SWF(
Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/swf/PlaceObject2Tag.h 24 Aug 2007 05:55:52 -0000 1.13
+++ server/swf/PlaceObject2Tag.h 4 Dec 2007 11:45:33 -0000 1.14
@@ -19,7 +19,7 @@
//
//
-/* $Id: PlaceObject2Tag.h,v 1.13 2007/08/24 05:55:52 cmusick Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.14 2007/12/04 11:45:33 strk Exp $ */
#ifndef GNASH_SWF_PLACEOBJECT2TAG_H
#define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -32,9 +32,7 @@
#include "swf.h" // for tag_type definition
#include "matrix.h" // for composition
#include "cxform.h" // for composition
-#include "tu_types.h" // for uint16_t, uint32_t etc. definition
-//#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
// Forward declarations
@@ -114,9 +112,9 @@
matrix m_matrix;
bool m_has_matrix;
bool m_has_cxform;
- uint16_t m_character_id;
+ boost::uint16_t m_character_id;
int m_clip_depth;
- uint32_t all_event_flags;
+ boost::uint32_t all_event_flags;
enum place_type
{
Index: server/swf/StartSoundTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/swf/StartSoundTag.cpp 30 Nov 2007 11:31:03 -0000 1.5
+++ server/swf/StartSoundTag.cpp 4 Dec 2007 11:45:33 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: StartSoundTag.cpp,v 1.5 2007/11/30 11:31:03 strk Exp $ */
+/* $Id: StartSoundTag.cpp,v 1.6 2007/12/04 11:45:33 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -91,8 +91,8 @@
UNUSED(no_multiple);
UNUSED(has_envelope);
- uint32_t in_point = 0;
- uint32_t out_point = 0;
+ boost::uint32_t in_point = 0;
+ boost::uint32_t out_point = 0;
in.ensureBytes(has_in_point*4 + has_out_point*4 + has_loops*2);
Index: server/swf/StartSoundTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StartSoundTag.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/swf/StartSoundTag.h 24 Nov 2007 17:21:45 -0000 1.4
+++ server/swf/StartSoundTag.h 4 Dec 2007 11:45:33 -0000 1.5
@@ -31,7 +31,7 @@
#include "swf.h" // for tag_type definition
#include <vector> // for composition
-#include <boost/cstdint.hpp> // for uint16_t and friends
+#include <boost/cstdint.hpp> // for boost::uint16_t and friends
// Forward declarations
@@ -58,7 +58,7 @@
/// This one is the latter, probably so with the intention of avoiding
/// a lookup at every execution...
///
- uint16_t m_handler_id;
+ boost::uint16_t m_handler_id;
/// Number of loops started by an execution of this tag
//
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- server/swf/tag_loaders.cpp 3 Dec 2007 14:33:55 -0000 1.159
+++ server/swf/tag_loaders.cpp 4 Dec 2007 11:45:33 -0000 1.160
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.159 2007/12/03 14:33:55 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.160 2007/12/04 11:45:33 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -230,7 +230,7 @@
assert(tag == SWF::DEFINEBITS); // 6
assert(in);
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
//
// Read the image data.
@@ -284,7 +284,7 @@
{
assert(tag == SWF::DEFINEBITSJPEG2); // 21
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
IF_VERBOSE_PARSE
(
@@ -407,7 +407,7 @@
{
assert(tag == SWF::DEFINEBITSJPEG3); // 35
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
IF_VERBOSE_PARSE
(
@@ -415,8 +415,8 @@
character_id, in->get_position());
);
- uint32_t jpeg_size = in->read_u32();
- uint32_t alpha_position = in->get_position() + jpeg_size;
+ boost::uint32_t jpeg_size = in->read_u32();
+ boost::uint32_t alpha_position = in->get_position() + jpeg_size;
if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
{
@@ -472,10 +472,10 @@
in->ensureBytes(2+2+2+1); // the initial header
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
uint8_t bitmap_format = in->read_u8(); // 3 == 8 bit, 4 == 16 bit, 5
== 32 bit
- uint16_t width = in->read_u16();
- uint16_t height = in->read_u16();
+ boost::uint16_t width = in->read_u16();
+ boost::uint16_t height = in->read_u16();
IF_VERBOSE_PARSE
(
@@ -551,7 +551,7 @@
uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
+ boost::uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
// @@ How is the data packed??? I'm just guessing here
that it's 565!
image_out_row[i * 3 + 0] = (pixel >> 8) & 0xF8; // red
@@ -666,7 +666,7 @@
uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
+ boost::uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
// @@ How is the data packed??? I'm just guessing here
that it's 565!
image_out_row[i * 4 + 0] = 255; // alpha
@@ -739,7 +739,7 @@
|| tag == SWF::DEFINESHAPE3
|| tag == SWF::DEFINESHAPE4 || tag == SWF::DEFINESHAPE4_);
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
IF_VERBOSE_PARSE
(
log_parse(_(" shape_loader: id = %d"), character_id);
@@ -757,7 +757,7 @@
|| tag == SWF::DEFINEMORPHSHAPE2
|| tag == SWF::DEFINEMORPHSHAPE2_);
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
IF_VERBOSE_PARSE
(
@@ -781,7 +781,7 @@
|| tag == SWF::DEFINEFONT2
|| tag == SWF::DEFINEFONT3 ); // 10 || 48 || 75
- uint16_t font_id = in->read_u16();
+ boost::uint16_t font_id = in->read_u16();
font* f = new font;
f->read(in, tag, m);
@@ -800,7 +800,7 @@
{
assert(tag == SWF::DEFINEFONTINFO || tag == SWF::DEFINEFONTINFO2);
- uint16_t font_id = in->read_u16();
+ boost::uint16_t font_id = in->read_u16();
font* f = m->get_font(font_id);
if (f)
@@ -821,7 +821,7 @@
{
assert(tag == SWF::DEFINEFONTNAME);
- uint16_t font_id = in->read_u16();
+ boost::uint16_t font_id = in->read_u16();
font* f = m->get_font(font_id);
if (f)
@@ -928,7 +928,7 @@
// Read the exports.
for (int i = 0; i < count; i++)
{
- uint16_t id = in->read_u16();
+ boost::uint16_t id = in->read_u16();
char* symbol_name = in->read_string();
IF_VERBOSE_PARSE (
@@ -1024,7 +1024,7 @@
// Get the imports.
for (int i = 0; i < count; i++)
{
- uint16_t id = in->read_u16();
+ boost::uint16_t id = in->read_u16();
char* symbol_name = in->read_string();
IF_VERBOSE_PARSE
(
@@ -1075,7 +1075,7 @@
{
assert(tag == SWF::DEFINEEDITTEXT); // 37
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
edit_text_character_def* ch = new edit_text_character_def(m);
IF_VERBOSE_PARSE
@@ -1093,7 +1093,7 @@
{
assert(tag == SWF::DEFINETEXT || tag == SWF::DEFINETEXT2);
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
text_character_def* ch = new text_character_def(m);
IF_VERBOSE_PARSE
@@ -1132,7 +1132,7 @@
in->ensureBytes(2+4+1+4); // character id + flags + sample count
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
media::audioCodecType format =
static_cast<media::audioCodecType>(in->read_uint(4));
int sample_rate = in->read_uint(2); // multiples of 5512.5
@@ -1143,7 +1143,7 @@
if (format == media::AUDIO_CODEC_MP3) {
in->ensureBytes(2);
- int16_t delay_seek = in->read_s16(); // FIXME - not
implemented/used
+ boost::int16_t delay_seek = in->read_s16(); // FIXME - not
implemented/used
// The DelaySeek field has the following meaning:
// * If this value is positive, the player seeks this number of
// samples into the sound block before the sound is played.
@@ -1350,7 +1350,7 @@
define_video_loader(stream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEVIDEOSTREAM); // 60
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
std::auto_ptr<video_stream_definition> chdef ( new
video_stream_definition(character_id) );
chdef->readDefineVideoStream(in, tag, m);
@@ -1364,7 +1364,7 @@
{
assert(tag == SWF::VIDEOFRAME); // 61
- uint16_t character_id = in->read_u16();
+ boost::uint16_t character_id = in->read_u16();
character_def* chdef = m->get_character_def(character_id);
if ( ! chdef )
@@ -1465,14 +1465,14 @@
int major = in->read_u8();
int minor = in->read_u8();
- uint32_t buildL = in->read_u32();
- uint32_t buildH = in->read_u32();
- uint64_t build = (((uint64_t)buildH) << 32) + buildL;
+ boost::uint32_t buildL = in->read_u32();
+ boost::uint32_t buildH = in->read_u32();
+ boost::uint64_t build = (((boost::uint64_t)buildH) << 32) + buildL;
- uint32_t timestampL = in->read_u32();
- uint32_t timestampH = in->read_u32();
+ boost::uint32_t timestampL = in->read_u32();
+ boost::uint32_t timestampH = in->read_u32();
// This timestamp is number of milliseconds since 1 Jan 1970 (epoch)
- uint64_t timestamp = (((uint64_t)timestampH) << 32) + timestampL;
+ boost::uint64_t timestamp = (((boost::uint64_t)timestampH) << 32) +
timestampL;
std::stringstream ss;
ss << "SERIALNUMBER: Version " << id << "." << edition << "." << major <<
"." << minor;
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- server/vm/ASHandlers.cpp 4 Dec 2007 07:33:56 -0000 1.166
+++ server/vm/ASHandlers.cpp 4 Dec 2007 11:45:33 -0000 1.167
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.166 2007/12/04 07:33:56 zoulunkai Exp $ */
+/* $Id: ASHandlers.cpp,v 1.167 2007/12/04 11:45:33 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1826,7 +1826,7 @@
"register", // 4
"bool", // 5
"double", // 6
- "int32_t", // 7
+ "boost::int32_t", // 7
"dict8", // 8
"dict16" // 9
};
@@ -1835,7 +1835,7 @@
const action_buffer& code = thread.code;
size_t pc = thread.pc;
- int16_t length = code.read_int16(pc+1);
+ boost::int16_t length = code.read_int16(pc+1);
assert( length >= 0 );
#if 0 // is this really useful ?
@@ -1949,7 +1949,7 @@
case pushInt32: // 7
{
- int32_t val = code.read_int32(i+3);
+ boost::int32_t val = code.read_int32(i+3);
i += 4;
env.push(val);
break;
@@ -2013,7 +2013,7 @@
{
// GNASH_REPORT_FUNCTION;
- int16_t offset = thread.code.read_int16(thread.pc+3);
+ boost::int16_t offset = thread.code.read_int16(thread.pc+3);
thread.next_pc += offset;
// @@ TODO range checks
}
@@ -2317,7 +2317,7 @@
thread.ensureStack(1); // bool
- int16_t offset = code.read_int16(pc+3);
+ boost::int16_t offset = code.read_int16(pc+3);
bool test = env.pop().to_bool();
if (test)
@@ -3497,8 +3497,8 @@
as_environment& env = thread.env;
thread.ensureStack(2);
- int16_t operand1 = env.top(1).to_int();
- int16_t operand2 = env.top(0).to_int();
+ boost::int16_t operand1 = env.top(1).to_int();
+ boost::int16_t operand2 = env.top(0).to_int();
env.top(1) = operand1 << operand2;
env.drop(1);
@@ -3511,10 +3511,10 @@
as_environment& env = thread.env;
thread.ensureStack(2);
- int32_t operand1 = env.top(1).to_int();
- int32_t operand2 = env.top(0).to_int();
+ boost::int32_t operand1 = env.top(1).to_int();
+ boost::int32_t operand2 = env.top(0).to_int();
- int32_t res = operand1 >> operand2;
+ boost::int32_t res = operand1 >> operand2;
//log_debug("%d >> %d == %d", operand1, operand2, res);
@@ -3531,10 +3531,10 @@
as_environment& env = thread.env;
thread.ensureStack(2);
- uint32_t operand1 = env.top(1).to_int();
- int32_t operand2 = env.top(0).to_int(); // TODO: check this !
+ boost::uint32_t operand1 = env.top(1).to_int();
+ boost::int32_t operand2 = env.top(0).to_int(); // TODO: check this !
- env.top(1) = uint32_t( operand1 >> operand2 );
+ env.top(1) = boost::uint32_t( operand1 >> operand2 );
env.drop(1);
}
@@ -3675,7 +3675,7 @@
func->set_local_register_count(register_count);
// Flags, for controlling register assignment of implicit args.
- uint16_t flags = code.read_int16(i);
+ boost::uint16_t flags = code.read_int16(i);
i += 2;
func->set_function2_flags(flags);
@@ -3696,7 +3696,7 @@
}
// Get the length of the actual function code.
- uint16_t code_size = code.read_int16(i);
+ boost::uint16_t code_size = code.read_int16(i);
// Check code_size value consistency
size_t actionbuf_size = thread.code.size();
@@ -3771,9 +3771,9 @@
bool catchInRegister = flags&(1<<2);
uint8_t reserved = flags&0xE0;
- uint16_t trySize = code.read_uint16(i); i += 2;
- uint16_t catchSize = code.read_uint16(i); i += 2;
- uint16_t finallySize = code.read_uint16(i); i += 2;
+ boost::uint16_t trySize = code.read_uint16(i); i += 2;
+ boost::uint16_t catchSize = code.read_uint16(i); i += 2;
+ boost::uint16_t finallySize = code.read_uint16(i); i += 2;
const char* catchName = NULL;
uint8_t catchRegister = 0;
@@ -3880,7 +3880,7 @@
const action_buffer& code = thread.code;
#ifndef NDEBUG
- int16_t length = code.read_int16(thread.pc+1);
+ boost::int16_t length = code.read_int16(thread.pc+1);
assert( length >= 0 );
//cerr << " length:" << length << endl;
#endif
@@ -3920,7 +3920,7 @@
}
// Get the length of the actual function code.
- int16_t code_size = code.read_int16(i);
+ boost::int16_t code_size = code.read_int16(i);
//cerr << " code size:" << code_size << endl;
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/vm/ActionExec.cpp 21 Nov 2007 09:21:49 -0000 1.59
+++ server/vm/ActionExec.cpp 4 Dec 2007 11:45:34 -0000 1.60
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.59 2007/11/21 09:21:49 cmusick Exp $ */
+/* $Id: ActionExec.cpp,v 1.60 2007/12/04 11:45:34 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -181,7 +181,7 @@
// TODO: specify in the .gnashrc !!
static const size_t maxBranchCount = 65536; // what's enough ?
- uint32_t timeLimit = getScriptTimeout();
+ boost::uint32_t timeLimit = getScriptTimeout();
WallClockTimer timer;
size_t branchCount = 0;
@@ -315,7 +315,7 @@
next_pc = pc+1;
} else {
// action with extra data
- uint16_t length = uint16_t(code.read_int16(pc+1));
+ boost::uint16_t length = boost::uint16_t(code.read_int16(pc+1));
next_pc = pc + length + 3;
if ( next_pc > stop_pc )
{
@@ -504,7 +504,7 @@
next_pc++;
} else {
// action with extra data
- int16_t length = code.read_int16(next_pc+1);
+ boost::int16_t length = code.read_int16(next_pc+1);
assert( length >= 0 );
next_pc += length + 3;
}
@@ -722,7 +722,7 @@
lpc++;
} else {
// action with extra data
- int16_t length = code.read_int16(lpc+1);
+ boost::int16_t length = code.read_int16(lpc+1);
assert( length >= 0 );
lpc += length + 3;
}
@@ -736,7 +736,7 @@
return _function_var ? _this_ptr.get() : env.get_original_target();
}
-uint32_t
+boost::uint32_t
ActionExec::getScriptTimeout()
{
// TODO1: allow specifying this in the .gnashrc file
Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/vm/ActionExec.h 23 Nov 2007 07:26:29 -0000 1.26
+++ server/vm/ActionExec.h 4 Dec 2007 11:45:34 -0000 1.27
@@ -81,7 +81,7 @@
uint8_t mReg;
tryState mState;
as_value mThrownFromCatch;
- uint32_t mStackDepth;
+ boost::uint32_t mStackDepth;
};
/// Executor of an action_buffer
@@ -205,7 +205,7 @@
/// Return the number of milliseconds after which
/// execution of a script block should abort.
- uint32_t getScriptTimeout();
+ boost::uint32_t getScriptTimeout();
public:
Index: server/vm/CodeStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/CodeStream.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/vm/CodeStream.h 29 Oct 2007 21:07:34 -0000 1.3
+++ server/vm/CodeStream.h 4 Dec 2007 11:45:34 -0000 1.4
@@ -19,7 +19,6 @@
#ifndef GNASH_CODESTREAM_H
#define GNASH_CODESTREAM_H
-#include "tu_types.h"
#include <boost/utility.hpp>
namespace gnash {
@@ -105,14 +104,14 @@
}
/// Read a variable length encoded 32 bit unsigned integer
- uint32_t read_V32()
+ boost::uint32_t read_V32()
{
if (mCurrent == mEnd) throw CodeStreamException();
// We can do an unchecked read in these cases.
if (mEnd - mCurrent > 4 || !(*(mEnd - 1) & 0x80))
{
- uint32_t result = *mCurrent++;
+ boost::uint32_t result = *mCurrent++;
if (!(result & 0x00000080)) return result;
result = (result & 0x0000007F) | *mCurrent++ << 7;
if (!(result & 0x00004000)) return result;
@@ -122,7 +121,7 @@
if (!(result & 0x10000000)) return result;
return (result & 0x0FFFFFFF) | *mCurrent++ << 28;
}
- uint32_t result = *mCurrent++;
+ boost::uint32_t result = *mCurrent++;
if (!(result & 0x00000080)) return result;
if (mCurrent == mEnd) throw CodeStreamException();
result = (result & 0x0000007F) | *mCurrent++ << 7;
@@ -168,14 +167,14 @@
}
/// Read a signed integer encoded in 24 bits.
- int32_t read_S24()
+ boost::int32_t read_S24()
{
if (mEnd - mCurrent < 3)
throw CodeStreamException();
int result = *mCurrent++ + (*mCurrent++ << 8) + (*mCurrent ++
<< 16);
if (result & (1 << 23)) // Negative result, adjust
appropriately.
result = -(result & ~(1 << 23));
- return static_cast<int32_t>(result);
+ return static_cast<boost::int32_t>(result);
}
/// Read a signed 8-bit character.
Index: server/vm/Machine.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Machine.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/vm/Machine.cpp 2 Dec 2007 05:58:42 -0000 1.4
+++ server/vm/Machine.cpp 4 Dec 2007 11:45:34 -0000 1.5
@@ -52,49 +52,49 @@
};
// Functions for getting pool constants.
-static inline std::string& pool_string(uint32_t index, abc_block *pool)
+static inline std::string& pool_string(boost::uint32_t index, abc_block *pool)
{
if (!pool)
throw ASException();
return pool->mStringPool.at(index);
}
-static inline int pool_int(uint32_t index, abc_block *pool)
+static inline int pool_int(boost::uint32_t index, abc_block *pool)
{
if (!pool)
throw ASException();
return pool->mIntegerPool.at(index);
}
-static inline unsigned int pool_uint(uint32_t index, abc_block *pool)
+static inline unsigned int pool_uint(boost::uint32_t index, abc_block *pool)
{
if (!pool)
throw ASException();
return pool->mUIntegerPool.at(index);
}
-static inline double pool_double(uint32_t index, abc_block *pool)
+static inline double pool_double(boost::uint32_t index, abc_block *pool)
{
if (!pool)
throw ASException();
return pool->mDoublePool.at(index);
}
-static inline asNamespace* pool_namespace(uint32_t index, abc_block *pool)
+static inline asNamespace* pool_namespace(boost::uint32_t index, abc_block
*pool)
{
if (!pool)
throw ASException();
return pool->mNamespacePool.at(index);
}
-static inline asMethod* pool_method(uint32_t index, abc_block* pool)
+static inline asMethod* pool_method(boost::uint32_t index, abc_block* pool)
{
if (!pool)
throw ASException();
return pool->mMethods.at(index);
}
-static inline asClass* pool_class(uint32_t index, abc_block* pool)
+static inline asClass* pool_class(boost::uint32_t index, abc_block* pool)
{
if (!pool)
throw ASException();
@@ -102,7 +102,7 @@
}
// Don't make this a reference or you'll taint the pool.
-static inline asName pool_name(uint32_t index, abc_block* pool)
+static inline asName pool_name(boost::uint32_t index, abc_block* pool)
{
if (!pool)
throw ASException();
@@ -248,7 +248,7 @@
#define JUMPIF(jtruth)
\
{
\
- int32_t jumpOffset = mStream->read_S24();
\
+ boost::int32_t jumpOffset = mStream->read_S24();
\
if (jtruth)
\
mStream->seekBy(jumpOffset);
\
break;
\
@@ -360,7 +360,7 @@
/// default XML namespace.
case SWF::ABC_ACTION_DXNS:
{
- uint32_t soffset = mStream->read_V32();
+ boost::uint32_t soffset = mStream->read_V32();
std::string& uri = pool_string(soffset, mPoolObject);
mDefaultXMLNamespace = mCH->anonNamespace(mST.find(uri));
break;
@@ -386,7 +386,7 @@
/// Equivalent: ACTION_DELETE
case SWF::ABC_ACTION_KILL:
{
- uint32_t regNum = mStream->read_V32();
+ boost::uint32_t regNum = mStream->read_V32();
mFrame.value(regNum).set_undefined();
break;
}
@@ -642,11 +642,11 @@
if (!mStack.top(0).is_number())
throw ASException();
- uint32_t index = mStack.top(0).to_number<uint32_t>();
+ boost::uint32_t index =
mStack.top(0).to_number<boost::uint32_t>();
mStack.drop(1);
mStream->seekBy(3); // Skip the intial offset.
- uint32_t cases = mStream->read_V32();
+ boost::uint32_t cases = mStream->read_V32();
// Read from our original position and use it to skip if the
case
// is out of range.
if (index > cases)
@@ -657,7 +657,7 @@
else
{
mStream->seekTo(npos + 3 * (index + 1));
- uint32_t newpos = mStream->read_S24();
+ boost::uint32_t newpos = mStream->read_S24();
mStream->seekTo(npos - 1 + newpos);
}
break;
@@ -718,7 +718,7 @@
ENSURE_NUMBER(mStack.top(0));
ENSURE_OBJECT(mStack.top(1));
as_object *obj = mStack.top(1).to_object().get();
- uint32_t index = mStack.top(0).to_number<uint32_t>();
+ boost::uint32_t index =
mStack.top(0).to_number<boost::uint32_t>();
mStack.drop(1);
Property *b = obj->getByIndex(index);
if (b)
@@ -741,7 +741,7 @@
ENSURE_NUMBER(mStack.top(0));
ENSURE_OBJECT(mStack.top(1));
as_object *obj = mStack.top(1).to_object().get();
- uint32_t index = mStack.top(0).to_number<uint32_t>();
+ boost::uint32_t index =
mStack.top(0).to_number<boost::uint32_t>();
mStack.drop(1);
mStack.top(0) = obj->nextIndex(index);
break;
@@ -775,7 +775,7 @@
ENSURE_NUMBER(mStack.top(0));
ENSURE_OBJECT(mStack.top(1));
as_object *obj = mStack.top(1).to_object().get();
- uint32_t index = mStack.top(0).to_number<uint32_t>();
+ boost::uint32_t index =
mStack.top(0).to_number<boost::uint32_t>();
const Property *b = obj->getByIndex(index);
mStack.drop(1);
if (!b)
@@ -935,14 +935,14 @@
/// property.
case SWF::ABC_ACTION_HASNEXT2:
{
- int32_t oindex = mStream->read_V32();
- int32_t iindex = mStream->read_V32();
+ boost::int32_t oindex = mStream->read_V32();
+ boost::int32_t iindex = mStream->read_V32();
as_value &objv = mFrame.value(oindex);
as_value &indexv = mFrame.value(iindex);
ENSURE_OBJECT(objv);
ENSURE_NUMBER(indexv);
as_object *obj = objv.to_object().get();
- uint32_t index = indexv.to_number<uint32_t>();
+ boost::uint32_t index = indexv.to_number<boost::uint32_t>();
as_object *owner = NULL;
int next = obj->nextIndex(index, &owner);
mStack.grow(1);
@@ -986,7 +986,7 @@
/// value -- the value returned by obj->func(arg1, ...., argN)
case SWF::ABC_ACTION_CALL:
{
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
ENSURE_OBJECT(mStack.top(argc + 1)); // The func
ENSURE_OBJECT(mStack.top(argc)); // The 'this'
as_function *f = mStack.top(argc + 1).to_as_function();
@@ -1011,7 +1011,7 @@
/// value -- obj after it has been constructed as obj(arg1, ..., argN)
case SWF::ABC_ACTION_CONSTRUCT:
{
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
as_function *f = mStack.top(argc).to_as_function();
Property b(0, 0, f, NULL);
pushCall(f, NULL, mStack.top(argc), argc, 0);
@@ -1026,8 +1026,8 @@
/// value -- the value returned by obj::'method_id'(arg1, ..., argN)
case SWF::ABC_ACTION_CALLMETHOD:
{
- uint32_t dispatch_id = mStream->read_V32() - 1;
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t dispatch_id = mStream->read_V32() - 1;
+ boost::uint32_t argc = mStream->read_V32();
ENSURE_OBJECT(mStack.top(argc));
as_object *obj = mStack.top(argc).to_object().get();
Property *f = obj->getByIndex(dispatch_id);
@@ -1057,7 +1057,7 @@
case SWF::ABC_ACTION_CALLSTATIC:
{
asMethod *m = pool_method(mStream->read_V32(), mPoolObject);
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
as_function *func = m->getPrototype();
ENSURE_OBJECT(mStack.top(argc));
as_object *obj = mStack.top(argc).to_object().get();
@@ -1079,7 +1079,7 @@
case SWF::ABC_ACTION_CALLSUPERVOID:
{
asName a = pool_name(mStream->read_V32(), mPoolObject);
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
int dropsize = completeName(a);
ENSURE_OBJECT(mStack.top(argc + dropsize));
mStack.drop(dropsize);
@@ -1118,7 +1118,7 @@
{
bool lex_only = (opcode == SWF::ABC_ACTION_CALLPROPLEX);
asName a = pool_name(mStream->read_V32(), mPoolObject);
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
int shift = completeName(a, argc);
ENSURE_OBJECT(mStack.top(shift + argc));
as_object *obj = mStack.top(argc + shift).to_object().get();
@@ -1184,7 +1184,7 @@
case SWF::ABC_ACTION_CONSTRUCTSUPER:
{
// TODO
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
ENSURE_OBJECT(mStack.top(argc));
as_object *obj = mStack.top(argc).to_object().get();
as_object *super = mStack.top(argc).to_object()->get_super();
@@ -1213,13 +1213,13 @@
{
// TODO
asName a = pool_name(mStream->read_V32(), mPoolObject);
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
int shift = completeName(a, argc);
ENSURE_OBJECT(mStack.top(argc + shift));
// We have to move the stack if there was a shift.
if (shift)
{
- uint32_t i = argc;
+ boost::uint32_t i = argc;
while (i--)
mStack.top(i + shift) = mStack.top(i);
mStack.drop(shift);
@@ -1243,7 +1243,7 @@
case SWF::ABC_ACTION_NEWOBJECT:
{
as_object *obj = new as_object;
- uint32_t argc = mStream->read_V32();
+ boost::uint32_t argc = mStream->read_V32();
int i = argc;
while (i--)
{
@@ -1266,10 +1266,10 @@
/// array -- an array { value_1, value_2, ..., value_n }
case SWF::ABC_ACTION_NEWARRAY:
{
- uint32_t asize = mStream->read_V32();
+ boost::uint32_t asize = mStream->read_V32();
as_array_object *arr = new as_array_object;
arr->resize(asize);
- uint32_t i = asize;
+ boost::uint32_t i = asize;
while (i--)
arr->set_indexed(i, mStack.value(i));
mStack.drop(asize - 1);
@@ -1294,7 +1294,7 @@
/// NB: This depends on scope and scope base (to determine lifetime(?))
case SWF::ABC_ACTION_NEWCLASS:
{
- uint32_t cid = mStream->read_V32();
+ boost::uint32_t cid = mStream->read_V32();
asClass *c = pool_class(cid, mPoolObject);
ENSURE_OBJECT(mStack.top(0));
as_object *obj = mStack.top(0).to_object().get();
@@ -1550,7 +1550,7 @@
/// slot -- obj.slots[slot_index]
case SWF::ABC_ACTION_GETSLOT:
{
- uint32_t sindex = mStream->read_V32();
+ boost::uint32_t sindex = mStream->read_V32();
if (!sindex)
throw ASException();
--sindex;
@@ -1567,7 +1567,7 @@
/// Do: obj.slots[slot_index] = value
case SWF::ABC_ACTION_SETSLOT:
{
- uint32_t sindex = mStream->read_V32();
+ boost::uint32_t sindex = mStream->read_V32();
if (!sindex)
throw ASException();
--sindex;
@@ -1584,7 +1584,7 @@
/// NB: Deprecated
case SWF::ABC_ACTION_GETGLOBALSLOT:
{
- uint32_t sindex = mStream->read_V32();
+ boost::uint32_t sindex = mStream->read_V32();
if (!sindex)
throw ASException();
--sindex;
@@ -1602,7 +1602,7 @@
/// NB: Deprecated
case SWF::ABC_ACTION_SETGLOBALSLOT:
{
- uint32_t sindex = mStream->read_V32();
+ boost::uint32_t sindex = mStream->read_V32();
if (!sindex)
throw ASException();
--sindex;
@@ -1818,7 +1818,7 @@
/// Frame: Load i from frame_addr and increment it.
case SWF::ABC_ACTION_INCLOCAL:
{
- uint32_t foff = mStream->read_V32();
+ boost::uint32_t foff = mStream->read_V32();
mFrame.value(foff) = mFrame.value(foff).to_number() + 1;
break;
}
@@ -1837,7 +1837,7 @@
/// Frame: Load i from frame_addr and decrement it.
case SWF::ABC_ACTION_DECLOCAL:
{
- uint32_t foff = mStream->read_V32();
+ boost::uint32_t foff = mStream->read_V32();
mFrame.value(foff) = mFrame.value(foff).to_number() - 1;
break;
}
@@ -2166,7 +2166,7 @@
/// See: 0x92 (ABC_ACTION_INCLOCAL), but forces types to int, not double
case SWF::ABC_ACTION_INCLOCAL_I:
{
- uint32_t foff = mStream->read_V32();
+ boost::uint32_t foff = mStream->read_V32();
mFrame.value(foff) = mFrame.value(foff).to_number<int>() + 1;
break;
}
@@ -2174,7 +2174,7 @@
/// See: 0x94 (ABC_ACTION_DECLOCAL), but forces types to int, not double
case SWF::ABC_ACTION_DECLOCAL_I:
{
- uint32_t foff = mStream->read_V32();
+ boost::uint32_t foff = mStream->read_V32();
mFrame.value(foff) = mFrame.value(foff).to_number<int>() - 1;
break;
}
Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/vm/VM.cpp 28 Nov 2007 21:18:43 -0000 1.24
+++ server/vm/VM.cpp 4 Dec 2007 11:45:34 -0000 1.25
@@ -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: VM.cpp,v 1.24 2007/11/28 21:18:43 strk Exp $ */
+/* $Id: VM.cpp,v 1.25 2007/12/04 11:45:34 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -138,7 +138,7 @@
_global = o;
}
-uint64_t
+boost::uint64_t
VM::getTime()
{
return (tu_timer::get_ticks() - _start_time);
Index: server/vm/VM.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/vm/VM.h 24 Oct 2007 21:32:00 -0000 1.19
+++ server/vm/VM.h 4 Dec 2007 11:45:34 -0000 1.20
@@ -25,12 +25,12 @@
#include "smart_ptr.h" // for boost::intrusive_ptr
#include "movie_root.h" // for composition
-#include "tu_types.h" // for uint64_t
#include "GC.h" // for ineritance of VmGcRoot
#include "string_table.h" // for the string table
#include <memory> // for auto_ptr
#include <locale>
+#include <boost/cstdint.hpp> // for boost::?int??_t
// Forward declarations
namespace gnash {
@@ -122,7 +122,7 @@
int _swfversion;
/// Time when the VM get started
- uint64_t _start_time;
+ boost::uint64_t _start_time;
/// Set the _global Object for actions run by Virtual Machine
//
@@ -187,7 +187,7 @@
int getSWFVersion() const;
/// Get the number of milliseconds since VM was started
- uint64_t getTime();
+ boost::uint64_t getTime();
/// Get a reference to the string table used by the VM.
string_table& getStringTable() const { return mStringTable; }
Index: testsuite/libbase/IntTypesTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/IntTypesTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libbase/IntTypesTest.cpp 4 Dec 2007 08:42:54 -0000 1.2
+++ testsuite/libbase/IntTypesTest.cpp 4 Dec 2007 11:45:34 -0000 1.3
@@ -34,13 +34,13 @@
// Check typedef sizes.
check_equals (sizeof(boost::uint8_t), 1);
- check_equals (sizeof(boost::uint16_t), 2);
- check_equals (sizeof(boost::uint32_t), 4);
- check_equals (sizeof(boost::uint64_t), 8);
+ check_equals (sizeof(boost::boost::uint16_t), 2);
+ check_equals (sizeof(boost::boost::uint32_t), 4);
+ check_equals (sizeof(boost::boost::uint64_t), 8);
check_equals (sizeof(boost::int8_t), 1);
- check_equals (sizeof(boost::int16_t), 2);
- check_equals (sizeof(boost::int32_t), 4);
- check_equals (sizeof(boost::int64_t), 8);
+ check_equals (sizeof(boost::boost::int16_t), 2);
+ check_equals (sizeof(boost::boost::int32_t), 4);
+ check_equals (sizeof(boost::boost::int64_t), 8);
}
Index: testsuite/server/BitsReaderTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/BitsReaderTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/server/BitsReaderTest.cpp 28 Aug 2007 08:45:11 -0000 1.1
+++ testsuite/server/BitsReaderTest.cpp 4 Dec 2007 11:45:35 -0000 1.2
@@ -244,10 +244,10 @@
/// bits: 10011001 10011001 (0x999999)
- int16_t s16 = s.read_s16(); check_equals(s16, (int16_t)0x9999);
- uint16_t u16 = s.read_u16(); check_equals(u16, (uint16_t)0x9999);
- int32_t s32 = s.read_s32(); check_equals(s32, (int32_t)0x99999999);
- uint32_t u32 = s.read_u32(); check_equals(u32, (uint32_t)0x99999999);
+ boost::int16_t s16 = s.read_s16(); check_equals(s16,
(boost::int16_t)0x9999);
+ boost::uint16_t u16 = s.read_u16(); check_equals(u16,
(boost::uint16_t)0x9999);
+ boost::int32_t s32 = s.read_s32(); check_equals(s32,
(boost::int32_t)0x99999999);
+ boost::uint32_t u32 = s.read_u32(); check_equals(u32,
(boost::uint32_t)0x99999999);
/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
/// -
Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/server/StreamTest.cpp 27 Aug 2007 15:18:28 -0000 1.4
+++ testsuite/server/StreamTest.cpp 4 Dec 2007 11:45:35 -0000 1.5
@@ -252,10 +252,10 @@
/// bits: 10011001 10011001 (0x999999)
- int16_t s16 = s.read_s16(); check_equals(s16, (int16_t)0x9999);
- uint16_t u16 = s.read_u16(); check_equals(u16, (uint16_t)0x9999);
- int32_t s32 = s.read_s32(); check_equals(s32, (int32_t)0x99999999);
- uint32_t u32 = s.read_u32(); check_equals(u32, (uint32_t)0x99999999);
+ boost::int16_t s16 = s.read_s16(); check_equals(s16,
(boost::int16_t)0x9999);
+ boost::uint16_t u16 = s.read_u16(); check_equals(u16,
(boost::uint16_t)0x9999);
+ boost::int32_t s32 = s.read_s32(); check_equals(s32,
(boost::int32_t)0x99999999);
+ boost::uint32_t u32 = s.read_u32(); check_equals(u32,
(boost::uint32_t)0x99999999);
/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
/// -
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- utilities/parser.cpp 1 Dec 2007 23:42:39 -0000 1.45
+++ utilities/parser.cpp 4 Dec 2007 11:45:35 -0000 1.46
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: parser.cpp,v 1.45 2007/12/01 23:42:39 strk Exp $ */
+/* $Id: parser.cpp,v 1.46 2007/12/04 11:45:35 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -150,7 +150,7 @@
struct rect
{
- static uint32_t x_min,x_max,y_min,y_max;
+ static boost::uint32_t x_min,x_max,y_min,y_max;
static void parse(stream* in)
{
in->align();
@@ -168,10 +168,10 @@
ident--;
}
};
-uint32_t rect::x_min;
-uint32_t rect::y_min;
-uint32_t rect::x_max;
-uint32_t rect::y_max;
+boost::uint32_t rect::x_min;
+boost::uint32_t rect::y_min;
+boost::uint32_t rect::x_max;
+boost::uint32_t rect::y_max;
struct rgb
{
@@ -476,11 +476,11 @@
log_msg("define a new sprite:");
ident++;
int tag_end = input->get_tag_end_position();
- uint32_t char_id = input->read_u16();
- uint32_t sprite_frame_count = input->read_u16();
+ boost::uint32_t char_id = input->read_u16();
+ boost::uint32_t sprite_frame_count = input->read_u16();
log_msg("character ID: %i", char_id);
log_msg("frame count of sprite: %i", sprite_frame_count);
- uint32_t old_current_frame = current_frame;
+ boost::uint32_t old_current_frame = current_frame;
current_frame = 0;
ident++;
@@ -488,7 +488,7 @@
log_msg("starting frame 0\n");
ident++;
- while ((uint32_t) input->get_position() < (uint32_t) tag_end) {
+ while ((boost::uint32_t) input->get_position() < (boost::uint32_t)
tag_end) {
int tag_type = input->open_tag();
loader_function lf = NULL;
@@ -546,10 +546,10 @@
{
ident = 1;
- uint32_t header = file->read_le32();
- uint32_t file_length = file->read_le32();
+ boost::uint32_t header = file->read_le32();
+ boost::uint32_t file_length = file->read_le32();
- uint32_t version = (header >> 24) & 255;
+ boost::uint32_t version = (header >> 24) & 255;
if ((header & 0x0FFFFFF) != 0x00535746 && (header & 0x0FFFFFF) !=
0x00535743) {
log_error("No valid SWF file, header is incorrect");
return;
@@ -579,7 +579,7 @@
log_msg("starting frame 0\n");
ident++;
- while ((uint32_t) str.get_position() < file_length) {
+ while ((boost::uint32_t) str.get_position() < file_length) {
int tag_type = str.open_tag();
loader_function lf = NULL;
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- utilities/processor.cpp 1 Dec 2007 19:55:20 -0000 1.72
+++ utilities/processor.cpp 4 Dec 2007 11:45:35 -0000 1.73
@@ -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: processor.cpp,v 1.72 2007/12/01 19:55:20 strk Exp $ */
+/* $Id: processor.cpp,v 1.73 2007/12/04 11:45:35 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -136,8 +136,6 @@
int
main(int argc, char *argv[])
{
- assert(tu_types_validate());
-
/// Initialize gnash core library
gnashInit();
Index: libbase/tu_types.cpp
===================================================================
RCS file: libbase/tu_types.cpp
diff -N libbase/tu_types.cpp
--- libbase/tu_types.cpp 30 Oct 2007 18:55:41 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-// tu_types.cpp -- Ignacio Castaño, Thatcher Ulrich 2003
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// Minimal typedefs. Follows SDL conventions; falls back on SDL.h if
-// platform isn't obvious.
-
-
-#include "tu_types.h"
-#include "utility.h"
-
-
-bool tu_types_validate()
-{
- // Check typedef sizes.
- if (sizeof(uint8_t) != 1
- || sizeof(uint16_t) != 2
- || sizeof(uint32_t) != 4
- || sizeof(uint64_t) != 8
- || sizeof(int8_t) != 1
- || sizeof(int16_t) != 2
- || sizeof(int32_t) != 4
- || sizeof(int64_t) != 8)
- {
- // No good.
- abort();
- return false;
- }
-
- // Checks passed.
- return true;
-}
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
-// indent-tabs-mode: t
-// End:
Index: libbase/tu_types.h
===================================================================
RCS file: libbase/tu_types.h
diff -N libbase/tu_types.h
--- libbase/tu_types.h 3 Sep 2007 22:49:58 -0000 1.40
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-//
-// 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 3 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: tu_types.h,v 1.40 2007/09/03 22:49:58 nihilus Exp $ */
-
-#ifndef TU_TYPES_H
-#define TU_TYPES_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "tu_config.h"
-
-#if defined(_WIN32) || defined(WIN32)
-//#include <sdl_stdinc.h>
-typedef unsigned char uint8_t;
-typedef signed char int8_t;
-typedef unsigned short int uint16_t;
-typedef signed short int int16_t;
-typedef unsigned int uint32_t;
-typedef signed int int32_t;
-typedef unsigned __int64 uint64_t;
-typedef __int64 int64_t;
-#else
-# include <boost/cstdint.hpp>
-
-#ifndef HAVE_FUNCTION
- #ifndef HAVE_func
- #define dummystr(x) # x
- #define dummyestr(x) dummystr(x)
- #define __FUNCTION__ __FILE__":"dummyestr(__LINE__)
- #else
- #define __FUNCTION__ __func__
- #endif
-#endif
-
-#ifndef HAVE_PRETTY_FUNCTION
- #define __PRETTY_FUNCTION__ __FUNCTION__
-#endif
-
-#endif
-
-// A function to run some validation checks.
-DSOEXPORT bool tu_types_validate();
-
-#endif // TU_TYPES_H
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End: