Add a rewind method to the sound decoder

apps/openmw/mwsound/ffmpeg_decoder.cpp

@@ -29,6 +29,10 @@ size_t FFmpeg_Decoder::read(char *buffer, size_t bytes)
     return 0;
 }
 
+void FFmpeg_Decoder::rewind()
+{
+    fail("Not currently working");
+}
 
 FFmpeg_Decoder::FFmpeg_Decoder()
 {

apps/openmw/mwsound/ffmpeg_decoder.hpp

@@ -20,7 +20,9 @@ namespace MWSound
         virtual void close();
 
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
+
         virtual size_t read(char *buffer, size_t bytes);
+        virtual void rewind();
 
         FFmpeg_Decoder();
         virtual ~FFmpeg_Decoder();

apps/openmw/mwsound/mpgsnd_decoder.cpp

@@ -109,6 +109,23 @@ size_t MpgSnd_Decoder::read(char *buffer, size_t bytes)
     return got;
 }
 
+void MpgSnd_Decoder::rewind()
+{
+    if(!mSndFile && !mMpgFile)
+        fail("No open file");
+
+    if(mSndFile)
+    {
+        if(sf_seek(mSndFile, 0, SEEK_SET) == -1)
+            fail("seek failed");
+    }
+    else if(mMpgFile)
+    {
+        if(mpg123_seek(mMpgFile, 0, SEEK_SET) < 0)
+            fail("seek failed");
+    }
+}
+
 MpgSnd_Decoder::MpgSnd_Decoder() : mSndFile(NULL), mMpgFile(NULL)
 {
     static bool initdone = false;

apps/openmw/mwsound/mpgsnd_decoder.hpp

@@ -23,7 +23,9 @@ namespace MWSound
         virtual void close();
 
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
+
         virtual size_t read(char *buffer, size_t bytes);
+        virtual void rewind();
 
         MpgSnd_Decoder();
     public:

apps/openmw/mwsound/openal_output.cpp

@@ -225,7 +225,8 @@ void OpenAL_SoundStream::stop()
     alSourceStop(mSource);
     alSourcei(mSource, AL_BUFFER, 0);
     throwALerror();
-    // FIXME: Rewind decoder
+
+    mDecoder->rewind();
 }
 
 bool OpenAL_SoundStream::isPlaying()

apps/openmw/mwsound/sound_decoder.hpp

@@ -27,7 +27,9 @@ namespace MWSound
         virtual void close() = 0;
 
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) = 0;
+
         virtual size_t read(char *buffer, size_t bytes) = 0;
+        virtual void rewind() = 0;
 
         virtual ~Sound_Decoder() { }