- Some changes to try to reload textures for win32 when doing alt-enter

- Added better logging and guards in sound and socket classes

source/shared_lib/include/sound/sound.h

@@ -0,0 +1,112 @@
+// ==============================================================
+//	This file is part of Glest Shared Library (www.glest.org)
+//
+//	Copyright (C) 2001-2008 Martio Figueroa
+//
+//	You can redistribute this code and/or modify it under 
+//	the terms of the GNU General Public License as published 
+//	by the Free Software Foundation; either version 2 of the 
+//	License, or (at your option) any later version
+// ==============================================================
+
+#ifndef _SHARED_SOUND_SOUND_H_
+#define _SHARED_SOUND_SOUND_H_
+
+#include <string>
+#include "sound_file_loader.h" 
+
+using namespace std;
+using namespace Shared::Platform;
+
+namespace Shared{ namespace Sound{
+
+// =====================================================
+//	class SoundInfo
+// =====================================================
+
+class SoundInfo{
+private:
+	uint32 channels;
+	uint32 samplesPerSecond;
+	uint32 bitsPerSample;
+	uint32 size;
+
+public:
+	SoundInfo();
+	virtual ~SoundInfo(){};
+
+	uint32 getChannels() const			{return channels;}
+	uint32 getSamplesPerSecond() const	{return samplesPerSecond;}
+	uint32 getBitsPerSample() const		{return bitsPerSample;}
+	uint32 getSize() const				{return size;}
+
+	void setChannels(uint32 channels)					{this->channels= channels;}
+	void setsamplesPerSecond(uint32 samplesPerSecond)	{this->samplesPerSecond= samplesPerSecond;}
+	void setBitsPerSample(uint32 bitsPerSample)			{this->bitsPerSample= bitsPerSample;}
+	void setSize(uint32 size)							{this->size= size;}
+};
+
+// =====================================================
+//	class Sound
+// =====================================================
+
+class Sound{
+protected:
+	SoundFileLoader *soundFileLoader;
+	SoundInfo info;
+	float volume;
+	string fileName;
+	
+public:
+	Sound();
+	virtual ~Sound(){};
+
+	const SoundInfo *getInfo() const	{return &info;}
+	float getVolume() const				{return volume;}
+	
+	void setVolume(float volume)		{this->volume= volume;}
+	string getFileName() 				{return fileName; }
+};
+
+// =====================================================
+//	class StaticSound
+// =====================================================
+
+class StaticSound: public Sound{
+private:
+	int8 * samples;
+
+public:
+	StaticSound();
+	virtual ~StaticSound();
+
+	int8 *getSamples() const		{return samples;}
+	
+	void load(const string &path);
+	void close();
+};
+
+// =====================================================
+//	class StrSound
+// =====================================================
+
+class StrSound: public Sound{
+private:
+	StrSound *next;
+
+public:
+	StrSound();
+	virtual ~StrSound();
+
+	StrSound *getNext() const		{return next;}
+	void setNext(StrSound *next)	{this->next= next;}
+
+	void open(const string &path);
+	uint32 read(int8 *samples, uint32 size);
+	void close();
+	void restart();
+};
+
+}}//end namespace
+
+#endif

source/shared_lib/include/sound/sound_file_loader.h

@@ -0,0 +1,108 @@
+// ==============================================================
+//	This file is part of Glest Shared Library (www.glest.org)
+//
+//	Copyright (C) 2001-2008 Martio Figueroa
+//
+//	You can redistribute this code and/or modify it under 
+//	the terms of the GNU General Public License as published 
+//	by the Free Software Foundation; either version 2 of the 
+//	License, or (at your option) any later version
+// ==============================================================
+
+#ifndef _SHARED_SOUND_SOUNDFILELOADER_H_
+#define _SHARED_SOUND_SOUNDFILELOADER_H_
+
+#include <string>
+#include <fstream>
+
+#include "types.h"
+#include "factory.h"
+
+struct OggVorbis_File;
+
+using std::string;
+using std::ifstream;
+
+namespace Shared{ namespace Sound{
+
+using Platform::uint32;
+using Platform::int8;
+using Util::MultiFactory;
+
+class SoundInfo;
+
+// =====================================================
+//	class SoundFileLoader  
+//
+///	Interface that all SoundFileLoaders will implement
+// =====================================================
+
+class SoundFileLoader{
+public:
+	virtual ~SoundFileLoader(){}
+
+	virtual void open(const string &path, SoundInfo *soundInfo)= 0;
+	virtual uint32 read(int8 *samples, uint32 size)= 0;
+	virtual void close()= 0;
+	virtual void restart()= 0;
+	virtual string getFileName() = 0;
+};
+
+// =====================================================
+//	class WavSoundFileLoader  
+//
+///	Wave file loader
+// =====================================================
+
+class WavSoundFileLoader: public SoundFileLoader{
+private:
+	static const int maxDataRetryCount= 10;
+	string fileName;
+private:
+	uint32 dataOffset;
+	uint32 dataSize;
+	uint32 bytesPerSecond;
+	ifstream f;
+
+public:
+	virtual void open(const string &path, SoundInfo *soundInfo);
+	virtual uint32 read(int8 *samples, uint32 size);
+	virtual void close();
+	virtual void restart();
+	virtual string getFileName() { return fileName; }
+};
+
+// =====================================================
+//	class OggSoundFileLoader 
+//
+///	OGG sound file loader, uses ogg-vorbis library
+// =====================================================
+
+class OggSoundFileLoader: public SoundFileLoader{
+private:
+	OggVorbis_File *vf;
+	FILE *f;
+	string fileName;
+
+public:
+	virtual void open(const string &path, SoundInfo *soundInfo);
+	virtual uint32 read(int8 *samples, uint32 size);
+	virtual void close();
+	virtual void restart();
+	virtual string getFileName() { return fileName; }
+};
+
+// =====================================================
+//	class SoundFileLoaderFactory
+// =====================================================
+
+class SoundFileLoaderFactory: public MultiFactory<SoundFileLoader>{
+private:
+	SoundFileLoaderFactory();
+public:
+	static SoundFileLoaderFactory * getInstance();
+};
+
+}}//end namespace
+
+#endif