--- linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.h	2006/06/27 22:53:17	879
+++ linuxsampler/trunk/src/drivers/audio/AudioOutputDevice.h	2006/06/27 22:57:37	880
@@ -3,7 +3,7 @@
  *   LinuxSampler - modular, streaming capable sampler                     *
  *                                                                         *
  *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
- *   Copyright (C) 2005 Christian Schoenebeck                              *
+ *   Copyright (C) 2005, 2006 Christian Schoenebeck                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -30,7 +30,7 @@
 #include <stdexcept>
 
 #include "../../common/global.h"
-#include "../../common/LinuxSamplerException.h"
+#include "../../common/Exception.h"
 #include "../Device.h"
 #include "../DeviceParameter.h"
 #include "../../engines/common/Engine.h"
@@ -67,7 +67,7 @@
                     virtual bool   Mandatory();
                     virtual std::map<String,DeviceCreationParameter*> DependsAsParameters();
                     virtual optional<bool> DefaultAsBool(std::map<String,String> Parameters);
-                    virtual void OnSetValue(bool b) throw (LinuxSamplerException);
+                    virtual void OnSetValue(bool b) throw (Exception);
                     static String Name();
             };
 
@@ -87,7 +87,7 @@
                     virtual optional<int>    RangeMinAsInt(std::map<String,String> Parameters);
                     virtual optional<int>    RangeMaxAsInt(std::map<String,String> Parameters);
                     virtual std::vector<int> PossibilitiesAsInt(std::map<String,String> Parameters);
-                    virtual void             OnSetValue(int i) throw (LinuxSamplerException);
+                    virtual void             OnSetValue(int i) throw (Exception);
                     static String Name();
             };
 
@@ -108,7 +108,7 @@
                     virtual optional<int>    RangeMinAsInt(std::map<String,String> Parameters);
                     virtual optional<int>    RangeMaxAsInt(std::map<String,String> Parameters);
                     virtual std::vector<int> PossibilitiesAsInt(std::map<String,String> Parameters);
-                    virtual void             OnSetValue(int i) throw (LinuxSamplerException);
+                    virtual void             OnSetValue(int i) throw (Exception);
                     static String Name();
             };
 
@@ -279,9 +279,9 @@
      * (which should be done in the constructor of the AudioOutputDevice
      * descendant).
      */
-    class AudioOutputException : public LinuxSamplerException {
+    class AudioOutputException : public Exception {
         public:
-            AudioOutputException(const std::string& msg) : LinuxSamplerException(msg) {}
+            AudioOutputException(const std::string& msg) : Exception(msg) {}
     };
 }