Renamed sound_pair to input_filter / InputFilter

sound/imp/input_filter.h

@@ -1,5 +1,5 @@
-#ifndef MANGLE_SOUND_PAIR_H
+#ifndef MANGLE_INPUT_FILTER_H
-#define MANGLE_SOUND_PAIR_H
+#define MANGLE_INPUT_FILTER_H
 
 #include "sound.h"
 
@@ -19,15 +19,15 @@ namespace Sound {
    Example:
    \code
 
-   // Combine FFmpeg input and OpenAL output. OpenAL cannot decode
+   // Add FFmpeg input to an OpenAL soud output manager. OpenAL cannot
-   // sound files on its own.
+   // decode sound files on its own.
-   SoundPairManager mg(new FFM_InputManager, new OpenAL_Manager);
+   InputFilter mg(new OpenAL_Manager, new FFM_InputManager);
 
    // We can now load filenames directly.
    mg.load("file1.mp3");
    \endcode
 */
-class PairManager : public Manager
+class InputFilter : public Manager
 {
  protected:
   Manager *snd;
@@ -35,14 +35,14 @@ class PairManager : public Manager
 
  public:
   /// Empty constructor
-  PairManager() {}
+  InputFilter() {}
 
   /// Assign an input manager and a sound manager to this object
-  PairManager(InputManager *_inp, Manager *_snd)
+  InputFilter(Manager *_snd, InputManager *_inp)
-    { set(_inp, _snd); }
+    { set(_snd, _inp); }
 
   /// Assign an input manager and a sound manager to this object
-  void set(InputManager *_inp, Manager *_snd)
+  void set(Manager *_snd, InputManager *_inp)
     {
       inp = _inp;
       snd = _snd;

sound/imp/openal_ffmpeg.h

@@ -1,7 +1,7 @@
 #ifndef MANGLE_FFMPEG_OPENAL_H
 #define MANGLE_FFMPEG_OPENAL_H
 
-#include "sound_pair.h"
+#include "input_filter.h"
 #include "input_ffmpeg.h"
 #include "output_openal.h"
 
@@ -9,13 +9,13 @@ namespace Mangle {
 namespace Sound {
 
 /// A PairManager filter that adds FFmpeg decoding to OpenAL
-class OpenAL_FFM_Manager : public PairManager
+class OpenAL_FFM_Manager : public InputFilter
 {
  public:
   OpenAL_FFM_Manager()
     {
-      set(new FFM_InputManager,
+      set(new OpenAL_Manager,
-          new OpenAL_Manager);
+          new FFM_InputManager);
     }
   ~OpenAL_FFM_Manager()
     {