mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-31 15:06:41 +00:00
Code Issues Releases Wiki Activity

fixed ogre resource functions

Browse source
This commit is contained in:
scrawl 2012-12-14 00:10:54 +01:00
parent 43481ad117
commit 9d6f656822
1 changed files with 19 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
apps/openmw/mwrender/videoplayer.cpp
View file

@ -11,54 +11,37 @@
namespace MWRender namespace MWRender
{ {
int OgreResource_Read(void *opaque, uint8_t *buf, int buf_size) int OgreResource_Read(void *user_data, uint8_t *buf, int buf_size)
{ {
Ogre::DataStreamPtr stream = static_cast<VideoState*>(opaque)->stream; Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
return stream->read(buf, buf_size);
int num_read = stream->size() - stream->tell();
if (num_read > buf_size)
num_read = buf_size;
stream->read(buf, num_read);
return num_read;
} }
int OgreResource_Write(void *opaque, uint8_t *buf, int buf_size) int OgreResource_Write(void *user_data, uint8_t *buf, int buf_size)
{ {
Ogre::DataStreamPtr stream = static_cast<VideoState*>(opaque)->stream; Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
return stream->write(buf, buf_size);
int num_write = stream->size() - stream->tell();
if (num_write > buf_size)
num_write = buf_size;
stream->write (buf, num_write);
return num_write;
} }
int64_t OgreResource_Seek(void *opaque, int64_t offset, int whence) int64_t OgreResource_Seek(void *user_data, int64_t offset, int whence)
{ {
Ogre::DataStreamPtr stream = static_cast<VideoState*>(opaque)->stream; Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
switch (whence) whence &= ~AVSEEK_FORCE;
{ if(whence == AVSEEK_SIZE)
case SEEK_SET:
stream->seek(offset);
case SEEK_CUR:
stream->seek(stream->tell() + offset);
case SEEK_END:
stream->seek(stream->size() + offset);
case AVSEEK_SIZE:
return stream->size(); return stream->size();
default: if(whence == SEEK_SET)
stream->seek(offset);
else if(whence == SEEK_CUR)
stream->seek(stream->tell()+offset);
else if(whence == SEEK_END)
stream->seek(stream->size()+offset);
else
return -1; return -1;
}
return stream->tell(); return stream->tell();
} }
void packet_queue_init(PacketQueue *q) void packet_queue_init(PacketQueue *q)
{ memset(q, 0, sizeof(PacketQueue)); } { memset(q, 0, sizeof(PacketQueue)); }