X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fxinema.cpp;h=267f6a4eeb42b1dbebce1d71e67fc106133fe397;hb=ed777426d367df15a67082f5dae0911c21472b5f;hp=fc042e1ebd78e6487de3c516caa91db8bee65230;hpb=8c7e5bd0d1f966af2b22293a3a0780c419fb9c95;p=xinema.git

diff --git a/source/xinema.cpp b/source/xinema.cpp
index fc042e1..267f6a4 100644
--- a/source/xinema.cpp
+++ b/source/xinema.cpp
@@ -1,4 +1,5 @@
 #include <sigc++/bind.h>
+#include <msp/fs/dir.h>
 #include <msp/time/utils.h>
 #include "xineengine.h"
 #include "xinema.h"
@@ -22,6 +23,7 @@ int Xinema::main()
 	display.tick();
 
 	engine = new XineEngine(window, &display_mutex);
+	play_file(FS::get_sys_data_dir()/"xinema.png");
 
 	Application::main();
 
@@ -34,6 +36,8 @@ int Xinema::main()
 
 void Xinema::tick()
 {
+	bool new_stream = false;
+
 	{
 		MutexLock lock(command_mutex);
 		if(!pending_mrl.empty())
@@ -42,16 +46,19 @@ void Xinema::tick()
 			stream = new XineStream(*engine, pending_mrl);
 			stream->play();
 			pending_mrl.clear();
+			new_stream = true;
 		}
 	}
 
+	if(new_stream)
+		signal_stream_created.emit(*stream);
+
 	{
 		MutexLock lock(display_mutex);
 		display.tick();
 	}
 
-	if(stream)
-		stream->tick();
+	engine->tick();
 
 	Time::sleep(10*Time::msec);
 }