From 46cd84aac56f2a396845cd2caec8e9d6596b9c65 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 16 Mar 2012 23:59:21 -0700
Subject: [PATCH] Add a skeleton ffmpeg decoder

---
 apps/openmw/CMakeLists.txt             |  2 +-
 apps/openmw/mwsound/ffmpeg_decoder.cpp | 29 +++++++++++++++++++++++
 apps/openmw/mwsound/ffmpeg_decoder.hpp | 32 ++++++++++++++++++++++++++
 apps/openmw/mwsound/mpgsnd_decoder.cpp |  4 ++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 apps/openmw/mwsound/ffmpeg_decoder.cpp
 create mode 100644 apps/openmw/mwsound/ffmpeg_decoder.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index bb7655a3c5..749b5bc5dd 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -38,7 +38,7 @@ add_openmw_dir (mwscript
     )
 
 add_openmw_dir (mwsound
-    soundmanager openal_output mpgsnd_decoder
+    soundmanager openal_output mpgsnd_decoder ffmpeg_decoder
     )
 
 add_openmw_dir (mwworld
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
new file mode 100644
index 0000000000..8bd6b3f8e1
--- /dev/null
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -0,0 +1,29 @@
+#ifdef OPENMW_USE_FFMPEG
+
+#include "ffmpeg_decoder.hpp"
+
+
+namespace MWSound
+{
+
+bool FFmpeg_Decoder::Open(const std::string &fname)
+{
+    return false;
+}
+
+void FFmpeg_Decoder::Close()
+{
+}
+
+
+FFmpeg_Decoder::FFmpeg_Decoder()
+{
+}
+
+FFmpeg_Decoder::~FFmpeg_Decoder()
+{
+}
+
+}
+
+#endif
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
new file mode 100644
index 0000000000..2b7363f26a
--- /dev/null
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -0,0 +1,32 @@
+#ifndef GAME_SOUND_FFMPEG_DECODER_H
+#define GAME_SOUND_FFMPEG_DECODER_H
+
+#include <string>
+
+extern "C"
+{
+#include <avcodec.h>
+#include <avformat.h>
+}
+
+#include "sound_decoder.hpp"
+
+
+namespace MWSound
+{
+    class FFmpeg_Decoder : public Sound_Decoder
+    {
+        virtual bool Open(const std::string &fname);
+        virtual void Close();
+
+        FFmpeg_Decoder();
+        virtual ~FFmpeg_Decoder();
+
+        friend class SoundManager;
+    };
+#ifndef DEFAULT_DECODER
+#define DEFAULT_DECODER (::MWSound::FFmpeg_Decoder)
+#endif
+};
+
+#endif
diff --git a/apps/openmw/mwsound/mpgsnd_decoder.cpp b/apps/openmw/mwsound/mpgsnd_decoder.cpp
index cdc392e703..6ca46381dc 100644
--- a/apps/openmw/mwsound/mpgsnd_decoder.cpp
+++ b/apps/openmw/mwsound/mpgsnd_decoder.cpp
@@ -1,3 +1,5 @@
+#ifdef OPENMW_USE_MPG123
+
 #include "mpgsnd_decoder.hpp"
 
 
@@ -27,3 +29,5 @@ MpgSnd_Decoder::~MpgSnd_Decoder()
 }
 
 }
+
+#endif