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

Conflicts:
	Paint.cpp

main.cpp

@@ -5,6 +5,20 @@
 #include <QtGui>
 #include "MainWindow.h"
 #include "MainApplication.h"
+#include <stdlib.h>
+#include <iostream>
+
+static void set_env_vars_if_needed()
+{
+#ifdef __MACOSX_CORE__
+  std::cout << "OS X detected. Set environment for GStreamer-SDK support." << std::endl;
+  if (0 == setenv("GST_PLUGIN_PATH", "/Library/Frameworks/GStreamer.framework/Libraries", 1))
+      std::cout << " * GST_PLUGIN_PATH=Library/Frameworks/GStreamer.framework/Libraries" << std::endl;
+  if (0 == setenv("GST_DEBUG", "2", 1))
+      std::cout << " * GST_DEBUG=2" << std::endl;
+  //setenv("LANG", "C", 1);
+#endif // __MACOSX_CORE__
+}
 
 // This class is just used to provide sleep functionalities in the main() method.
 class I : public QThread
@@ -23,7 +37,8 @@ public:
 
 int main(int argc, char *argv[])
 {
-  // TODO: avoid segfaults when OSC port is busy
+  set_env_vars_if_needed();
+
   MainApplication app(argc, argv);
 
   if (!QGLFormat::hasOpenGL())