[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/IOChannel.h libbase/Loa...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/IOChannel.h libbase/Loa... |
|
Date: |
Mon, 09 Jun 2008 18:12:58 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/09 18:12:58
Modified files:
. : ChangeLog
libbase : IOChannel.h LoadThread.cpp curl_adapter.cpp
tu_file.cpp tu_file.h zlib_adapter.cpp
libmedia : FLVParser.cpp MediaHandler.cpp MediaParser.h
sound_handler.h
libmedia/ffmpeg: MediaParserFfmpeg.cpp sound_handler_sdl.cpp
sound_handler_sdl.h
libmedia/gst : SoundHandlerGst.cpp SoundHandlerGst.h
server : LoadVariablesThread.cpp font.cpp impl.cpp
stream.cpp stream.h
server/asobj : NetConnection.cpp NetStreamFfmpeg.cpp
SoundFfmpeg.cpp SoundMad.cpp
server/parser : action_buffer.cpp action_buffer.h
button_character_def.cpp movie_def_impl.cpp
sprite_definition.cpp video_stream_def.cpp
server/swf : PlaceObject2Tag.cpp StreamSoundBlockTag.cpp
tag_loaders.cpp tag_loaders.h
testsuite/libbase: CurlStreamTest.cpp NoSeekFileTest.cpp
testsuite/server: StreamTest.cpp
Log message:
* lots of files: methods rename:
get_position -> tell
set_position -> seek
get_eof -> eof
get_size -> size
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6870&r2=1.6871
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/IOChannel.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaHandler.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sound_handler.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/SoundHandlerGst.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/SoundHandlerGst.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/LoadVariablesThread.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.149&r2=1.150
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/StreamSoundBlockTag.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/CurlStreamTest.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/NoSeekFileTest.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/StreamTest.cpp?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6870
retrieving revision 1.6871
diff -u -b -r1.6870 -r1.6871
--- ChangeLog 9 Jun 2008 17:40:17 -0000 1.6870
+++ ChangeLog 9 Jun 2008 18:12:54 -0000 1.6871
@@ -1,5 +1,13 @@
2008-06-09 Sandro Santilli <address@hidden>
+ * lots of files: methods rename:
+ get_position -> tell
+ set_position -> seek
+ get_eof -> eof
+ get_size -> size
+
+2008-06-09 Sandro Santilli <address@hidden>
+
* server/font.cpp: more parse logging, log unimplemented when
a language code is specified.
* server/stream.cpp (read_string_with_length): fix regression
Index: libbase/IOChannel.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/IOChannel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/IOChannel.h 9 Jun 2008 17:23:41 -0000 1.4
+++ libbase/IOChannel.h 9 Jun 2008 18:12:55 -0000 1.5
@@ -155,7 +155,7 @@
//
/// Throw IOException on error
///
- virtual int get_position() const=0;
+ virtual int tell() const=0;
/// Seek to the specified position
//
@@ -164,7 +164,7 @@
///
/// @return 0 on success, or -1 on failure.
///
- virtual int set_position(int p)=0;
+ virtual int seek(int p)=0;
/// Seek to the end of the stream
//
@@ -176,7 +176,7 @@
//
/// Throw IOException on error
///
- virtual bool get_eof() const=0;
+ virtual bool eof() const=0;
/// Return non-zero if the stream is in an error state
//
@@ -197,7 +197,7 @@
///
/// @return unreliable input size.
///
- virtual int get_size() const=0;
+ virtual int size() const=0;
};
Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/LoadThread.cpp 9 Jun 2008 14:31:52 -0000 1.23
+++ libbase/LoadThread.cpp 9 Jun 2008 18:12:55 -0000 1.24
@@ -152,7 +152,7 @@
// If the actual position is different from the position
// last used by the user/owner, seek to the position
if (_actualPosition != _userPosition) {
- _stream->set_position(_userPosition);
+ _stream->seek(_userPosition);
_actualPosition = _userPosition;
}
@@ -181,7 +181,7 @@
// If the actual position is different from the position
// last used by the user/owner, seek to the position
if (_actualPosition != _userPosition) {
- _stream->set_position(_userPosition);
+ _stream->seek(_userPosition);
_actualPosition = _userPosition;
}
@@ -222,7 +222,7 @@
// If the actual position is different from the position
// last used by the user/owner, seek to the position
if (_actualPosition != _userPosition) {
- _stream->set_position(newcachestart);
+ _stream->seek(newcachestart);
_actualPosition = newcachestart;
}
@@ -296,7 +296,7 @@
_cacheStart = 0;
_cachedData = ret;
_loadPosition = ret;
- _streamSize = _stream->get_size();
+ _streamSize = _stream->size();
if ( ret < setupSize )
{
@@ -336,7 +336,7 @@
assert(!_completed);
// If we're not at the reading head, move to it
- if (_loadPosition != _actualPosition)
_stream->set_position(_loadPosition);
+ if (_loadPosition != _actualPosition) _stream->seek(_loadPosition);
// If loading the next chunk will overflow the cache, only fill the
cache
// the "the edge", and "warm up" the remaining data.
@@ -352,8 +352,8 @@
#endif
_completed = true;
} else {
- _stream->set_position(_loadPosition + _chunkSize);
- long pos = _stream->get_position();
+ _stream->seek(_loadPosition + _chunkSize);
+ long pos = _stream->tell();
if (pos != _loadPosition + _chunkSize) {
#ifdef GNASH_DEBUG_LOAD_THREAD
log_debug("LoadThread completed during
fillCache (attempted to go to position %d, but only got to %d",
@@ -397,17 +397,17 @@
// Can't rely on _streamSize right ?
//if ( nextpos > _streamSize ) nextpos = _streamSize;
- _stream->set_position(nextpos);
- long pos = _stream->get_position();
+ _stream->seek(nextpos);
+ long pos = _stream->tell();
if ( pos == -1 )
{
- log_error("Error in get_position");
+ log_error("Error in tell");
abort();
}
if (pos < nextpos) {
#ifdef GNASH_DEBUG_LOAD_THREAD
- log_debug("LoadThread completed during download (get_position
was %d after set_position(%d))",
+ log_debug("LoadThread completed during download (tell was %d
after seek(%d))",
pos, nextpos);
#endif
_completed = true;
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- libbase/curl_adapter.cpp 9 Jun 2008 17:23:41 -0000 1.63
+++ libbase/curl_adapter.cpp 9 Jun 2008 18:12:55 -0000 1.64
@@ -374,9 +374,7 @@
virtual int read_bytes(void *dst, int bytes);
/// Return true if EOF has been reached
- virtual bool get_eof() const;
-
- bool eof() const { return get_eof(); }
+ virtual bool eof() const;
/// Return the error condition of current stream
virtual int get_error() const {
@@ -384,12 +382,10 @@
}
/// Report global position within the file
- virtual int get_position() const;
-
- int tell() const { return get_position(); }
+ virtual int tell() const;
/// Put read pointer at given position
- virtual int set_position(int pos);
+ virtual int seek(int pos);
/// Put read pointer at eof
virtual void go_to_end();
@@ -403,7 +399,7 @@
/// Another approach might be filling the cache ourselves
/// aiming at obtaining a useful value.
///
- virtual int get_size() const;
+ virtual int size() const;
private:
@@ -857,7 +853,7 @@
int
CurlStreamFile::read_bytes(void *dst, int bytes)
{
- if ( get_eof() || _error ) return 0;
+ if ( eof() || _error ) return 0;
#ifdef GNASH_CURL_VERBOSE
gnash::log_debug ("read(%d) called", bytes);
@@ -876,7 +872,7 @@
/*public*/
bool
-CurlStreamFile::get_eof() const
+CurlStreamFile::eof() const
{
bool ret = ( ! _running && feof(_cache) );
@@ -889,7 +885,7 @@
/*public*/
int
-CurlStreamFile::get_position() const
+CurlStreamFile::tell() const
{
int ret = std::ftell(_cache);
@@ -903,7 +899,7 @@
/*public*/
int
-CurlStreamFile::set_position(int pos)
+CurlStreamFile::seek(int pos)
{
#ifdef GNASH_CURL_WARN_SEEKSBACK
if ( pos < tell() ) {
@@ -968,7 +964,7 @@
/*public*/
int
-CurlStreamFile::get_size() const
+CurlStreamFile::size() const
{
if ( ! _size )
{
Index: libbase/tu_file.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libbase/tu_file.cpp 9 Jun 2008 11:21:00 -0000 1.30
+++ libbase/tu_file.cpp 9 Jun 2008 18:12:55 -0000 1.31
@@ -243,7 +243,7 @@
// Copy remaining contents of *src into *this.
{
// @@ bah, should buffer this!
- while (src->get_eof() == false) {
+ while (src->eof() == false) {
boost::uint8_t b = src->read8();
if (src->get_error()) {
break;
Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/tu_file.h 9 Jun 2008 11:21:00 -0000 1.24
+++ libbase/tu_file.h 9 Jun 2008 18:12:55 -0000 1.25
@@ -176,7 +176,7 @@
/// TODO: define what to return when the stream
/// is in error condition, see get_error().
///
- int get_position() const { return m_tell(m_data); }
+ int tell() const { return m_tell(m_data); }
/// \brief Seek to the specified position
//
@@ -186,7 +186,7 @@
///
/// @return 0 on success, or TU_FILE_SEEK_ERROR on failure.
///
- int set_position(int p) { return m_seek(p, m_data); }
+ int seek(int p) { return m_seek(p, m_data); }
/// \brief Seek to the end of the stream
//
@@ -199,7 +199,7 @@
/// TODO: define what to return when in error condition
/// see get_error().
///
- bool get_eof() const { return m_get_eof(m_data); }
+ bool eof() const { return m_get_eof(m_data); }
/// \brief Return non-zero if the stream is in an error state
//
@@ -213,7 +213,7 @@
/// \brief Get the size of the stream
- int get_size() const { return m_get_stream_size(m_data); }
+ int size() const { return m_get_stream_size(m_data); }
// \brief UNSAFE back door, for testing only.
void* get_app_data_DEBUG() { return m_data; }
Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libbase/zlib_adapter.cpp 9 Jun 2008 14:31:52 -0000 1.25
+++ libbase/zlib_adapter.cpp 9 Jun 2008 18:12:55 -0000 1.26
@@ -71,7 +71,7 @@
// Constructor.
:
m_in(in),
- m_initial_stream_pos(m_in->get_position()),
+ m_initial_stream_pos(m_in->tell()),
m_logical_stream_pos(m_initial_stream_pos),
m_at_eof(false),
m_error(0)
@@ -123,7 +123,7 @@
m_zstream.avail_out = 0;
// Rewind the underlying stream.
- if ( m_in->set_position(m_initial_stream_pos) ==
TU_FILE_SEEK_ERROR )
+ if ( m_in->seek(m_initial_stream_pos) ==
TU_FILE_SEEK_ERROR )
{
std::stringstream ss;
ss << "inflater_impl::reset: unable to seek
underlying stream to position " << m_initial_stream_pos;
@@ -224,14 +224,14 @@
{
if (m_zstream.avail_in > 0)
{
- int pos = m_in->get_position();
+ int pos = m_in->tell();
int rewound_pos = pos - m_zstream.avail_in;
assert(pos >= 0);
assert(pos >= m_initial_stream_pos);
assert(rewound_pos >= 0);
assert(rewound_pos >= m_initial_stream_pos);
- m_in->set_position(rewound_pos);
+ m_in->seek(rewound_pos);
}
}
};
Index: libmedia/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libmedia/FLVParser.cpp 9 Jun 2008 14:31:53 -0000 1.14
+++ libmedia/FLVParser.cpp 9 Jun 2008 18:12:55 -0000 1.15
@@ -84,7 +84,7 @@
if ( _parsingComplete ) return false;
// Seek to next frame and skip the size of the last tag
- if ( _stream->set_position(_lastParsedPosition+4) )
+ if ( _stream->seek(_lastParsedPosition+4) )
{
log_error("FLVParser::parseNextTag: can't seek to %d",
_lastParsedPosition+4);
_parsingComplete=true;
@@ -98,7 +98,7 @@
{
if ( actuallyRead )
log_error("FLVParser::parseNextTag: can't read tag info
(needed 12 bytes, only got %d)", actuallyRead);
- // else { assert(_stream->get_eof(); } ?
+ // else { assert(_stream->eof(); } ?
_parsingComplete=true;
return false;
}
@@ -149,7 +149,7 @@
bool isKeyFrame = (tag[11] & 0xf0) >> 4;
UNUSED(isKeyFrame); // may be used for building seekable
indexes...
- size_t dataPosition = _stream->get_position();
+ size_t dataPosition = _stream->tell();
std::auto_ptr<EncodedVideoFrame> frame =
readVideoFrame(bodyLength-1, timestamp);
if ( ! frame.get() ) { log_error("could not read video
frame?"); }
@@ -170,8 +170,8 @@
// We're going to re-read some data here
// (can likely avoid with a better cleanup)
- size_t bkpos = _stream->get_position();
- if ( _stream->set_position(dataPosition) ) {
+ size_t bkpos = _stream->tell();
+ if ( _stream->seek(dataPosition) ) {
log_error(" Couldn't seek to VideoTag
data position");
_parsingComplete=true;
return false;
@@ -179,7 +179,7 @@
boost::uint8_t videohead[12];
int actuallyRead =
_stream->read_bytes(videohead, 12);
- _stream->set_position(bkpos); // rewind
+ _stream->seek(bkpos); // rewind
if ( actuallyRead < 12 )
{
@@ -256,7 +256,7 @@
bool FLVParser::parseHeader()
{
// seek to the begining of the file
- _stream->set_position(0); // seek back ? really ?
+ _stream->seek(0); // seek back ? really ?
// Read the header
boost::uint8_t header[9];
@@ -311,7 +311,7 @@
{
IOChannel& in = *_stream;
- //log_debug("Reading the %dth audio frame, with data size %d, from
position %d", _audioFrames.size()+1, dataSize, in.get_position());
+ //log_debug("Reading the %dth audio frame, with data size %d, from
position %d", _audioFrames.size()+1, dataSize, in.tell());
std::auto_ptr<EncodedAudioFrame> frame ( new EncodedAudioFrame );
frame->dataSize = dataSize;
Index: libmedia/MediaHandler.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaHandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/MediaHandler.cpp 9 Jun 2008 14:31:53 -0000 1.3
+++ libmedia/MediaHandler.cpp 9 Jun 2008 18:12:55 -0000 1.4
@@ -33,9 +33,9 @@
MediaHandler::isFLV(IOChannel& stream)
{
char head[4] = {0, 0, 0, 0};
- stream.set_position(0);
+ stream.seek(0);
size_t actuallyRead = stream.read_bytes(head, 3);
- stream.set_position(0);
+ stream.seek(0);
if (actuallyRead < 3)
{
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libmedia/MediaParser.h 9 Jun 2008 14:31:53 -0000 1.22
+++ libmedia/MediaParser.h 9 Jun 2008 18:12:55 -0000 1.23
@@ -367,7 +367,7 @@
/// Return total number of bytes in input
boost::uint64_t getBytesTotal() const
{
- return _stream->get_size();
+ return _stream->size();
}
protected:
Index: libmedia/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sound_handler.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libmedia/sound_handler.h 9 Jun 2008 10:18:19 -0000 1.19
+++ libmedia/sound_handler.h 9 Jun 2008 18:12:55 -0000 1.20
@@ -431,7 +431,7 @@
/// The id of the event sound
///
/// @return the duration of the sound in milliseconds
- virtual unsigned int get_position(int sound_handle) = 0;
+ virtual unsigned int tell(int sound_handle) = 0;
/// Special test-fuction. Reports how many times a sound has been
started
size_t numSoundsStarted() const { return _soundsStarted; }
Index: libmedia/ffmpeg/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/MediaParserFfmpeg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libmedia/ffmpeg/MediaParserFfmpeg.cpp 9 Jun 2008 14:31:53 -0000
1.10
+++ libmedia/ffmpeg/MediaParserFfmpeg.cpp 9 Jun 2008 18:12:56 -0000
1.11
@@ -67,9 +67,9 @@
probe_data.buf = buffer.get();
probe_data.buf_size = 2048;
- assert(_stream->get_position() == 0);
+ assert(_stream->tell() == 0);
size_t actuallyRead = _stream->read_bytes(probe_data.buf,
probe_data.buf_size);
- _stream->set_position(0);
+ _stream->seek(0);
if (actuallyRead < 1)
{
@@ -198,7 +198,7 @@
// position the stream where we left parsing as
// it could be somewhere else for reading a specific
// or seeking.
- _stream->set_position(_lastParsedPosition);
+ _stream->seek(_lastParsedPosition);
assert(_formatCtx);
@@ -232,14 +232,14 @@
av_free_packet(&packet);
// Check if EOF was reached
- if ( _stream->get_eof() )
+ if ( _stream->eof() )
{
log_debug("MediaParserFfmpeg::parseNextFrame: at eof after
av_read_frame");
_parsingComplete=true;
}
// Update _lastParsedPosition
- boost::uint64_t curPos = _stream->get_position();
+ boost::uint64_t curPos = _stream->tell();
if ( curPos > _lastParsedPosition )
{
_lastParsedPosition = curPos;
@@ -247,7 +247,7 @@
log_debug("parseNextFrame: parsed %d+%d/%d bytes (byteIOCxt: pos:%d,
buf_ptr:%p, buf_end:%p); "
" AVFormatContext: data_offset:%d, cur_ptr:%p,; "
"%d video frames, %d audio frames",
- curPos, _formatCtx->cur_ptr-_formatCtx->cur_pkt.data,
_stream->get_size(),
+ curPos, _formatCtx->cur_ptr-_formatCtx->cur_pkt.data,
_stream->size(),
_byteIOCxt.pos, (void*)_byteIOCxt.buf_ptr,
(void*)_byteIOCxt.buf_end,
_formatCtx->data_offset, (void*)_formatCtx->cur_ptr,
_videoFrames.size(), _audioFrames.size());
@@ -420,23 +420,23 @@
// Offset is absolute new position in the file
if (whence == SEEK_SET)
{
- in.set_position(offset);
+ in.seek(offset);
// New position is offset + old position
}
else if (whence == SEEK_CUR)
{
- in.set_position(in.get_position() + offset);
+ in.seek(in.tell() + offset);
// New position is offset + end of file
}
else if (whence == SEEK_END)
{
// This is (most likely) a streamed file, so we can't seek to
the end!
// Instead we seek to byteIOBufferSize bytes... seems to work
fine...
- in.set_position(byteIOBufferSize);
+ in.seek(byteIOBufferSize);
}
- return in.get_position();
+ return in.tell();
}
boost::uint16_t
Index: libmedia/ffmpeg/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/ffmpeg/sound_handler_sdl.cpp 27 May 2008 15:32:29 -0000
1.11
+++ libmedia/ffmpeg/sound_handler_sdl.cpp 9 Jun 2008 18:12:56 -0000
1.12
@@ -526,7 +526,7 @@
}
}
-unsigned int SDL_sound_handler::get_position(int sound_handle)
+unsigned int SDL_sound_handler::tell(int sound_handle)
{
boost::mutex::scoped_lock lock(_mutex);
Index: libmedia/ffmpeg/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/ffmpeg/sound_handler_sdl.h 23 May 2008 05:58:09 -0000 1.11
+++ libmedia/ffmpeg/sound_handler_sdl.h 9 Jun 2008 18:12:56 -0000 1.12
@@ -378,7 +378,7 @@
virtual unsigned int get_duration(int sound_handle);
/// Gets the playhead position in milliseconds of an event sound
connected to an AS Soound obejct.
- virtual unsigned int get_position(int sound_handle);
+ virtual unsigned int tell(int sound_handle);
virtual void attach_aux_streamer(aux_streamer_ptr ptr, void* owner);
//vv
virtual void detach_aux_streamer(void* owner); //vv
Index: libmedia/gst/SoundHandlerGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/SoundHandlerGst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/gst/SoundHandlerGst.cpp 1 Apr 2008 18:20:53 -0000 1.5
+++ libmedia/gst/SoundHandlerGst.cpp 9 Jun 2008 18:12:56 -0000 1.6
@@ -163,7 +163,7 @@
}
unsigned int
-SoundHandlerGst::get_position(int handle)
+SoundHandlerGst::tell(int handle)
{
return ts_call(handle, bind(&SoundGst::position, _1), 0);
}
Index: libmedia/gst/SoundHandlerGst.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/SoundHandlerGst.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/gst/SoundHandlerGst.h 1 Apr 2008 18:20:53 -0000 1.3
+++ libmedia/gst/SoundHandlerGst.h 9 Jun 2008 18:12:56 -0000 1.4
@@ -69,7 +69,7 @@
unsigned int get_duration(int sound_handle);
- unsigned int get_position(int sound_handle);
+ unsigned int tell(int sound_handle);
void start_timer();
Index: server/LoadVariablesThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/LoadVariablesThread.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/LoadVariablesThread.cpp 9 Jun 2008 14:31:54 -0000 1.13
+++ server/LoadVariablesThread.cpp 9 Jun 2008 18:12:56 -0000 1.14
@@ -46,7 +46,7 @@
// this is going to override any previous setting,
// better do this inside a subclass (in a separate thread)
_bytesLoaded = 0;
- _bytesTotal = _stream->get_size();
+ _bytesTotal = _stream->size();
string toparse;
@@ -102,7 +102,7 @@
//dispatchDataEvent();
// eof, get out !
- if ( _stream->get_eof() ) break;
+ if ( _stream->eof() ) break;
if ( cancelRequested() )
{
@@ -117,7 +117,7 @@
}
_stream->go_to_end();
- _bytesLoaded = _stream->get_position();
+ _bytesLoaded = _stream->tell();
if ( _bytesTotal != _bytesLoaded )
{
log_error("Size of stream variables were loaded from advertised
to be %d bytes long,"
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/font.cpp 9 Jun 2008 17:40:18 -0000 1.71
+++ server/font.cpp 9 Jun 2008 18:12:56 -0000 1.72
@@ -157,7 +157,7 @@
log_parse(_("reading DefineFont"));
);
- unsigned long table_base = in.get_position();
+ unsigned long table_base = in.tell();
// Read the glyph offsets. Offsets
// are measured from the start of the
@@ -196,7 +196,7 @@
// Seek to the start of the shape data.
unsigned long new_pos = table_base + offsets[i];
- if ( ! in.set_position(new_pos) )
+ if ( ! in.seek(new_pos) )
{
throw ParserException(_("Glyphs offset table
corrupted in DefineFont tag"));
}
@@ -250,7 +250,7 @@
);
- unsigned long table_base = in.get_position();
+ unsigned long table_base = in.tell();
// Read the glyph offsets. Offsets
// are measured from the start of the
@@ -300,9 +300,9 @@
// It seems completely possible to
// have such seeks-back, see bug #16311
- //assert(new_pos >= in.get_position());
+ //assert(new_pos >= in.tell());
- if ( ! in.set_position(new_pos) )
+ if ( ! in.seek(new_pos) )
{
throw ParserException(_("Glyphs offset table
corrupted in DefineFont2/3 tag"));
}
@@ -314,7 +314,7 @@
_embedGlyphTable[i].glyph = s;
}
- unsigned long current_position = in.get_position();
+ unsigned long current_position = in.tell();
if (font_code_offset + table_base != current_position)
{
// Bad offset! Don't try to read any more.
@@ -443,7 +443,7 @@
void font::read_code_table(SWFStream& in)
{
IF_VERBOSE_PARSE (
- log_parse(_("reading code table at offset %lu"),
in.get_position());
+ log_parse(_("reading code table at offset %lu"), in.tell());
);
assert(_embedded_code_table.empty());
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- server/impl.cpp 9 Jun 2008 14:31:54 -0000 1.154
+++ server/impl.cpp 9 Jun 2008 18:12:56 -0000 1.155
@@ -313,28 +313,28 @@
FileType
getFileType(IOChannel* in)
{
- in->set_position(0);
+ in->seek(0);
unsigned char buf[3];
if ( 3 < in->read_bytes(buf, 3) )
{
log_error(_("Can't read file header"));
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_UNKNOWN;
}
// This is the magic number for any JPEG format file
if ((buf[0] == 0xff) && (buf[1] == 0xd8) && (buf[2] == 0xff))
{
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_JPEG;
}
// This is the magic number for any JPEG format file
if ((buf[0] == 137) && (buf[1] == 'P') && (buf[2] == 'N')) // buf[3] == 'G'
(we didn't read so far)
{
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_PNG;
}
@@ -343,7 +343,7 @@
(buf[1] == 'W') &&
(buf[2] == 'S') )
{
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_SWF;
}
@@ -352,7 +352,7 @@
if ( 3 < in->read_bytes(buf, 3) )
{
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_UNKNOWN;
}
@@ -361,13 +361,13 @@
buf[0] = buf[1];
buf[1] = buf[2];
buf[2] = in->read_byte();
- if (in->get_eof())
+ if (in->eof())
{
- in->set_position(0);
+ in->seek(0);
return GNASH_FILETYPE_UNKNOWN;
}
}
- in->set_position(in->get_position()-3); // position to start of the swf
itself
+ in->seek(in->tell()-3); // position to start of the swf itself
return GNASH_FILETYPE_SWF;
}
return GNASH_FILETYPE_UNKNOWN;
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/stream.cpp 9 Jun 2008 17:40:18 -0000 1.56
+++ server/stream.cpp 9 Jun 2008 18:12:56 -0000 1.57
@@ -53,7 +53,7 @@
if ( _tagBoundsStack.empty() ) return; // not in a tag (should we check
file length ?)
- unsigned long int left = get_tag_end_position() - get_position();
+ unsigned long int left = get_tag_end_position() - tell();
if ( left < needed )
{
std::stringstream ss;
@@ -72,7 +72,7 @@
{
TagBoundaries& tb = _tagBoundsStack.back();
unsigned long endPos = tb.second;
- unsigned long cur_pos = get_position();
+ unsigned long cur_pos = tell();
assert(endPos >= cur_pos);
unsigned long left = endPos - cur_pos;
if ( left < count ) count = left;
@@ -449,16 +449,16 @@
unsigned long
-SWFStream::get_position()
+SWFStream::tell()
{
- int pos = m_input->get_position();
+ int pos = m_input->tell();
// TODO: check return value? Could be negative.
return static_cast<unsigned long>(pos);
}
bool
-SWFStream::set_position(unsigned long pos)
+SWFStream::seek(unsigned long pos)
{
align();
@@ -485,7 +485,7 @@
}
// Do the seek.
- if ( m_input->set_position(pos) == -1 )
+ if ( m_input->seek(pos) == -1 )
{
// TODO: should we throw an exception ?
// we might be called from an exception handler
@@ -512,7 +512,7 @@
{
align();
- unsigned long tagStart = get_position();
+ unsigned long tagStart = tell();
ensureBytes(2);
@@ -537,7 +537,7 @@
log_debug("Tag %d has a size of %d bytes !!", tagType, tagLength);
}
- unsigned long tagEnd = get_position() + tagLength;
+ unsigned long tagEnd = tell() + tagLength;
// Check end position doesn't overflow a signed int - that makes
// zlib adapter's inflate_seek(int pos, void* appdata) unhappy.
@@ -594,7 +594,7 @@
//log_debug("Close tag called at %d, stream size: %d", endPos);
- if ( m_input->set_position(endPos) == -1 )
+ if ( m_input->seek(endPos) == -1 )
{
// We'll go on reading right past the end of the stream
// if we don't throw an exception.
Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/stream.h 9 Jun 2008 14:31:54 -0000 1.46
+++ server/stream.h 9 Jun 2008 18:12:56 -0000 1.47
@@ -133,9 +133,9 @@
/// This method is implicitly called by all 'aligned' reads.
///
/// NOTE:
- /// The position returned by get_position() won't be changed
+ /// The position returned by tell() won't be changed
/// by calls to this function, altought any subsequent reads
- /// will start on next byte. See get_position() for more info.
+ /// will start on next byte. See tell() for more info.
///
void align()
{
@@ -300,7 +300,7 @@
/// - For aligned reads the current byte will not be used
/// (already used)
///
- unsigned long get_position();
+ unsigned long tell();
/// Set the file position to the given value (byte aligned)
//
@@ -313,7 +313,7 @@
/// - given position is after end of current tag, if any.
/// - given position is before start of current tag, if any.
///
- bool set_position(unsigned long pos);
+ bool seek(unsigned long pos);
/// Return the file position of the end of the current tag.
unsigned long get_tag_end_position();
@@ -337,7 +337,7 @@
/// current tag, if any.
///
/// WARNING: alignment is not specified here, the method uses
- /// get_position() which is known NOT to consider
+ /// tell() which is known NOT to consider
/// a fully-read byte as already "skipped"
/// TODO: force alignment and see what happens !!
///
@@ -345,15 +345,15 @@
{
// there's probably a better way, but
// it's the interface that counts atm
- size_t curpos = get_position();
- return set_position(curpos+num);
+ size_t curpos = tell();
+ return seek(curpos+num);
}
/// Discard all bytes up to end of tag
void skip_to_tag_end()
{
- // set_position will call align...
- set_position(get_tag_end_position());
+ // seek will call align...
+ seek(get_tag_end_position());
}
/// \brief
@@ -382,7 +382,7 @@
{
#ifndef GNASH_TRUST_SWF_INPUT
if ( _tagBoundsStack.empty() ) return; // not in a tag (should
we check file length ?)
- unsigned long int bytesLeft = get_tag_end_position() -
get_position();
+ unsigned long int bytesLeft = get_tag_end_position() - tell();
unsigned long int bitsLeft = (bytesLeft*8)+m_unused_bits;
if ( bitsLeft < needed )
{
Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/asobj/NetConnection.cpp 9 Jun 2008 14:31:55 -0000 1.64
+++ server/asobj/NetConnection.cpp 9 Jun 2008 18:12:56 -0000 1.65
@@ -123,7 +123,7 @@
NetConnection::eof()
{
if (!_loader.get()) return true; // @@ correct ?
- return _loader->get_eof();
+ return _loader->eof();
}
@@ -188,7 +188,7 @@
return false;
}
- return ! _loader->set_position( pos );
+ return ! _loader->seek( pos );
}
@@ -198,7 +198,7 @@
NetConnection::tell()
{
if (!_loader.get()) return 0; // @@ correct ?
- return _loader->get_position();
+ return _loader->tell();
}
@@ -208,7 +208,7 @@
NetConnection::getBytesLoaded()
{
if (!_loader.get()) return 0; // @@ correct ?
- return _loader->get_position(); // getBytesLoaded();
+ return _loader->tell(); // getBytesLoaded();
}
@@ -218,7 +218,7 @@
NetConnection::getBytesTotal()
{
if (!_loader.get()) return 0; // @@ correct ?
- return _loader->get_size(); // getBytesTotal();
+ return _loader->size(); // getBytesTotal();
}
@@ -232,7 +232,7 @@
}
// is the below correct ?
- return _loader->get_eof(); // completed();
+ return _loader->eof(); // completed();
}
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- server/asobj/NetStreamFfmpeg.cpp 6 Jun 2008 21:06:55 -0000 1.149
+++ server/asobj/NetStreamFfmpeg.cpp 9 Jun 2008 18:12:57 -0000 1.150
@@ -246,7 +246,7 @@
NetStreamFfmpeg::startPlayback()
{
assert(_inputStream.get());
- assert(_inputStream->get_position() == 0);
+ assert(_inputStream->tell() == 0);
inputPos = 0;
Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/SoundFfmpeg.cpp 21 Jan 2008 20:55:58 -0000 1.22
+++ server/asobj/SoundFfmpeg.cpp 9 Jun 2008 18:12:57 -0000 1.23
@@ -491,7 +491,7 @@
if (!externalSound) {
media::sound_handler* s = get_sound_handler();
if (s) {
- return s->get_position(soundId);
+ return s->tell(soundId);
} else {
return 0; // just in case
}
Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/SoundMad.cpp 21 Jan 2008 20:55:58 -0000 1.16
+++ server/asobj/SoundMad.cpp 9 Jun 2008 18:12:57 -0000 1.17
@@ -442,7 +442,7 @@
if (!externalSound) {
media::sound_handler* s = get_sound_handler();
if (s) {
- return s->get_position(soundId);
+ return s->tell(soundId);
} else {
return 0; // just in case
}
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/parser/action_buffer.cpp 9 Jun 2008 10:18:24 -0000 1.42
+++ server/parser/action_buffer.cpp 9 Jun 2008 18:12:57 -0000 1.43
@@ -59,7 +59,7 @@
void
action_buffer::read(SWFStream& in, unsigned long endPos)
{
- unsigned long startPos = in.get_position();
+ unsigned long startPos = in.tell();
assert(endPos <= in.get_tag_end_position());
unsigned size = endPos-startPos;
Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/parser/action_buffer.h 9 Jun 2008 10:18:24 -0000 1.30
+++ server/parser/action_buffer.h 9 Jun 2008 18:12:57 -0000 1.31
@@ -58,7 +58,7 @@
//
/// @param endPos
/// One past last valid-to-read byte position.
- /// Make sure it's > then in.get_position() and
+ /// Make sure it's > then in.tell() and
/// <= in.get_tag_end_position() or an assertion will
/// fail.
///
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/parser/button_character_def.cpp 9 Jun 2008 10:18:24 -0000
1.37
+++ server/parser/button_character_def.cpp 9 Jun 2008 18:12:57 -0000
1.38
@@ -50,7 +50,7 @@
{
assert(tag_type == SWF::DEFINEBUTTON2); // 34
- if ( in.get_position()+2 > endPos )
+ if ( in.tell()+2 > endPos )
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("Premature end of button action input:
can't read conditions"));
@@ -117,7 +117,7 @@
movie_definition* m, unsigned long endPos)
{
// caller should check this
- if (in->get_position()+1 > endPos)
+ if (in->tell()+1 > endPos)
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_(" premature end of button record input stream,
can't read flags"));
@@ -142,7 +142,7 @@
m_over = flags & (1<<1); // 2 ? true : false;
m_up = flags & (1<<0); // 1 ? true : false;
- if (in->get_position()+2 > endPos)
+ if (in->tell()+2 > endPos)
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_(" premature end of button record input stream,
can't read character id"));
@@ -174,7 +174,7 @@
);
}
- if (in->get_position()+2 > endPos)
+ if (in->tell()+2 > endPos)
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_(" premature end of button record input stream,
can't read button layer (depth?)"));
@@ -334,7 +334,7 @@
}
}
- if ( in->get_position() >= endTagPos )
+ if ( in->tell() >= endTagPos )
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("Premature end of DEFINEBUTTON tag, won't read
actions"));
@@ -363,7 +363,7 @@
unsigned button_2_action_offset = in->read_u16();
unsigned long tagEndPosition = in->get_tag_end_position();
- unsigned next_action_pos = in->get_position() + button_2_action_offset
- 2;
+ unsigned next_action_pos = in->tell() + button_2_action_offset - 2;
if ( next_action_pos > tagEndPosition )
{
@@ -380,7 +380,7 @@
// Read button records.
// takes at least 1 byte for the end mark button record, so
// we don't attempt to parse at all unless we have at least 1 byte left
- while ( in->get_position() < endOfButtonRecords )
+ while ( in->tell() < endOfButtonRecords )
{
button_record r;
if (r.read(in, SWF::DEFINEBUTTON2, m, endOfButtonRecords) ==
false)
@@ -399,17 +399,17 @@
if ( button_2_action_offset )
{
- in->set_position(next_action_pos);
+ in->seek(next_action_pos);
// Read Button2ActionConditions
// Don't read past tag end
- while ( in->get_position() < tagEndPosition )
+ while ( in->tell() < tagEndPosition )
{
in->ensureBytes(2);
unsigned next_action_offset = in->read_u16();
if ( next_action_offset )
{
- next_action_pos = in->get_position() +
next_action_offset - 2;
+ next_action_pos = in->tell() +
next_action_offset - 2;
if ( next_action_pos > tagEndPosition )
{
IF_VERBOSE_MALFORMED_SWF(
@@ -431,7 +431,7 @@
}
// seek to next action.
- in->set_position(next_action_pos);
+ in->seek(next_action_pos);
}
}
}
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/parser/movie_def_impl.cpp 9 Jun 2008 14:31:55 -0000 1.119
+++ server/parser/movie_def_impl.cpp 9 Jun 2008 18:12:57 -0000 1.120
@@ -161,7 +161,7 @@
os << std::endl;
// This decremented until we reach the end of the stream.
- unsigned int toRead = in->get_tag_end_position() - in->get_position();
+ unsigned int toRead = in->get_tag_end_position() - in->tell();
in->ensureBytes(toRead);
unsigned char buf[rowlength];
@@ -328,7 +328,7 @@
if ( url == "" ) _url = "<anonymous>";
else _url = url;
- boost::uint32_t file_start_pos = _in->get_position();
+ boost::uint32_t file_start_pos = _in->tell();
boost::uint32_t header = _in->read_le32();
m_file_length = _in->read_le32();
_swf_end_pos = file_start_pos + m_file_length;
@@ -421,7 +421,7 @@
m_frame_rate, m_frame_count);
);
- setBytesLoaded(_str->get_position());
+ setBytesLoaded(_str->tell());
return true;
}
@@ -605,7 +605,7 @@
try {
//size_t it=0;
- while ( (boost::uint32_t) str.get_position() < _swf_end_pos )
+ while ( (boost::uint32_t) str.tell() < _swf_end_pos )
{
if ( _loadingCanceled )
{
@@ -621,7 +621,7 @@
if (tag_type == SWF::END)
{
- if ((unsigned int) str.get_position() != _swf_end_pos)
+ if ((unsigned int) str.tell() != _swf_end_pos)
{
IF_VERBOSE_MALFORMED_SWF(
// Safety break, so we don't read past
@@ -681,7 +681,7 @@
str.close_tag();
- setBytesLoaded(str.get_position());
+ setBytesLoaded(str.tell());
}
} catch (const std::exception& e) {
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/parser/sprite_definition.cpp 9 Jun 2008 10:18:25 -0000 1.38
+++ server/parser/sprite_definition.cpp 9 Jun 2008 18:12:57 -0000 1.39
@@ -80,7 +80,7 @@
m_loading_frame = 0;
- while ( in->get_position() < tag_end )
+ while ( in->tell() < tag_end )
{
SWF::tag_type tag_type = in->open_tag();
@@ -88,7 +88,7 @@
if (tag_type == SWF::END)
{
- if (in->get_position() != tag_end)
+ if (in->tell() != tag_end)
{
IF_VERBOSE_MALFORMED_SWF(
// Safety break, so we don't read past
Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/parser/video_stream_def.cpp 9 Jun 2008 10:18:27 -0000 1.49
+++ server/parser/video_stream_def.cpp 9 Jun 2008 18:12:57 -0000 1.50
@@ -120,7 +120,7 @@
frameNum = m->get_loading_frame();
}
- const unsigned int dataLength = in->get_tag_end_position() -
in->get_position();
+ const unsigned int dataLength = in->get_tag_end_position() - in->tell();
boost::uint8_t* buffer = new uint8_t[dataLength + 8]; // FIXME: catch
bad_alloc
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/swf/PlaceObject2Tag.cpp 9 Jun 2008 10:18:28 -0000 1.47
+++ server/swf/PlaceObject2Tag.cpp 9 Jun 2008 18:12:57 -0000 1.48
@@ -45,7 +45,7 @@
log_parse("%s", m_matrix);
);
- if (in.get_position() < in.get_tag_end_position())
+ if (in.tell() < in.get_tag_end_position())
{
m_color_transform.read_rgb(in);
@@ -122,14 +122,14 @@
in.ensureBytes(4);
boost::uint32_t event_length = in.read_u32();
- if ( in.get_tag_end_position() - in.get_position() < event_length
)
+ if ( in.get_tag_end_position() - in.tell() < event_length )
{
IF_VERBOSE_MALFORMED_SWF(
log_swferror(_("swf_event::read(), "
"even_length = %u, but only %lu bytes left "
"to the end of current tag."
" Breaking for safety."),
- event_length, in.get_tag_end_position() -
in.get_position());
+ event_length, in.get_tag_end_position() - in.tell());
);
break;
}
@@ -146,7 +146,7 @@
// Read the actions for event(s)
// auto_ptr here prevents leaks on malformed swf
std::auto_ptr<action_buffer> action ( new
action_buffer(_movie_def) );
- action->read(in, in.get_position()+event_length);
+ action->read(in, in.tell()+event_length);
_actionBuffers.push_back(action.release()); // take ownership
// If there is no end tag, action_buffer appends a null-terminator,
Index: server/swf/StreamSoundBlockTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/StreamSoundBlockTag.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/StreamSoundBlockTag.cpp 9 Jun 2008 10:18:28 -0000 1.3
+++ server/swf/StreamSoundBlockTag.cpp 9 Jun 2008 18:12:57 -0000 1.4
@@ -87,7 +87,7 @@
LOG_ONCE ( if ( seekSamples ) log_unimpl("MP3 soundblock seek samples")
);
}
- const unsigned int dataLength = in->get_tag_end_position() -
in->get_position();
+ const unsigned int dataLength = in->get_tag_end_position() - in->tell();
if ( ! dataLength )
{
IF_VERBOSE_MALFORMED_SWF(
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- server/swf/tag_loaders.cpp 9 Jun 2008 10:18:28 -0000 1.207
+++ server/swf/tag_loaders.cpp 9 Jun 2008 18:12:57 -0000 1.208
@@ -86,7 +86,7 @@
StreamAdapter(SWFStream& str, unsigned long maxPos)
:
s(str),
- startPos(s.get_position()),
+ startPos(s.tell()),
endPos(maxPos),
currPos(startPos)
{
@@ -186,14 +186,14 @@
// if it is 1 this label can be accessed by #name and it's
// entrance sets the browser URL with anchor appended
//
- // To avoid relaying on SWFStream::get_position (see task #5838)
+ // To avoid relaying on SWFStream::tell (see task #5838)
// we should add a new method to that class
// (ie: SWFStream::current_tag_length)
//
// See server/sample/test_clipping_layer.swf for a testcase.
//
size_t end_tag = in->get_tag_end_position();
- size_t curr_pos = in->get_position();
+ size_t curr_pos = in->tell();
if ( end_tag != curr_pos )
{
if ( end_tag == curr_pos + 1 )
@@ -224,7 +224,7 @@
log_parse(_(" jpeg_tables_loader"));
);
- const unsigned long currPos = in->get_position();
+ const unsigned long currPos = in->tell();
const unsigned long endPos = in->get_tag_end_position();
assert(endPos >= currPos);
@@ -332,7 +332,7 @@
IF_VERBOSE_PARSE
(
log_parse(_(" define_bits_jpeg2_loader: charid = %d pos = %ld"),
- character_id, in->get_position());
+ character_id, in->tell());
);
//
@@ -393,8 +393,8 @@
for (;;)
{
unsigned int chunkSize = CHUNKSIZE;
- assert(in.get_position() <= endTagPos);
- unsigned int availableBytes = endTagPos - in.get_position();
+ assert(in.tell() <= endTagPos);
+ unsigned int availableBytes = endTagPos - in.tell();
if ( availableBytes < chunkSize )
{
if ( ! availableBytes )
@@ -452,12 +452,12 @@
IF_VERBOSE_PARSE
(
log_parse(_(" define_bits_jpeg3_loader: charid = %d pos = %lx"),
- character_id, in->get_position());
+ character_id, in->tell());
);
in->ensureBytes(4);
boost::uint32_t jpeg_size = in->read_u32();
- boost::uint32_t alpha_position = in->get_position() + jpeg_size;
+ boost::uint32_t alpha_position = in->tell() + jpeg_size;
#ifndef HAVE_ZLIB_H
log_error(_("gnash is not linked to zlib -- can't load jpeg3 image data"));
@@ -472,7 +472,7 @@
std::auto_ptr<image::rgba> im( image::read_swf_jpeg3(ad.get()) );
// Read alpha channel.
- in->set_position(alpha_position);
+ in->seek(alpha_position);
size_t imWidth = im->width();
size_t imHeight = im->height();
@@ -558,7 +558,7 @@
boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
boost::uint8_t* color_table = buffer.get();
@@ -586,7 +586,7 @@
boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
{
@@ -614,7 +614,7 @@
boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
// Need to re-arrange ARGB into RGB.
for (int j = 0; j < height; j++)
@@ -672,7 +672,7 @@
boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
boost::uint8_t* color_table = buffer.get();
@@ -701,7 +701,7 @@
boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
{
@@ -725,7 +725,7 @@
// 32 bits / pixel, input is ARGB format
inflate_wrapper(*in, image->data(), width * height * 4);
- assert(in->get_position() <= in->get_tag_end_position());
+ assert(in->tell() <= in->get_tag_end_position());
// Need to re-arrange ARGB into RGBA.
for (int j = 0; j < height; j++)
@@ -1252,7 +1252,7 @@
{
// First it is the amount of data from file,
// then the amount allocated at *data (it may grow)
- const unsigned dataLength = in->get_tag_end_position() -
in->get_position();
+ const unsigned dataLength = in->get_tag_end_position() - in->tell();
unsigned char *data = new unsigned char[dataLength];
// dataLength is already calculated from the end of the tag, which
Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/swf/tag_loaders.h 9 Jun 2008 10:18:29 -0000 1.28
+++ server/swf/tag_loaders.h 9 Jun 2008 18:12:58 -0000 1.29
@@ -105,7 +105,7 @@
void end_loader(SWFStream* in, tag_type tag, movie_definition*)
{
assert(tag == SWF::END); // 0
- assert(in->get_position() == in->get_tag_end_position());
+ assert(in->tell() == in->get_tag_end_position());
}
void remove_object_2_loader(SWFStream*, tag_type, movie_definition*);
Index: testsuite/libbase/CurlStreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/CurlStreamTest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/libbase/CurlStreamTest.cpp 9 Jun 2008 15:24:20 -0000
1.9
+++ testsuite/libbase/CurlStreamTest.cpp 9 Jun 2008 18:12:58 -0000
1.10
@@ -75,7 +75,7 @@
}
}
- if ( reader->get_eof() )
+ if ( reader->eof() )
printf("-EOF-\n");
}
Index: testsuite/libbase/NoSeekFileTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/NoSeekFileTest.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/libbase/NoSeekFileTest.cpp 9 Jun 2008 15:24:20 -0000
1.10
+++ testsuite/libbase/NoSeekFileTest.cpp 9 Jun 2008 18:12:58 -0000
1.11
@@ -106,7 +106,7 @@
return false;
}
- if ( ! reader->get_eof() )
+ if ( ! reader->eof() )
{
ss << "tu_file not at EOF at end of read";
runtest.fail(ss.str());
@@ -141,7 +141,7 @@
compare_reads(reader, raw, "wrapped", "raw");
lseek(raw, 0, SEEK_SET);
- reader->set_position(0);
+ reader->seek(0);
compare_reads(reader, raw, "wrapped-rewind", "raw-rewind");
tu_file orig(cachename, "r");
Index: testsuite/server/StreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/StreamTest.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/server/StreamTest.cpp 9 Jun 2008 15:36:39 -0000 1.10
+++ testsuite/server/StreamTest.cpp 9 Jun 2008 18:12:58 -0000 1.11
@@ -122,227 +122,227 @@
SWFStream s(&fakeIn);
- check_equals(s.get_position(), 0);
+ check_equals(s.tell(), 0);
s.align();
- check_equals(s.get_position(), 0);
+ check_equals(s.tell(), 0);
ret = s.read_uint(1); check_equals(ret, 1);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 0);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 1);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 0);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 1);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 0);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 1);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(1); check_equals(ret, 0);
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
/// bits: 10101010 (0xAA)
s.align();
// align just marks all bits in current byte as used, but doesn't read
more
- check_equals(s.get_position(), 1);
+ check_equals(s.tell(), 1);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 2);
+ check_equals(s.tell(), 2);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 2);
+ check_equals(s.tell(), 2);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 2);
+ check_equals(s.tell(), 2);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 2);
+ check_equals(s.tell(), 2);
/// bits: 10101010 (0xAA)
s.align();
// align just marks all bits in current byte as used, but doesn't read
more
- check_equals(s.get_position(), 2);
+ check_equals(s.tell(), 2);
ret = s.read_uint(3); check_equals(ret, 5);
- check_equals(s.get_position(), 3);
+ check_equals(s.tell(), 3);
ret = s.read_uint(3); check_equals(ret, 2);
- check_equals(s.get_position(), 3);
+ check_equals(s.tell(), 3);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 3);
+ check_equals(s.tell(), 3);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 3);
+ check_equals(s.tell(), 3);
ret = s.read_uint(3); check_equals(ret, 5);
- check_equals(s.get_position(), 4);
+ check_equals(s.tell(), 4);
ret = s.read_uint(2); check_equals(ret, 1);
- check_equals(s.get_position(), 4);
+ check_equals(s.tell(), 4);
ret = s.read_uint(3); check_equals(ret, 2);
- check_equals(s.get_position(), 4);
+ check_equals(s.tell(), 4);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 4);
+ check_equals(s.tell(), 4);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 5);
+ check_equals(s.tell(), 5);
ret = s.read_uint(3); check_equals(ret, 5);
- check_equals(s.get_position(), 5);
+ check_equals(s.tell(), 5);
ret = s.read_uint(3); check_equals(ret, 2);
- check_equals(s.get_position(), 5);
+ check_equals(s.tell(), 5);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 5);
+ check_equals(s.tell(), 5);
ret = s.read_uint(4); check_equals(ret, 10);
- check_equals(s.get_position(), 6);
+ check_equals(s.tell(), 6);
ret = s.read_uint(4); check_equals(ret, 10);
- check_equals(s.get_position(), 6);
+ check_equals(s.tell(), 6);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 6);
+ check_equals(s.tell(), 6);
ret = s.read_uint(5); check_equals(ret, 21);
- check_equals(s.get_position(), 7);
+ check_equals(s.tell(), 7);
ret = s.read_uint(3); check_equals(ret, 2);
- check_equals(s.get_position(), 7);
+ check_equals(s.tell(), 7);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 7);
+ check_equals(s.tell(), 7);
ret = s.read_uint(3); check_equals(ret, 5);
- check_equals(s.get_position(), 8);
+ check_equals(s.tell(), 8);
ret = s.read_uint(5); check_equals(ret, 10);
- check_equals(s.get_position(), 8);
+ check_equals(s.tell(), 8);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 8);
+ check_equals(s.tell(), 8);
ret = s.read_uint(6); check_equals(ret, 42);
- check_equals(s.get_position(), 9);
+ check_equals(s.tell(), 9);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 9);
+ check_equals(s.tell(), 9);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 9);
+ check_equals(s.tell(), 9);
ret = s.read_uint(2); check_equals(ret, 2);
- check_equals(s.get_position(), 10);
+ check_equals(s.tell(), 10);
ret = s.read_uint(6); check_equals(ret, 42);
- check_equals(s.get_position(), 10);
+ check_equals(s.tell(), 10);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 10);
+ check_equals(s.tell(), 10);
ret = s.read_uint(7); check_equals(ret, 85);
- check_equals(s.get_position(), 11);
+ check_equals(s.tell(), 11);
ret = s.read_uint(1); check_equals(ret, 0);
- check_equals(s.get_position(), 11);
+ check_equals(s.tell(), 11);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 11);
+ check_equals(s.tell(), 11);
ret = s.read_uint(1); check_equals(ret, 1);
- check_equals(s.get_position(), 12);
+ check_equals(s.tell(), 12);
ret = s.read_uint(7); check_equals(ret, 42);
- check_equals(s.get_position(), 12);
+ check_equals(s.tell(), 12);
/// bits: 10101010 (0xAA)
s.align();
- check_equals(s.get_position(), 12);
+ check_equals(s.tell(), 12);
ret = s.read_uint(8); check_equals(ret, 170);
- check_equals(s.get_position(), 13);
+ check_equals(s.tell(), 13);
/// bits: 10101 01010 10101 0 (0xAAAA)
s.align();
- check_equals(s.get_position(), 13);
+ check_equals(s.tell(), 13);
ret = s.read_uint(5); check_equals(ret, 21);
- check_equals(s.get_position(), 14);
+ check_equals(s.tell(), 14);
ret = s.read_uint(5); check_equals(ret, 10);
- check_equals(s.get_position(), 15);
+ check_equals(s.tell(), 15);
ret = s.read_uint(5); check_equals(ret, 21);
- check_equals(s.get_position(), 15);
+ check_equals(s.tell(), 15);
/// bits: 101010 101 0101010 (0xAAAA)
s.align();
- check_equals(s.get_position(), 15);
+ check_equals(s.tell(), 15);
ret = s.read_uint(6); check_equals(ret, 42);
- check_equals(s.get_position(), 16);
+ check_equals(s.tell(), 16);
ret = s.read_uint(3); check_equals(ret, 5);
- check_equals(s.get_position(), 17);
+ check_equals(s.tell(), 17);
ret = s.read_uint(7); check_equals(ret, 42);
- check_equals(s.get_position(), 17);
+ check_equals(s.tell(), 17);
/// bits: 1010101010101010 (0xAAAA)
s.align();
- check_equals(s.get_position(), 17);
+ check_equals(s.tell(), 17);
ret = s.read_uint(16); check_equals(ret, 43690);
- check_equals(s.get_position(), 19);
+ check_equals(s.tell(), 19);
/// bits: 101010 10101010101010 1010 (0xAAAAAA)
s.align();
- check_equals(s.get_position(), 19);
+ check_equals(s.tell(), 19);
ret = s.read_uint(6); check_equals(ret, 42);
- check_equals(s.get_position(), 20);
+ check_equals(s.tell(), 20);
ret = s.read_uint(14); check_equals(ret, 10922);
- check_equals(s.get_position(), 22);
+ check_equals(s.tell(), 22);
ret = s.read_uint(4); check_equals(ret, 10);
- check_equals(s.get_position(), 22);
+ check_equals(s.tell(), 22);
/// bits: 101010101010101010101010 (0xAAAAAA)
s.align();
- check_equals(s.get_position(), 22);
+ check_equals(s.tell(), 22);
ret = s.read_uint(24); check_equals(ret, 11184810);
- check_equals(s.get_position(), 25);
+ check_equals(s.tell(), 25);
/// bits: 1010101010101010 (0xAAAA)
s.align();
- check_equals(s.get_position(), 25);
+ check_equals(s.tell(), 25);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 26);
+ check_equals(s.tell(), 26);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
}
@@ -350,37 +350,37 @@
/// bits: 10011001 (0x99)
br.setByte(0x99);
SWFStream s(&fakeIn);
- s.set_position(27);
+ s.seek(27);
s.align();
- check_equals(s.get_position(), 27);
+ check_equals(s.tell(), 27);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 0);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 28);
+ check_equals(s.tell(), 28);
/// bits: 10011001 10011001 (0x999999)
boost::int16_t s16 = s.read_s16(); check_equals(s16,
(boost::int16_t)0x9999);
- check_equals(s.get_position(), 30);
+ check_equals(s.tell(), 30);
boost::uint16_t u16 = s.read_u16(); check_equals(u16,
(boost::uint16_t)0x9999);
- check_equals(s.get_position(), 32);
+ check_equals(s.tell(), 32);
boost::int32_t s32 = s.read_s32(); check_equals(s32,
(boost::int32_t)0x99999999);
- check_equals(s.get_position(), 36);
+ check_equals(s.tell(), 36);
boost::uint32_t u32 = s.read_u32(); check_equals(u32,
(boost::uint32_t)0x99999999);
- check_equals(s.get_position(), 40);
+ check_equals(s.tell(), 40);
/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
/// -
@@ -388,13 +388,13 @@
/// --------
s.align();
- check_equals(s.get_position(), 40);
+ check_equals(s.tell(), 40);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 41);
+ check_equals(s.tell(), 41);
u16 = s.read_uint(17); check_equals(u16, 26214);
- check_equals(s.get_position(), 43);
+ check_equals(s.tell(), 43);
u16 = s.read_uint(7); check_equals(u16, 51);
- check_equals(s.get_position(), 44);
+ check_equals(s.tell(), 44);
/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
/// -
@@ -402,13 +402,13 @@
/// ----------
s.align();
- check_equals(s.get_position(), 44);
+ check_equals(s.tell(), 44);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 45);
+ check_equals(s.tell(), 45);
u16 = s.read_uint(15); check_equals(u16, 6553);
- check_equals(s.get_position(), 46);
+ check_equals(s.tell(), 46);
u16 = s.read_uint(9); check_equals(u16, 307);
- check_equals(s.get_position(), 48);
+ check_equals(s.tell(), 48);
/// bits: 10011001 10011001 10011001 10011001 (0x99999999)
/// -
@@ -417,54 +417,54 @@
/// ---
s.align();
- check_equals(s.get_position(), 48);
+ check_equals(s.tell(), 48);
ret = s.read_bit(); check_equals(ret, 1);
- check_equals(s.get_position(), 49);
+ check_equals(s.tell(), 49);
u32 = s.read_uint(18); check_equals(u32, 52428);
- check_equals(s.get_position(), 51);
+ check_equals(s.tell(), 51);
u16 = s.read_uint(10); check_equals(u16, 819);
- check_equals(s.get_position(), 52);
+ check_equals(s.tell(), 52);
u16 = s.read_uint(3); check_equals(u16, 1);
- check_equals(s.get_position(), 52);
+ check_equals(s.tell(), 52);
// Test some seeking here...
- s.set_position(52);
- check_equals(s.get_position(), 52);
- s.set_position(0);
- check_equals(s.get_position(), 0);
- s.set_position(325);
- check_equals(s.get_position(), 325);
+ s.seek(52);
+ check_equals(s.tell(), 52);
+ s.seek(0);
+ check_equals(s.tell(), 0);
+ s.seek(325);
+ check_equals(s.tell(), 325);
s.read_bit(); // might trigger caching
- check_equals(s.get_position(), 326);
- s.set_position(372); // might seek in cache
- check_equals(s.get_position(), 372);
- s.set_position(327); // might seek in cache
- check_equals(s.get_position(), 327);
- s.set_position(326); // might seek in cache
- check_equals(s.get_position(), 326);
+ check_equals(s.tell(), 326);
+ s.seek(372); // might seek in cache
+ check_equals(s.tell(), 372);
+ s.seek(327); // might seek in cache
+ check_equals(s.tell(), 327);
+ s.seek(326); // might seek in cache
+ check_equals(s.tell(), 326);
- s.set_position(512);
+ s.seek(512);
for (int i=0; i<512; ++i)
{
s.read_uint(8); // read_uint triggers caching (or should)
}
- check_equals(s.get_position(), 1024);
- s.set_position(512); // seek to origin
- check_equals(s.get_position(), 512);
-
- s.set_position(1000); // seek back (-45)
- check_equals(s.get_position(), 1000);
- s.set_position(200); // long seek back (-800)
- check_equals(s.get_position(), 200);
- s.set_position(220); // short seek forw (+20)
- check_equals(s.get_position(), 220);
- s.set_position(2000);
+ check_equals(s.tell(), 1024);
+ s.seek(512); // seek to origin
+ check_equals(s.tell(), 512);
+
+ s.seek(1000); // seek back (-45)
+ check_equals(s.tell(), 1000);
+ s.seek(200); // long seek back (-800)
+ check_equals(s.tell(), 200);
+ s.seek(220); // short seek forw (+20)
+ check_equals(s.tell(), 220);
+ s.seek(2000);
s.read_uint(4);
- check_equals(s.get_position(), 2001);
- s.set_position(1960);
- check_equals(s.get_position(), 1960);
+ check_equals(s.tell(), 2001);
+ s.seek(1960);
+ check_equals(s.tell(), 1960);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/IOChannel.h libbase/Loa...,
Sandro Santilli <=