From adb54363a0889dd2f022db228990c49392a8bb0b Mon Sep 17 00:00:00 2001
From: Ulrich Kemloh <kemlohulrich@gmail.com>
Date: Wed, 10 Jun 2015 20:17:02 +0200
Subject: [PATCH] fixed issue in direct video rendering detection
---
JPSvis.pro | 12 ++++++++++++
src/MainWindow.cpp | 3 ++-
src/TimerCallback.cpp | 8 ++------
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/JPSvis.pro b/JPSvis.pro
index da3e562..2fd9050 100644
--- a/JPSvis.pro
+++ b/JPSvis.pro
@@ -647,6 +647,18 @@ SOURCES += src/geometry/Building.cpp \
src/TrailPlotter.cpp \
src/geometry/GeometryFactory.cpp
+
+#enable video remdering *nix and osx
+exists("$$INCLUDEPATH/vtkFFMPEGWriter.h") {
+ message( "enabling direct video rendering (linux and osx)")
+ DEFINES += TRAVISTO_FFMPEG
+}
+#enable video remdering *dos
+exists("$$INCLUDEPATH/vtkAVIWriter.h") {
+ message( "enabling direct video rendering (windows)")
+ DEFINES += TRAVISTO_FFMPEG
+}
+
FORMS += forms/settings.ui \
forms/mainwindow.ui
RESOURCES += forms/icons.qrc
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index da951ed..0dfbd32 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -775,12 +775,13 @@ void MainWindow::slotRecord()
extern_recording_enable = false;
ui.BtRecord->setToolTip("Start Recording");
labelCurrentAction->setText(" Playing ");
+ labelRecording->setText(" rec: off ");
return;
}
}
extern_launch_recording = true;
ui.BtRecord->setToolTip("Stop Recording");
- labelRecording->setText("recording");
+ labelRecording->setText(" rec: on ");
//labelCurrentAction->setText(" recording ");
}
diff --git a/src/TimerCallback.cpp b/src/TimerCallback.cpp
index 48b0916..5a69550 100644
--- a/src/TimerCallback.cpp
+++ b/src/TimerCallback.cpp
@@ -39,16 +39,12 @@
#include <iostream>
+#ifdef TRAVISTO_FFMPEG
#ifdef _WIN32
#include <vtkAVIWriter.h>
#include <windows.h>
-#define TRAVISTO_FFMPEG
-#endif
-
-#ifdef __linux__
-#ifdef __vtkFFMPEGWriter_h
+#else
#include <vtkFFMPEGWriter.h>
-#define TRAVISTO_FFMPEG
#endif
#endif
--
GitLab