From 3d76667ca3637a8b502078973832ce7efa511b64 Mon Sep 17 00:00:00 2001
From: rude <none@none>
Date: Fri, 31 Jul 2009 16:08:30 +0200
Subject: [PATCH] Sources are now NOT useless.

---
 src/love.cpp                       | 4 ++--
 src/modules/audio/Audio.h          | 2 +-
 src/modules/audio/null/Audio.cpp   | 2 +-
 src/modules/audio/null/Audio.h     | 2 +-
 src/modules/audio/openal/Audio.cpp | 4 ++--
 src/modules/audio/openal/Audio.h   | 2 +-
 src/modules/audio/wrap_Audio.cpp   | 3 ++-
 src/scripts/boot.lua               | 5 ++++-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/love.cpp b/src/love.cpp
index e222ea54f..812e2dc84 100644
--- a/src/love.cpp
+++ b/src/love.cpp
@@ -134,8 +134,8 @@ int main(int argc, char ** argv)
 	// which gets everything started.
 
 	// TODO: This is obviously test code.
-	//luaL_dofile(L, "../../src/scripts/boot.lua");
-#	include "scripts/boot.lua.h"
+	luaL_dofile(L, "../../src/scripts/boot.lua");
+//#	include "scripts/boot.lua.h"
 
 	lua_close(L);
 
diff --git a/src/modules/audio/Audio.h b/src/modules/audio/Audio.h
index 60c842ac3..218ba7b03 100644
--- a/src/modules/audio/Audio.h
+++ b/src/modules/audio/Audio.h
@@ -59,7 +59,7 @@ namespace audio
 		* Creates a new Source.
 		* @returns A new Source.
 		**/
-		virtual Source * newSource() = 0;
+		virtual Source * newSource(Audible * audible) = 0;
 
 		/**
 		* Gets the current number of simulatenous playing sources.
diff --git a/src/modules/audio/null/Audio.cpp b/src/modules/audio/null/Audio.cpp
index 765045483..02c5a8b97 100644
--- a/src/modules/audio/null/Audio.cpp
+++ b/src/modules/audio/null/Audio.cpp
@@ -49,7 +49,7 @@ namespace null
 		return new Music(decoder);
 	}
 
-	love::audio::Source * Audio::newSource()
+	love::audio::Source * Audio::newSource(Audible * audible)
 	{
 		return new Source();
 	}
diff --git a/src/modules/audio/null/Audio.h b/src/modules/audio/null/Audio.h
index 46138684d..e184a8b27 100644
--- a/src/modules/audio/null/Audio.h
+++ b/src/modules/audio/null/Audio.h
@@ -49,7 +49,7 @@ namespace null
 		// Implements Audio.
 		love::audio::Sound * newSound(love::sound::SoundData * data);
 		love::audio::Music * newMusic(love::sound::Decoder * decoder);
-		love::audio::Source * newSource();
+		love::audio::Source * newSource(Audible * audible);
 		int getNumSources() const;
 		int getMaxSources() const;
 		void play(love::audio::Source * source);
diff --git a/src/modules/audio/openal/Audio.cpp b/src/modules/audio/openal/Audio.cpp
index ade554309..f0a992f0f 100644
--- a/src/modules/audio/openal/Audio.cpp
+++ b/src/modules/audio/openal/Audio.cpp
@@ -89,9 +89,9 @@ namespace openal
 		return new Music(pool, decoder);
 	}
 
-	love::audio::Source * Audio::newSource()
+	love::audio::Source * Audio::newSource(Audible * audible)
 	{
-		return new Source(pool);
+		return new Source(pool, audible);
 	}
 
 	int Audio::getNumSources() const
diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h
index a7175807a..cc952bb8f 100644
--- a/src/modules/audio/openal/Audio.h
+++ b/src/modules/audio/openal/Audio.h
@@ -79,7 +79,7 @@ namespace openal
 		// Implements Audio.
 		love::audio::Sound * newSound(love::sound::SoundData * data);
 		love::audio::Music * newMusic(love::sound::Decoder * decoder);
-		love::audio::Source * newSource();
+		love::audio::Source * newSource(Audible * audible);
 		int getNumSources() const;
 		int getMaxSources() const;
 		void play(love::audio::Source * source);
diff --git a/src/modules/audio/wrap_Audio.cpp b/src/modules/audio/wrap_Audio.cpp
index 01e352128..ac1a8ac74 100644
--- a/src/modules/audio/wrap_Audio.cpp
+++ b/src/modules/audio/wrap_Audio.cpp
@@ -69,7 +69,8 @@ namespace audio
 
 	int _wrap_newSource(lua_State * L)
 	{
-		Source * t = instance->newSource();
+		Audible * a = luax_checktype<Audible>(L, 1, "Audible", LOVE_AUDIO_AUDIBLE_BITS);
+		Source * t = instance->newSource(a);
 		luax_newtype(L, "Source", LOVE_AUDIO_SOURCE_BITS, (void*)t);
 		return 1;
 	}
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index ed81a86dc..0f2885e39 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -105,6 +105,9 @@ function love.boot()
 	-- Sets the source for the game.
 	if love.__args[1] and love.__args[1] ~= "" then
 		love.filesystem.setSource(love.path.getfull(love.__args[1]))
+	else
+		-- Do not set a source, load the default game.
+		love.defaultscreen()
 	end
 	
 end
@@ -195,7 +198,7 @@ end
 
 function love.defaultscreen()
 
-	-- Main loop goes here.
+
 
 end