From c9534076646cda63bdc9a94ce02067c4651926e3 Mon Sep 17 00:00:00 2001 From: Tuomas Virtanen Date: Mon, 2 Jul 2018 21:03:54 +0300 Subject: Code improvements to RWops seek function --- src/kitsource.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/kitsource.c') diff --git a/src/kitsource.c b/src/kitsource.c index 71a73b0..588f829 100644 --- a/src/kitsource.c +++ b/src/kitsource.c @@ -136,21 +136,17 @@ static int64_t _RWGetSize(SDL_RWops *rw_ops) { static int64_t _RWSeekCallback(void *userdata, int64_t offset, int whence) { int rw_whence = 0; - if(whence & AVSEEK_SIZE) return _RWGetSize(userdata); + if((whence & ~AVSEEK_FORCE) == SEEK_CUR) rw_whence = RW_SEEK_CUR; - if((whence & ~AVSEEK_FORCE) == SEEK_SET) + else if((whence & ~AVSEEK_FORCE) == SEEK_SET) rw_whence = RW_SEEK_SET; - if((whence & ~AVSEEK_FORCE) == SEEK_END) + else if((whence & ~AVSEEK_FORCE) == SEEK_END) rw_whence = RW_SEEK_END; - if(SDL_RWseek((SDL_RWops*)userdata, offset, rw_whence) < 0) { - return -1; - } - - return SDL_RWtell((SDL_RWops*)userdata); + return SDL_RWseek((SDL_RWops*)userdata, offset, rw_whence); } -- cgit v1.2.3