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
2016-03-05 19:46:04 -05:00
parent 0c2de092bd aec2dba6b8
commit e7b95cd8f4
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.cpp
+2 -10
View File
@@ -28,11 +28,7 @@
MainWindow::MainWindow()
{
// Create model.
#if QT_VERSION >= 0x050500
QMessageLogger(__FILE__, __LINE__, 0).info() << "Video support: " << (Video::hasVideoSupport() ? "yes" : "no");
#else
QMessageLogger(__FILE__, __LINE__, 0).debug() << "Video support: " << (Video::hasVideoSupport() ? "yes" : "no");
#endif
qDebug() << "Video support: " << (Video::hasVideoSupport() ? "yes" : "no");
mappingManager = new MappingManager;
@@ -2898,11 +2894,7 @@ void MainWindow::startOscReceiver()
int port = config_osc_receive_port;
std::ostringstream os;
os << port;
#if QT_VERSION >= 0x050500
QMessageLogger(__FILE__, __LINE__, 0).info() << "OSC port: " << port ;
#else
QMessageLogger(__FILE__, __LINE__, 0).debug() << "OSC port: " << port ;
#endif
qDebug() << "OSC port: " << port ;
osc_interface.reset(new OscInterface(os.str()));
if (port != 0)
{
OscInterface.cpp
+3 -3
View File
@@ -41,7 +41,7 @@ OscInterface::OscInterface(
//if (listen_port != OSC_PORT_NONE)
receiving_enabled_ = true;
if (receiving_enabled_) {
QMessageLogger(__FILE__, __LINE__, 0).debug() << "Listening osc.udp://localhost:" << listen_port.c_str();
qDebug() << "Listening osc.udp://localhost:" << listen_port.c_str();
// receiver_.addHandler("/ping", "", ping_cb, this);
// receiver_.addHandler("/pong", "", pong_cb, this);
//receiver_.addHandler("/image/path", "ss", image_path_cb, this);
@@ -60,7 +60,7 @@ int OscInterface::pong_cb(const char *path, const char * /*types*/,
lo_arg ** /*argv*/, int /*argc*/, void * /*data*/, void *user_data) {
OscInterface* context = static_cast<OscInterface*>(user_data);
if (context->is_verbose())
QMessageLogger(__FILE__, __LINE__, 0).debug() << "Got " << path;
qDebug() << "Got " << path;
return 0;
}
@@ -71,7 +71,7 @@ int OscInterface::ping_cb(const char *path, const char * /*types*/,
lo_arg ** /*argv*/, int /*argc*/, void * /*data*/, void *user_data) {
OscInterface* context = static_cast<OscInterface*>(user_data);
if (context->is_verbose())
QMessageLogger(__FILE__, __LINE__, 0).debug() << "Got " << path;
qDebug() << "Got " << path;
return 0;
}
Util.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ bool eraseSettings()
}
else
{
QMessageLogger(__FILE__, __LINE__, 0).debug() << "Erase MapMap settings.";
qDebug() << "Erase MapMap settings.";
settingsFile.close();
return settingsFile.remove();
}