From 7345f2307f3ce6682a4044b98a811fac2cb7c4f0 Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Mon, 13 Sep 2010 10:52:26 +0200
Subject: [PATCH] Improved OpenAL includes. Hacked std_stream to make seek()
 able to recover from eof().

---
 sound/outputs/openal_out.cpp  | 12 ++++++++++--
 stream/servers/std_stream.hpp |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sound/outputs/openal_out.cpp b/sound/outputs/openal_out.cpp
index d0ce47718c..bce08d02f9 100644
--- a/sound/outputs/openal_out.cpp
+++ b/sound/outputs/openal_out.cpp
@@ -4,8 +4,16 @@
 
 #include "../../stream/filters/buffer_stream.hpp"
 
-#include "al.h"
-#include "alc.h"
+#ifdef _WIN32
+#include <al.h>
+#include <alc.h>
+#elif defined(__APPLE__)
+#include <OpenAL/alc.h>
+#include <OpenAL/al.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
 
 using namespace Mangle::Sound;
 
diff --git a/stream/servers/std_stream.hpp b/stream/servers/std_stream.hpp
index 68aca621ba..163f023f60 100644
--- a/stream/servers/std_stream.hpp
+++ b/stream/servers/std_stream.hpp
@@ -36,6 +36,7 @@ class StdStream : public Stream
 
   void seek(size_t pos)
   {
+    inf->clear();
     inf->seekg(pos);
     if(inf->fail())
       fail("seek error");