From 9c831d303983c5bf77f92ec05d7f1ae8555ed1d9 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 12 Dec 2012 22:19:44 -0800
Subject: [PATCH] Add a decoder method to get the "file" name

---
 apps/openmw/mwsound/audiere_decoder.cpp | 11 ++++++++++-
 apps/openmw/mwsound/audiere_decoder.hpp |  1 +
 apps/openmw/mwsound/ffmpeg_decoder.cpp  |  5 +++++
 apps/openmw/mwsound/ffmpeg_decoder.hpp  |  1 +
 apps/openmw/mwsound/mpgsnd_decoder.cpp  |  5 +++++
 apps/openmw/mwsound/sound_decoder.hpp   |  1 +
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/audiere_decoder.cpp b/apps/openmw/mwsound/audiere_decoder.cpp
index 4e73573a7..c9b3d11d1 100644
--- a/apps/openmw/mwsound/audiere_decoder.cpp
+++ b/apps/openmw/mwsound/audiere_decoder.cpp
@@ -53,6 +53,9 @@ public:
       : mStream(stream), refs(1)
     { }
     virtual ~OgreFile() { }
+
+    Ogre::String getName()
+    { return mStream->getName(); }
 };
 
 
@@ -60,7 +63,7 @@ void Audiere_Decoder::open(const std::string &fname)
 {
     close();
 
-    audiere::FilePtr file(new OgreFile(mResourceMgr.openResource(fname)));
+    mSoundFile = audiere::FilePtr(new OgreFile(mResourceMgr.openResource(fname)));
     mSoundSource = audiere::OpenSampleSource(file);
 
     int channels, srate;
@@ -86,9 +89,15 @@ void Audiere_Decoder::open(const std::string &fname)
 
 void Audiere_Decoder::close()
 {
+    mSoundFile = NULL;
     mSoundSource = NULL;
 }
 
+std::string Audiere_Decoder::getName()
+{
+    return mSoundFile->getName();
+}
+
 void Audiere_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
     *samplerate = mSampleRate;
diff --git a/apps/openmw/mwsound/audiere_decoder.hpp b/apps/openmw/mwsound/audiere_decoder.hpp
index 0ad026d51..1e1528880 100644
--- a/apps/openmw/mwsound/audiere_decoder.hpp
+++ b/apps/openmw/mwsound/audiere_decoder.hpp
@@ -12,6 +12,7 @@ namespace MWSound
 {
     class Audiere_Decoder : public Sound_Decoder
     {
+        audiere::FilePtr mSoundFile;
         audiere::SampleSourcePtr mSoundSource;
         int mSampleRate;
         SampleType mSampleType;
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 9d5942111..6b3a7f9cd 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -324,6 +324,11 @@ void FFmpeg_Decoder::close()
     mDataStream.setNull();
 }
 
+std::string FFmpeg_Decoder::getName()
+{
+    return mFormatCtx->filename;
+}
+
 void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
     if(mStreams.empty())
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index a6e80fc9b..88115ce3f 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -36,6 +36,7 @@ namespace MWSound
         virtual void open(const std::string &fname);
         virtual void close();
 
+        virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
 
         virtual size_t read(char *buffer, size_t bytes);
diff --git a/apps/openmw/mwsound/mpgsnd_decoder.cpp b/apps/openmw/mwsound/mpgsnd_decoder.cpp
index 7f7a84889..4ec11b349 100644
--- a/apps/openmw/mwsound/mpgsnd_decoder.cpp
+++ b/apps/openmw/mwsound/mpgsnd_decoder.cpp
@@ -155,6 +155,11 @@ void MpgSnd_Decoder::close()
     mDataStream.setNull();
 }
 
+std::string MpgSnd_Decoder::getName()
+{
+    return mDataStream->getName();
+}
+
 void MpgSnd_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
     if(!mSndFile && !mMpgFile)
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index 9c28d5ff5..d228a5e98 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -29,6 +29,7 @@ namespace MWSound
         virtual void open(const std::string &fname) = 0;
         virtual void close() = 0;
 
+        virtual std::string getName() = 0;
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) = 0;
 
         virtual size_t read(char *buffer, size_t bytes) = 0;