--- infoscreen/MainView.cpp	2010/01/05 14:03:06	524
+++ infoscreen/MainView.cpp	2010/01/06 23:13:21	529
@@ -6,12 +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)
@@ -20,14 +20,7 @@
         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 );
@@ -36,40 +29,113 @@
         web->setVisible( false);
 
         picture = new PictureView(this);
-        picture->setVisible( true );
-
+        picture->setVisible( false );
 
+        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);
+        timer->start(100);
 
-        web->start();
 }
 
 
 void MainView::onTimer()
 {
-    static int count = 0;
     screenManager.timerTick();
 
-    if ( (count%10) == 0) {
+    readXml();
+
+    switchScreens();
+}
+
+
+bool MainView::readXml()
+{
+    const int TIMEOUT = 30*60*1000; // 30 minutter
+    if ( lastXml.isNull() || lastXml.elapsed() > TIMEOUT) {
+
+        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)) {
+
+        QTime now = QTime::currentTime();
+        if (lastScreenSwitch.isNull())
+            currentItemIdx = -1;
+
+        bool found = false;
+        int tries = 0;
+
+
+        while (found == false && tries <= screenItems.size()) { //find next with valid display time
+            tries++;
+            currentItemIdx = (currentItemIdx+1) % screenItems.size();
+            currentItem = screenItems.at(currentItemIdx);
+
+            if (currentItem.start <= now && now <= currentItem.stop )
+                found = true;
+        }
+
+        if (found) {
+
+            if (currentItem.module == "info_image") {
+                ensureVisible(picture);
+
+                picture->loadFromUrl( currentItem.url );
+
+            }
+
 
-        int t = count / 10;
-        qDebug() << t;
-        if ( (t%2) == 0) {
-            picture->loadFromUrl("http://10.210.210.200/infoscreens/data/images/image1.jpg");
         } else {
-            picture->loadFromUrl("http://10.210.210.200/infoscreens/data/images/image2.jpg");
+            qDebug() << "no screen";
+            hideAll();
         }
+        lastScreenSwitch = QTime::currentTime();
+
+    }
+}
+
+void MainView::ensureVisible(QWidget* widget)
+{
+    if (! widget->isVisible()) {
+        hideAll();
+        widget->setVisible(true);
     }
-    count++;
+}
+
+void MainView::hideAll()
+{
+    render->setVisible( false );
+    web->setVisible( false);
+    picture->setVisible( false );
+    video->setVisible(false);
 }