From e31e4123789fefb3f700cd319cf933389d71c01f Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Thu, 16 Oct 2014 20:30:45 -0400
Subject: [PATCH] Do not store OSC port in settings (for now)

---
 MainWindow.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 50c84f4..ea3617d 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -1312,7 +1312,7 @@ void MainWindow::readSettings()
   outputWindow->restoreGeometry(settings.value("outputWindow").toByteArray());
   displayOutputWindow->setChecked(settings.value("displayOutputWindow").toBool());
   outputWindowFullScreen->setChecked(settings.value("outputWindowFullScreen").toBool());
-  config_osc_receive_port = settings.value("osc_receive_port", 12345).toInt();
+  config_osc_receive_port = 12345; // settings.value("osc_receive_port", 12345).toInt();
 }
 
 void MainWindow::writeSettings()
@@ -1773,6 +1773,7 @@ void MainWindow::startOscReceiver()
   int port = config_osc_receive_port;
   std::ostringstream os;
   os << port;
+  std::cout << "OSC port: " << port << std::endl;
   osc_interface.reset(new OscInterface(os.str()));
   if (port != 0)
   {
@@ -1863,12 +1864,16 @@ bool MainWindow::setTextureUri(int texture_id, const std::string &uri)
         if (paint->getType() == "media")
         {
           Media *media = (Media *) paint.get(); // FIXME: use sharedptr cast
+          videoTimer->stop();
           success = media->setUri(QString(uri.c_str()));
+          videoTimer->start();
         }
         else if (paint->getType() == "image")
         {
           Image *media = (Image*) paint.get(); // FIXME: use sharedptr cast
+          videoTimer->stop();
           success = media->setUri(QString(uri.c_str()));
+          videoTimer->start();
         }
         else
         {