sockets documentation and cleanup

[chaz/yoink] / src / ErrorHandler.cc

diff --git a/src/ErrorHandler.cc b/src/ErrorHandler.cc
index 07bd6d7d6c1d34330eef9e070ac289cf7e5af0dc..d027956f046b597819218cb72f1d74b04f6be51d 100644 (file)
--- a/src/ErrorHandler.cc
+++ b/src/ErrorHandler.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <sstream>
 
@@ -54,6 +37,11 @@ std::string getErrorString(const Mf::Error& error)
                        str += ") could not be found.";
                        return str;
 
+               case Mf::Error::OPENAL_INIT:
+                       str += "The audio library returned an error: ";
+                       str += error.what();
+                       return str;
+
                case Mf::Error::RESOURCE_NOT_FOUND:
                        str += "A required resource (";
                        str += error.what();
@@ -66,7 +54,7 @@ std::string getErrorString(const Mf::Error& error)
                        return str;
 
                case Mf::Error::SDL_VIDEOMODE:
-                       str += "An error occurred while trying to set up the video mode.";
+                       str += "An error occurred while trying to set up the graphics.";
                        return str;
 
                case Mf::Error::UNKNOWN_AUDIO_FORMAT:
@@ -87,6 +75,3 @@ std::string getErrorString(const Mf::Error& error)
        return stream.str();
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-