Bunch of stuffs!

Fixes Jebbs#118 fixes Jebbs#124 fixes Jebbs#147 fixes Jebbs#95 fixes Jebbs#42 fixes Jebbs#162

build.d

@@ -241,7 +241,7 @@ void initialize()
 		prefix = "";
 		extension = ".lib";
 
-		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" dsfml-graphics-2.lib dsfml-window-2.lib dsfml-audio-2.lib dsfml-network-2.lib dsfml-system-2.lib dsfml-graphics.lib dsfml-window.lib dsfml-audio.lib dsfml-network.lib dsfml-system.lib ";
+		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" dsfml-graphics.lib dsfml-window.lib dsfml-audio.lib dsfml-network.lib dsfml-system.lib dsfmlc-graphics.lib dsfmlc-window.lib dsfmlc-audio.lib dsfmlc-network.lib dsfmlc-system.lib ";
 
 		if(!force64Build)
 		{
@@ -257,14 +257,14 @@ void initialize()
 		writeln("Building for Linux");
 		prefix = "lib";
 		extension = ".a";
-		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" -L-ldsfml-graphics-2 -L-ldsfml-window-2 -L-ldsfml-audio-2 -L-ldsfml-network-2 -L-ldsfml-system-2 -L-ldsfml-graphics -L-ldsfml-window -L-ldsfml-audio -L-ldsfml-network -L-ldsfml-system -L-L"~libDirectory;
+		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" -L-ldsfml-graphics -L-ldsfml-window -L-ldsfml-audio -L-ldsfml-network -L-ldsfml-system -L-ldsfmlc-graphics -L-ldsfmlc-window -L-ldsfmlc-audio -L-ldsfmlc-network -L-ldsfmlc-system -L-L"~libDirectory;
 	}
 	else
 	{
 		writeln("Building for OSX");
 		prefix = "lib";
 		extension = ".a";
-		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" -ldsfml-graphics-2 -ldsfml-window-2 -ldsfml-audio-2 -ldsfml-network-2 -ldsfml-system-2 -ldsfml-graphics -ldsfml-window -ldsfml-audio -ldsfml-network -ldsfml-system -L-L"~libDirectory;
+		unittestCompilerSwitches = "-main -unittest -cov -I"~impDirectory~" -ldsfml-graphics -ldsfml-window -ldsfml-audio -ldsfml-network -ldsfml-system -ldsfmlc-graphics -ldsfmlc-window -ldsfmlc-audio -ldsfmlc-network -ldsfmlc-system -L-L"~libDirectory;
 	}
 
 	libCompilerSwitches = "-lib -O -release -inline -I"~impDirectory;
@@ -301,7 +301,7 @@ bool buildLibs()
 			fileList~= name ~ " ";
 		}
 
-		string buildCommand = "dmd "~ fileList ~ libCompilerSwitches ~ " -of"~libDirectory~prefix~"dsfml-"~theModule~"-2"~extension;
+		string buildCommand = "dmd "~ fileList ~ libCompilerSwitches ~ " -of"~libDirectory~prefix~"dsfml-"~theModule~extension;
 
 		writeln("Building " ~ theModule~ " module.");
 
@@ -418,7 +418,7 @@ void showHelp()
 	writeln("-unittest  : Build static libs and unittests");
 	writeln("-all       : Build everything");
 	writeln("-unittest:sharedDir  : Build static libs and unittests, sharedDir is the location of DSFML-C shared libraries");
-	writeln("-all:sharedDir       : Build everything, sharedDir is the location of DSFML-C shared libraries");
+	writeln("-all:sharedDir       : Build everything, sharedDir is the location of DSFMLC shared libraries");
 	writeln();
 	writeln("Modifier switches:");
 	writeln("-m32        : force a 32 bit build");

src/dsfml/audio/music.d

@@ -253,7 +253,7 @@ unittest
 		auto music = new Music();
 
 		//TODO: update this for a real unit test users can run themselves.
-		if(!music.openFromFile("res/hal1.ogg"))
+		if(!music.openFromFile("res/TestMusic.ogg"))
 		{
 			return;
 		}

src/dsfml/audio/sound.d

@@ -62,7 +62,7 @@ class Sound : SoundSource
 
 	this()
 	{
-		sfPtr = sfSound_create();
+		sfPtr = sfSound_construct();
 	}
 
 	this(const(SoundBuffer) buffer)
@@ -310,7 +310,7 @@ unittest
 
 		auto soundbuffer = new SoundBuffer();
 
