--- linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.h	2005/02/26 02:01:14	411
+++ linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.h	2005/02/26 22:44:51	412
@@ -33,13 +33,13 @@
 #include "../../common/LinuxSamplerException.h"
 #include "../Device.h"
 #include "../DeviceParameter.h"
-#include "../../engines/common/EngineChannel.h"
+#include "../../engines/common/Engine.h"
 #include "AudioChannel.h"
 
 namespace LinuxSampler {
 
     // just symbol prototyping
-    class EngineChannel;
+    class Engine;
 
     /** Abstract base class for audio output drivers in LinuxSampler
      *
@@ -189,18 +189,18 @@
              * device and the engine will also automatically be informed
              * about the connection.
              *
-             * @param pEngineChannel - sampler engine channel
+             * @param pEngine - sampler engine
              */
-            void Connect(EngineChannel* pEngineChannel);
+            void Connect(Engine* pEngine);
 
             /**
              * Disconnect given sampler engine from this audio output device.
              * Removes given sampler engine reference from the Engines
              * container of this audio device.
              *
-             * @param pEngineChannel - sampler engine channel
+             * @param pEngine - sampler engine
              */
-            void Disconnect(EngineChannel* pEngineChannel);
+            void Disconnect(Engine* pEngine);
 
             /**
              * Returns audio channel with index \a ChannelIndex or NULL if
@@ -234,7 +234,7 @@
             std::map<String,DeviceCreationParameter*> DeviceParameters();
 
         protected:
-            std::set<EngineChannel*>                  EngineChannels; ///< All sampler engine channels that are connected to the audio output device.
+            std::set<Engine*>                         Engines;     ///< All sampler engines that are connected to the audio output device.
             std::vector<AudioChannel*>                Channels;    ///< All audio channels of the audio output device. This is just a container; the descendant has to create channels by himself.
             std::map<String,DeviceCreationParameter*> Parameters;  ///< All device parameters.