--- infoscreen/MainView.cpp	2009/12/15 21:06:14	516
+++ infoscreen/MainView.cpp	2010/01/06 22:18:52	528
@@ -6,11 +6,12 @@
 
 #include <QTimer>
 
-//#include <VideoPlayer> //Phonon
-//#include <MediaSource> //Phonon
-
 #include "MyWebView.h"
 #include "clientsiderender.h"
+#include "pictureview.h"
+#include "videoview.h"
+
+#include "httpwrapper.h"
 
 
 MainView::MainView(QWidget* parent)
@@ -19,36 +20,81 @@
         this->resize(400,400);
         this->setWindowState( Qt::WindowFullScreen );
 
-//	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
-
-	
-	//Phonon::VideoPlayer* video;
-	//video = new Phonon::VideoPlayer(Phonon::VideoCategory, this);	
-	//video->load( Phonon::MediaSource("http://todic.dk/ps3cache/Inglourious_Basterds_2009.avi") );
-	//layout->addWidget(video,1);
-	//video->play();
+	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
         render = new ClientSideRender(this);
+        render->setVisible( false );
+
         web = new MyWebView(this);
-        web->setVisible( false );
+        web->setVisible( false);
+
+        picture = new PictureView(this);
+        picture->setVisible( true );
+
+        video = new VideoView(this);
+        video->setVisible(false);
 
 	QVBoxLayout* layout = new QVBoxLayout();
         layout->addWidget(web,1);
         layout->addWidget(render,1);
+        layout->addWidget(picture,1);
+        layout->addWidget(video,1);
 	layout->addStretch();
 	layout->setContentsMargins(0,0,0,0);
         setLayout(layout);
 
+
+
 	QTimer* timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
-	timer->start(1000);
-	
-	
-      // web->start();
+        timer->start(100);
+
 }
 
 
 void MainView::onTimer()
 {
     screenManager.timerTick();
+
+    readXml();
+
+    switchScreens();
+}
+
+
+bool MainView::readXml()
+{
+    const int TIMEOUT = 30*60*1000; // 30 minutter
+    if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {
+        qDebug() << "reread";
+        xmlHandler.readXml( "http://infoscreen.sundhedhorsens.dk/infoscreen/screen_xml.php?screen_id=1" );
+
+        lastXml = QTime::currentTime();
+
+        screenItems = xmlHandler.getScreenSet();
+
+        if ( currentItemIdx >= screenItems.size() )
+            currentItemIdx = screenItems.size()-1; //avoid overflow
+
+
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void MainView::switchScreens()
+{
+
+    if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
+
+        if (lastScreenSwitch.isNull())
+            currentItemIdx = 0;
+        else
+            currentItemIdx = (currentItemIdx+1) % screenItems.size();
+        currentItem = screenItems.at(currentItemIdx);
+        picture->loadFromUrl( currentItem.url );
+
+        lastScreenSwitch = QTime::currentTime();
+    }
 }