-		if(!soundbuffer.loadFromFile("res/cave1.ogg"))
+		if(!soundbuffer.loadFromFile("res/TestSound.ogg"))
 		{
 			//error
 			return;
@@ -346,7 +346,7 @@ private extern(C):
 
 struct sfSound;
 
-sfSound* sfSound_create();
+sfSound* sfSound_construct();
 
 sfSound* sfSound_copy(const sfSound* sound);
 

src/dsfml/audio/soundbuffer.d

@@ -70,7 +70,7 @@ class SoundBuffer
 	this()
 	{
 		import dsfml.system.string;
-		sfPtr = sfSoundBuffer_create();
+		sfPtr = sfSoundBuffer_construct();
 		err.write(toString(sfErr_getOutput()));
 	}
 
@@ -149,15 +149,13 @@ class SoundBuffer
 	 */
 	bool loadFromFile(string filename)
 	{
-		sfPtr = sfSoundBuffer_createFromFile(toStringz(filename));
-
-		if(sfPtr)
+    	import dsfml.system.string;
+		if(sfSoundBuffer_loadFromFile(sfPtr, toStringz(filename)))
 		{
-			return true;
+		    return true;
 		}
 		else
 		{
-			import dsfml.system.string;
 			err.write(toString(sfErr_getOutput()));
 			return false;
 		}
@@ -175,15 +173,13 @@ class SoundBuffer
 	 */
 	bool loadFromMemory(const(void)[] data)
 	{
-		sfPtr = sfSoundBuffer_createFromMemory(data.ptr, data.length);
-
-		if(sfPtr)
+		if(sfSoundBuffer_loadFromMemory(sfPtr, data.ptr, data.length))
 		{
-			return true;
+		    return true;
 		}
 		else
 		{
-			import dsfml.system.string;
+		    import dsfml.system.string;
 			err.write(toString(sfErr_getOutput()));
 			return false;
 		}
@@ -200,11 +196,8 @@ class SoundBuffer
 	 * Returns: True if loading succeeded, false if it failed
 	 */
 	bool loadFromStream(InputStream stream)
-	{
-
-		sfPtr = sfSoundBuffer_createFromStream(new SoundBufferStream(stream));
-
-		if(sfPtr)
+	{	
+		if(sfSoundBuffer_loadFromStream(sfPtr, new SoundBufferStream(stream)))
 		{
 			return true;
 		}
@@ -230,10 +223,7 @@ class SoundBuffer
 	 */
 	bool loadFromSamples(const(short[]) samples, uint channelCount, uint sampleRate)
 	{
-
-		sfPtr = sfSoundBuffer_createFromSamples(samples.ptr, samples.length, channelCount, sampleRate);
-
-		if(sfPtr)
+		if(sfSoundBuffer_loadFromSamples(sfPtr, samples.ptr, samples.length, channelCount, sampleRate))
 		{
 			return true;
 		}
@@ -258,9 +248,7 @@ class SoundBuffer
 	bool saveToFile(string filename)
 	{
 		import dsfml.system.string;
-		sfSoundBuffer_saveToFile(sfPtr, toStringz(filename));
-
-		if(sfPtr)
+		if(sfSoundBuffer_saveToFile(sfPtr, toStringz(filename)))
 		{
 			return true;
 		}
@@ -285,7 +273,7 @@ unittest
 
 		auto soundbuffer = new SoundBuffer();
 
-		if(!soundbuffer.loadFromFile("res/cave1.ogg"))
+		if(!soundbuffer.loadFromFile("res/TestSound.ogg"))
 		{
 			//error
 			return;
@@ -352,15 +340,15 @@ package struct sfSoundBuffer;
 
 private extern(C):
 
-sfSoundBuffer* sfSoundBuffer_create();
+sfSoundBuffer* sfSoundBuffer_construct();
 
-sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename);
+bool sfSoundBuffer_loadFromFile(sfSoundBuffer* soundBuffer, const char* filename);
 
-sfSoundBuffer* sfSoundBuffer_createFromMemory(const void* data, size_t sizeInBytes);
+bool sfSoundBuffer_loadFromMemory(sfSoundBuffer* soundBuffer, const void* data, size_t sizeInBytes);
 
-sfSoundBuffer* sfSoundBuffer_createFromStream(sfmlInputStream stream);
+bool sfSoundBuffer_loadFromStream(sfSoundBuffer* soundBuffer, sfmlInputStream stream);
 
-sfSoundBuffer* sfSoundBuffer_createFromSamples(const short* samples, size_t sampleCount, uint channelCount, uint sampleRate);
+bool sfSoundBuffer_loadFromSamples(sfSoundBuffer* soundBuffer, const short* samples, size_t sampleCount, uint channelCount, uint sampleRate);
 
 sfSoundBuffer* sfSoundBuffer_copy(const sfSoundBuffer* soundBuffer);
 

src/dsfml/audio/soundbufferrecorder.d

@@ -134,41 +134,53 @@ unittest
 
 		writeln("Unit test for SoundBufferRecorder.");
 
+		assert(SoundRecorder.isAvailable());
+
+
 		auto recorder = new SoundBufferRecorder();
 
-		assert(SoundRecorder.isAvailable());
 
+		auto clock = new Clock();
+
+		writeln("Recording for 5 seconds in...");
+		writeln("3");
+		clock.restart();
+
+		while(clock.getElapsedTime().asSeconds() <1)
+		{
+			//wait for a second
+		}
+		writeln("2");
 
-		writeln("Press Enter to start recording.");
-		while(!Keyboard.isKeyPressed(Keyboard.Key.Return))
+		clock.restart();
+
+		while(clock.getElapsedTime().asSeconds() <1)
 		{
-			//wait for the user to press enter
-			if(Keyboard.isKeyPressed(Keyboard.Key.Return))
-			{
-
-				recorder.start();
-			}
+			//wait for a second
+		}
+		writeln("1");
+
+		clock.restart();
+
+		while(clock.getElapsedTime().asSeconds() <1)
+		{
+			//wait for a second
 		}
-		//make sure the next one diesn't trigger immediately
-		if(Keyboard.isKeyPressed(Keyboard.Key.Return))
+		writeln("Recording!");	
+
+		recorder.start();	
+		clock.restart();
+
+		while(clock.getElapsedTime().asSeconds() <5)
 		{
-			//wait until they release the key
-			while(Keyboard.isKeyPressed(Keyboard.Key.Return))
-			{
-				//writeln(true);
-			}
+			//wait for a second
 		}
 
+		writeln("Done!");
 
-		writeln("Press Enter to stop recording.");
 
-		while(!Keyboard.isKeyPressed(Keyboard.Key.Return))
-		{
-			if(Keyboard.isKeyPressed(Keyboard.Key.Return))
-			{
-				recorder.stop();
-			}
-		}
+		recorder.stop();
+
 
 
 
@@ -178,7 +190,7 @@ unittest
 
 		auto recorderSound = new Sound(buffer);
 
-		auto clock = new Clock();
+		clock.restart();
 
 		recorderSound.play();
 		while(clock.getElapsedTime() < recorderDuration)

src/dsfml/audio/soundrecorder.d

@@ -67,7 +67,7 @@ class SoundRecorder
 	{
 		import dsfml.system.string;
 		callBacks = new SoundRecorderCallBacks(this);
-		sfPtr = sfSoundRecorder_create(callBacks);
+		sfPtr = sfSoundRecorder_construct(callBacks);
 
 		err.write(toString(sfErr_getOutput()));
 
@@ -214,7 +214,7 @@ private extern(C):
 
 struct sfSoundRecorder;
 
-sfSoundRecorder* sfSoundRecorder_create(sfmlSoundRecorderCallBacks newCallBacks);
+sfSoundRecorder* sfSoundRecorder_construct(sfmlSoundRecorderCallBacks newCallBacks);
 
 void sfSoundRecorder_destroy(sfSoundRecorder* soundRecorder);
 

src/dsfml/audio/soundstream.d

@@ -73,11 +73,8 @@ class SoundStream:SoundSource
 
 	protected this()
 	{
-		//create a blank pointer in case functions might be called before it is initialized (eg, stop() in Music's openFromFile)
-		sfPtr = sfSoundStream_create(0, 0, null);
-
-		callBacks = new SoundStreamCallBacks(this);
-
+	    callBacks = new SoundStreamCallBacks(this);
+		sfPtr = sfSoundStream_construct(callBacks);
 	}
 
 	~this()
@@ -91,10 +88,7 @@ class SoundStream:SoundSource
 	{
 		import dsfml.system.string;
 
-		//destroy the blank pointer so we can create the real instance
-		sfSoundStream_destroy(sfPtr);
-
-		sfPtr = sfSoundStream_create(channelCount, sampleRate, callBacks);
+		sfSoundStream_initialize(sfPtr, channelCount, sampleRate);
 
 		err.write(toString(sfErr_getOutput()));
 	}
@@ -367,10 +361,12 @@ private extern(C):
 struct sfSoundStream;
 
 
-sfSoundStream* sfSoundStream_create( uint channelCount, uint sampleRate, sfmlSoundStreamCallBacks callBacks);
+sfSoundStream* sfSoundStream_construct(sfmlSoundStreamCallBacks callBacks);
 
 void sfSoundStream_destroy(sfSoundStream* soundStream);
 
+void sfSoundStream_initialize(sfSoundStream* soundStream, uint channelCount, uint sampleRate);
+
 void sfSoundStream_play(sfSoundStream* soundStream);
 
 void sfSoundStream_pause(sfSoundStream* soundStream);

src/dsfml/graphics/circleshape.d

@@ -142,7 +142,7 @@ class CircleShape : Shape
 
 unittest
 {
-	version(DSFML_Unittest_Graphics)
+	version(DSFML_Unittest_Graphicss)
 	{
 		import std.stdio;
 		import dsfml.graphics;

src/dsfml/graphics/color.d

@@ -196,7 +196,7 @@ struct Color
 
 unittest
 {
-	version(DSFML_Unittest_Graphics)
+	version(DSFML_Unittest_Graphicss)
 	{
 		import std.stdio;
 

src/dsfml/graphics/convexshape.d

@@ -92,7 +92,7 @@ class ConvexShape : Shape
 
 unittest
 {
-	version(DSFML_Unittest_Graphics)
+	version(DSFML_Unittest_Graphicss)
 	{
 		import std.stdio;
 		import dsfml.graphics;