diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp index 66b7e09e3..651982344 100644 --- a/apps/openmw/mwsound/ffmpeg_decoder.cpp +++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp @@ -389,16 +389,6 @@ void FFmpeg_Decoder::readAll(std::vector &output) } } -void FFmpeg_Decoder::rewind() -{ - int stream_idx = mStream - mFormatCtx->streams; - if(av_seek_frame(mFormatCtx, stream_idx, 0, 0) < 0) - fail("Failed to seek in audio stream"); - av_free_packet(&mPacket); - mFrameSize = mFramePos = 0; - mNextPts = 0.0; -} - size_t FFmpeg_Decoder::getSampleOffset() { int delay = (mFrameSize-mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout) / diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp index b27e60c9f..cc553b161 100644 --- a/apps/openmw/mwsound/ffmpeg_decoder.hpp +++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp @@ -74,7 +74,6 @@ namespace MWSound virtual size_t read(char *buffer, size_t bytes); virtual void readAll(std::vector &output); - virtual void rewind(); virtual size_t getSampleOffset(); void fail(const std::string &msg); diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp index 554b62d26..af9932f74 100644 --- a/apps/openmw/mwsound/movieaudiofactory.cpp +++ b/apps/openmw/mwsound/movieaudiofactory.cpp @@ -27,7 +27,6 @@ namespace MWSound virtual void open(const std::string &fname); virtual void close(); - virtual void rewind(); virtual std::string getName(); virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type); virtual size_t read(char *buffer, size_t bytes); @@ -102,7 +101,6 @@ namespace MWSound throw std::runtime_error("unimplemented"); } void MWSoundDecoderBridge::close() {} - void MWSoundDecoderBridge::rewind() {} std::string MWSoundDecoderBridge::getName() { diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp index 1be9dd374..34bae87d7 100644 --- a/apps/openmw/mwsound/sound_decoder.hpp +++ b/apps/openmw/mwsound/sound_decoder.hpp @@ -42,7 +42,6 @@ namespace MWSound virtual size_t read(char *buffer, size_t bytes) = 0; virtual void readAll(std::vector &output); - virtual void rewind() = 0; virtual size_t getSampleOffset() = 0; Sound_Decoder(const VFS::Manager* resourceMgr) : mResourceMgr(resourceMgr)