eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

Browse Source
This commit is contained in:
Tats
2014-10-16 21:47:31 +00:00
parent bafff221bd 7e89ee4ed7
commit d3c54a183f
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.cpp
+6 -1
View File
@@ -1351,7 +1351,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()
@@ -1904,6 +1904,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)
{
@@ -1994,12 +1995,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
{