X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsound.cpp;h=c4a00efdedec278fa91c931b08e4054b12a487fe;hb=effcac6ee0bc2297eed8f00e0b04f78064090dd6;hp=8b6af20fcde8fe2c0ea22951a8d138c3dece0289;hpb=97dae493948466867b9f661f45e451711dd6b41b;p=libs%2Fal.git

diff --git a/source/sound.cpp b/source/sound.cpp
index 8b6af20..c4a00ef 100644
--- a/source/sound.cpp
+++ b/source/sound.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspal
-Copyright © 2008 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstring>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "sound.h"
 
 using namespace std;
@@ -24,36 +17,37 @@ struct MemorySource
 
 size_t memory_read(void *ptr, size_t size, size_t nmemb, void *src)
 {
-	MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
-	unsigned len=min(size*nmemb, memsrc.length-memsrc.pos);
+	MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
+	unsigned len = min<unsigned>(size*nmemb, memsrc.length-memsrc.pos);
 	memcpy(ptr, reinterpret_cast<const char *>(memsrc.data)+memsrc.pos, len);
-	memsrc.pos+=len;
+	memsrc.pos += len;
 
 	return len/size;
 }
 
 int memory_seek(void *src, ogg_int64_t offset, int whence)
 {
-	MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
+	MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
 	if(whence==SEEK_SET)
-		memsrc.pos=offset;
+		memsrc.pos = offset;
 	else if(whence==SEEK_CUR)
-		memsrc.pos+=offset;
+		memsrc.pos += offset;
 	else if(whence==SEEK_END)
-		memsrc.pos=memsrc.length-offset;
-	memsrc.pos=min(memsrc.pos, memsrc.length);
+		memsrc.pos = memsrc.length-offset;
+	memsrc.pos = min(memsrc.pos, memsrc.length);
 
 	return memsrc.pos;
 }
 
-void memory_close(void *src)
+int memory_close(void *src)
 {
 	delete reinterpret_cast<MemorySource *>(src);
+	return 0;
 }
 
 long memory_tell(void *src)
 {
-	MemorySource &memsrc=*reinterpret_cast<MemorySource *>(src);
+	MemorySource &memsrc = *reinterpret_cast<MemorySource *>(src);
 	return memsrc.pos;
 }
 
@@ -61,7 +55,7 @@ ov_callbacks memory_callbacks=
 {
 	&memory_read,
 	&memory_seek,
-	0,
+	&memory_close,
 	&memory_tell
 };
 
@@ -74,7 +68,7 @@ Sound::Sound():
 	data(0),
 	eof_flag(false)
 {
-	ovfile.datasource=0;
+	ovfile.datasource = 0;
 }
 
 Sound::~Sound()
@@ -87,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();
 }
@@ -97,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);
+	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();
@@ -112,16 +106,16 @@ 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];
-	unsigned pos=0;
-	while(unsigned len=read(dptr+pos, size-pos))
-		pos+=len;
-	data=dptr;
-	size=pos;
-	read_pos=0;
+	size = ov_pcm_total(&ovfile, 0)*4;
+	char *dptr = new char[size];
+	unsigned pos = 0;
+	while(unsigned len = read(dptr+pos, size-pos))
+		pos += len;
+	data = dptr;
+	size = pos;
+	read_pos = 0;
 }
 
 void Sound::load_file(const std::string &fn)
@@ -147,7 +141,7 @@ void Sound::close()
 void Sound::rewind()
 {
 	if(data)
-		read_pos=0;
+		read_pos = 0;
 	else
 		ov_pcm_seek(&ovfile, 0);
 }
@@ -156,44 +150,44 @@ unsigned Sound::read(char *buf, unsigned len)
 {
 	if(data)
 	{
-		len=min(len, size-read_pos);
+		len = min(len, size-read_pos);
 		memcpy(buf, data+read_pos, len);
-		read_pos+=len;
+		read_pos += len;
 		return len;
 	}
 	else if(ovfile.datasource)
 	{
-		int section=0;
-		int res=ov_read(&ovfile, buf, len, 0, 2, 1, &section);
+		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;
+			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;
 }
 
 void Sound::open_common()
 {
 	delete data;
-	data=0;
+	data = 0;
 
-	vorbis_info *info=ov_info(&ovfile, -1);
-	freq=info->rate;
+	vorbis_info *info = ov_info(&ovfile, -1);
+	freq = info->rate;
 	switch(info->channels)
 	{
-	case 1: format=MONO16; break;
-	case 2: format=STEREO16; break;
-	default: throw Exception("Unsupported number of channels");
+	case 1: format = MONO16; break;
+	case 2: format = STEREO16; break;
+	default: throw runtime_error("Unsupported number of channels");
 	}
 }