fix compilation errors with pre processor instruction for the video

git-svn-id: svn+ssh://orchestra.med.harvard.edu/svn/megason/Code/GoFigure2@2093 ef826fda-c0ae-4237-af8e-f8dcbcf7929c
gofigure2 · Feb 8, 2010 · 963f8c9 · 963f8c9
1 parent ef73a36
commit 963f8c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/trunk/GoFigure2Beta/Code/GUI/lib/QGoTabImageView3DwT.cxx b/trunk/GoFigure2Beta/Code/GUI/lib/QGoTabImageView3DwT.cxx
@@ -46,7 +46,7 @@
 #include "QGoManualSegmentationDockWidget.h"
 #include "QGoPrintDatabase.h"
 
-#ifdef   ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined ( ENABLEAVI )
 
   #include "QGoVideoRecorder.h"
 
@@ -133,7 +133,7 @@ QGoTabImageView3DwT( QWidget* iParent ) :
 
   CreateManualSegmentationdockWidget();
 
-#ifdef ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined ( ENABLEAVI )
   CreateVideoRecorderWidget();
 #endif
 
@@ -152,7 +152,7 @@ QGoTabImageView3DwT( QWidget* iParent ) :
   m_DockWidgetList.push_back(
     std::pair< Qt::DockWidgetArea, QDockWidget* >( Qt::TopDockWidgetArea, m_DataBaseTables ) );
 
-#ifdef ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined (ENABLEAVI)
   m_DockWidgetList.push_back(
     std::pair< Qt::DockWidgetArea, QDockWidget* >( Qt::LeftDockWidgetArea, m_VideoRecorderWidget ) );
 #endif
@@ -329,7 +329,7 @@ CreateDataBaseTablesConnection()
 
 }
 //-------------------------------------------------------------------------
-#ifdef   ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined ( ENABLEAVI )
 //-------------------------------------------------------------------------
 
 void

diff --git a/trunk/GoFigure2Beta/Code/GUI/lib/QGoTabImageView3DwT.h b/trunk/GoFigure2Beta/Code/GUI/lib/QGoTabImageView3DwT.h
@@ -55,19 +55,19 @@ class QGoVisualizationDockWidget;
 class QGoManualSegmentationDockWidget;
 class QGoPrintDatabase;
 
-#ifdef   ENABLEFFMPEG || ENABLEAVI
+#ifdef   ENABLEFFMPEG 
+
 
 class QGoVideoRecorder;
 
-  #ifdef   ENABLEFFMPEG
+
   class vtkFFMPEGRenderWindowRecorder;
-  #endif /* ENABLEFFMPEG */
-
+#endif
   #ifdef   ENABLEAVI
   class vtkAVIRenderWindowRecorder;
-  #endif /* ENABLEAVI */
+class QGoVideoRecorder;
 
-#endif /* ENABLEVIDEORECORD */
+  #endif /* ENABLEAVI */
 
 class vtkLSMReader;
 class vtkImageData;
@@ -211,7 +211,7 @@ public slots:
   void DisplayCube();
   void TakeSnapshot();
 
-#ifdef   ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined ( ENABLEAVI )
   void SetRendererWindow( int );
   void SetSpecificParametersFrameRate( int );
   void SetSpecificParametersQuality( int );
@@ -292,19 +292,17 @@ public slots:
   QGoVisualizationDockWidget*       m_VisuDockWidget;
   QGoManualSegmentationDockWidget*  m_ManualSegmentationDockWidget;
 
-#ifdef   ENABLEFFMPEG || ENABLEAVI
-    QGoVideoRecorder*                         m_VideoRecorderWidget;
+
 
   #ifdef   ENABLEFFMPEG
     vtkFFMPEGRenderWindowRecorder*            m_FFMPEGWriter;
+    QGoVideoRecorder*                         m_VideoRecorderWidget;
   #endif /* ENABLEFFMPEG */
-
   #ifdef   ENABLEAVI
-    vtkAVIRenderWindowRecorder*            m_AVIWriter;
+    vtkAVIRenderWindowRecorder*               m_AVIWriter;
+    QGoVideoRecorder*                         m_VideoRecorderWidget;
   #endif /* ENABLEAVI */
 
-#endif /* ENABLEVIDEORECORD */
-
 
   std::vector< vtkSmartPointer< vtkContourWidget > >                      m_ContourWidget;
   std::vector< vtkSmartPointer< vtkOrientedGlyphContourRepresentation > > m_ContourRepresentation;
@@ -319,7 +317,7 @@ public slots:
   void CreateManualSegmentationdockWidget();
   void CreateDataBaseTablesConnection();
 
-#ifdef   ENABLEFFMPEG || ENABLEAVI
+#if defined ( ENABLEFFMPEG ) || defined ( ENABLEAVI )
   void CreateVideoRecorderWidget();
 #endif /* ENABLEVIDEORECORD */