--- infoscreen/MainView.cpp	2010/01/05 20:14:22	527
+++ infoscreen/MainView.cpp	2010/01/06 22:18:52	528
@@ -11,6 +11,9 @@
 #include "pictureview.h"
 #include "videoview.h"
 
+#include "httpwrapper.h"
+
+
 MainView::MainView(QWidget* parent)
  : QWidget(parent)
 {
@@ -40,32 +43,58 @@
 	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 == 0)
-    //    video->loadUrl("");
+    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 ( (count%10) == 0) {
+    if (lastScreenSwitch.isNull() || lastScreenSwitch.elapsed() > (currentItem.runtime*1000)) {
 
-        int t = count / 10;
+        if (lastScreenSwitch.isNull())
+            currentItemIdx = 0;
+        else
+            currentItemIdx = (currentItemIdx+1) % screenItems.size();
+        currentItem = screenItems.at(currentItemIdx);
+        picture->loadFromUrl( currentItem.url );
 
-        if ( (t%2) == 0) {
-            picture->loadFromUrl("http://87.104.25.138/infoscreens/data/images/image1.jpg");
-        } else {
-            picture->loadFromUrl("http://87.104.25.138/infoscreens/data/images/image2.jpg");
-        }
+        lastScreenSwitch = QTime::currentTime();
     }
-    count++;
 }