Added Stream input method to sound interfaces (not implemented, NOT TESTED YET)

sound/imp/audiere_imp.cpp

@@ -27,6 +27,7 @@ AudiereManager::AudiereManager()
   canRepeatStream = true;
   canLoadFile = true;
   canLoadSource = false;
+  canLoadStream = false;
 
   device = OpenDevice("");
 

sound/imp/audiere_imp.h

@@ -19,6 +19,10 @@ class AudiereManager : public Manager
 
   virtual Sound *load(const std::string &file, bool stream=false);
 
+  /// not implemented yet
+  virtual Sound *load(Stream::InputStream *input, bool stream=false)
+    { assert(0); }
+
   /// disabled
   virtual Sound *load(InputSource *input, bool stream=false)
     { assert(0); }

sound/imp/input_ffmpeg.cpp

@@ -32,6 +32,8 @@ FFM_InputManager::FFM_InputManager()
       av_log_set_level(AV_LOG_ERROR);
       init = true;
     }
+
+  canLoadStream = false;
 }
 
 InputSource *FFM_InputManager::load(const std::string &file)

sound/imp/input_ffmpeg.h

@@ -34,6 +34,9 @@ class FFM_InputManager : public InputManager
  public:
   FFM_InputManager();
   virtual InputSource *load(const std::string &file);
+
+  /// not supported
+  virtual InputSource *load(Stream::InputStream *input) { assert(0); }
 };
 
 /// FFMpeg implementation of InputSource

sound/imp/input_filter.h

@@ -43,26 +43,31 @@ class InputFilter : public Manager
 
   /// Assign an input manager and a sound manager to this object
   void set(Manager *_snd, InputManager *_inp)
-    {
-      inp = _inp;
-      snd = _snd;
-
-      needsUpdate = snd->needsUpdate;
-      has3D = snd->has3D;
-      canRepeatStream = snd->canRepeatStream;
-
-      // Both these should be true, or the use of this class is pretty
-      // pointless
-      canLoadSource = snd->canLoadSource;
-      canLoadFile = canLoadSource;
-      assert(canLoadSource && canLoadFile);
-    }
+  {
+    inp = _inp;
+    snd = _snd;
+
+    // Set capabilities
+    needsUpdate = snd->needsUpdate;
+    has3D = snd->has3D;
+    canRepeatStream = snd->canRepeatStream;
+    canLoadStream = inp->canLoadStream;
+
+    // Both these should be true, or the use of this class is pretty
+    // pointless
+    canLoadSource = snd->canLoadSource;
+    canLoadFile = canLoadSource;
+    assert(canLoadSource && canLoadFile);
+  }
 
   virtual Sound *load(const std::string &file, bool stream=false)
-    { return load(inp->load(file), stream); }
+  { return load(inp->load(file), stream); }
+
+  virtual Sound *load(Stream::InputStream *input, bool stream=false)
+  { return load(inp->load(input), stream); }
 
   virtual Sound *load(InputSource *input, bool stream=false)
-    { return snd->load(input, stream); }
+  { return snd->load(input, stream); }
 
   virtual void update() { snd->update(); }
   virtual void setListenerPos(float x, float y, float z,

sound/imp/output_openal.cpp

@@ -97,6 +97,9 @@ OpenAL_Manager::~OpenAL_Manager()
 Sound *OpenAL_Manager::load(const std::string &file, bool stream)
 { assert(0 && "OpenAL cannot decode files"); }
 
+Sound *OpenAL_Manager::load(Stream::InputStream*,bool)
+{ assert(0 && "OpenAL cannot decode streams"); }
+
 Sound *OpenAL_Manager::load(InputSource *source, bool stream)
 { return new OpenAL_Sound(source, this, stream); }
 

sound/imp/output_openal.h

@@ -26,6 +26,7 @@ public:
   void remove_stream(LST::iterator);
 
   virtual Sound *load(const std::string &file, bool stream=false);
+  virtual Sound *load(Stream::InputStream *input, bool stream=false);
   virtual Sound *load(InputSource* input, bool stream=false);
   virtual void update();
   virtual void setListenerPos(float x, float y, float z,

sound/input.h

@@ -4,6 +4,8 @@
 #include <string>
 #include <stdint.h>
 
+#include "../stream/input.h"
+
 namespace Mangle {
 namespace Sound {
 
@@ -64,9 +66,15 @@ class InputSource
 class InputManager
 {
  public:
+  /// If true, the stream version of load() works
+  bool canLoadStream;
+
   /// Load a sound input source from file
   virtual InputSource *load(const std::string &file) = 0;
 
+  /// Load a sound input source from stream (if canLoadStream is true)
+  virtual InputSource *load(Stream::InputStream *input) = 0;
+
   /// Virtual destructor
   virtual ~InputManager() {}
 };

sound/sound.h

@@ -4,6 +4,8 @@
 #include <string>
 #include "input.h"
 
+#include "../stream/input.h"
+
 namespace Mangle {
 namespace Sound {
 
@@ -115,6 +117,9 @@ class Manager
   /// true if we can load sounds from an InputSource
   bool canLoadSource;
 
+  /// If true, we can lound sound files from a Stream
+  bool canLoadStream;
+
   /**
      @brief Load a sound from an input source. Only valid if
      canLoadSource is true.
@@ -132,6 +137,16 @@ class Manager
   */
   virtual Sound *load(InputSource *input, bool stream=false) = 0;
 
+  /**
+     @brief Load a sound directly from file. Only valid if canLoadStream
+     is true.
+
+     @param input audio file stream
+     @param stream true if the file should be streamed
+     @see load(InputSource*,bool)
+  */
+  virtual Sound *load(Stream::InputStream *input, bool stream=false) = 0;
+
   /**
      @brief Load a sound directly from file. Only valid if canLoadFile
      is true.