From dfec8f9568d11c432038d55f3ceb35d59614777d Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 17 Nov 2012 23:29:56 +0200
Subject: [PATCH] Use standard exception classes

---
 source/context.cpp |  4 ++--
 source/device.cpp  |  6 +++---
 source/jukebox.cpp |  4 ++--
 source/sound.cpp   | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/context.cpp b/source/context.cpp
index 14f607c..4c9b77c 100644
--- a/source/context.cpp
+++ b/source/context.cpp
@@ -1,4 +1,4 @@
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "context.h"
 #include "device.h"
 
@@ -9,7 +9,7 @@ Context::Context(Device &dev)
 {
 	context = alcCreateContext(dev.get_device(), 0);
 	if(!context)
-		throw Exception("Couldn't create OpenAL context");
+		throw std::runtime_error("Couldn't create OpenAL context");
 
 	alcMakeContextCurrent(context);
 }
diff --git a/source/device.cpp b/source/device.cpp
index 63e87a9..c866b32 100644
--- a/source/device.cpp
+++ b/source/device.cpp
@@ -1,4 +1,4 @@
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "device.h"
 
 using namespace std;
@@ -10,14 +10,14 @@ Device::Device()
 {
 	dev = alcOpenDevice(0);
 	if(!dev)
-		throw Exception("Couldn't get OpenAL device");
+		throw runtime_error("Couldn't get OpenAL device");
 }
 
 Device::Device(const string &spec)
 {
 	dev = alcOpenDevice(spec.c_str());
 	if(!dev)
-		throw Exception("Couldn't get OpenAL device");
+		throw runtime_error("Couldn't get OpenAL device");
 }
 
 Device::~Device()
diff --git a/source/jukebox.cpp b/source/jukebox.cpp
index da2bcbb..d2a997d 100644
--- a/source/jukebox.cpp
+++ b/source/jukebox.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstdlib>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "jukebox.h"
 #include "sound.h"
 
@@ -56,7 +56,7 @@ void Jukebox::clear_tracks()
 const string &Jukebox::get_current_track() const
 {
 	if(tracks.empty())
-		throw InvalidState("No current track");
+		throw logic_error("No current track");
 	return *current_track;
 }
 
diff --git a/source/sound.cpp b/source/sound.cpp
index 947f6d1..f43948e 100644
--- a/source/sound.cpp
+++ b/source/sound.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "sound.h"
 
 using namespace std;
@@ -81,9 +81,9 @@ Sound::~Sound()
 void Sound::open_file(const string &fn)
 {
 	if(ovfile.datasource)
-		throw InvalidState("Sound has already been opened");
+		throw logic_error("Sound has already been opened");
 	if(ov_fopen(const_cast<char *>(fn.c_str()), &ovfile)<0)
-		throw Exception("Could not open ogg vorbis file "+fn);
+		throw runtime_error("Could not open ogg vorbis file "+fn);
 
 	open_common();
 }
@@ -91,13 +91,13 @@ void Sound::open_file(const string &fn)
 void Sound::open_memory(const void *d, unsigned len)
 {
 	if(ovfile.datasource)
-		throw InvalidState("Sound has already been opened");
+		throw logic_error("Sound has already been opened");
 
 	MemorySource *src = new MemorySource(d, len);
 	if(ov_open_callbacks(src, &ovfile, 0, 0, memory_callbacks)<0)
 	{
 		delete src;
-		throw Exception("Could not open ogg vorbis memory block");
+		throw runtime_error("Could not open ogg vorbis memory block");
 	}
 
 	open_common();
@@ -106,7 +106,7 @@ void Sound::open_memory(const void *d, unsigned len)
 void Sound::load_data()
 {
 	if(data)
-		throw InvalidState("Data has already been loaded");
+		throw logic_error("Data has already been loaded");
 
 	size = ov_pcm_total(&ovfile, 0)*4;
 	char *dptr = new char[size];
@@ -160,19 +160,19 @@ unsigned Sound::read(char *buf, unsigned len)
 		int section = 0;
 		int res = ov_read(&ovfile, buf, len, 0, 2, 1, &section);
 		if(res<0)
-			throw Exception("Error reading ogg vorbis file");
+			throw runtime_error("Error reading ogg vorbis file");
 		else if(res==0)
 			eof_flag = true;
 		return res;
 	}
 	else
-		throw InvalidState("No data available");
+		throw logic_error("No data available");
 }
 
 const char *Sound::get_data() const
 {
 	if(!data)
-		throw InvalidState("Data has not been loaded");
+		throw logic_error("Data has not been loaded");
 	return data;
 }
 
@@ -187,7 +187,7 @@ void Sound::open_common()
 	{
 	case 1: format = MONO16; break;
 	case 2: format = STEREO16; break;
-	default: throw Exception("Unsupported number of channels");
+	default: throw runtime_error("Unsupported number of channels");
 	}
 }
 
-- 
2.45.2