remove old stuff

Author: aumuell

src/OpenCOVER/plugins/general/Vrml97/CMakeLists.txt

@@ -1,18 +1,14 @@
 # OpenCOVER plugins general Vrml97
 using(VRML)
-ADD_DEFINITIONS(-DVRML97_IMPORT_PLUGIN -DNEW_OSG)
+ADD_DEFINITIONS(-DVRML97_IMPORT_PLUGIN)
 
-IF(NOT (${OPENSCENEGRAPH_VERSION} VERSION_LESS "2.9"))
-  SET(SDL_BUILDING_LIBRARY ON)
-  COVISE_FIND_PACKAGE(SDL)
-  IF(SDL_FOUND)
-    INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
-    SET(EXTRA_LIBS ${EXTRA_LIBS} ${SDL_LIBRARY})
-  ENDIF()
+SET(SDL_BUILDING_LIBRARY ON)
+COVISE_FIND_PACKAGE(SDL)
+IF(SDL_FOUND)
+  INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
+  SET(EXTRA_LIBS ${EXTRA_LIBS} ${SDL_LIBRARY})
 ENDIF()
 
-# INCLUDE_DIRECTORIES( )
-
 SET(LIB_HEADERS
   coSensiveSensor.h
   ViewerObject.h

src/OpenCOVER/plugins/general/Vrml97/ViewerOsg.cpp

@@ -5542,7 +5542,6 @@ bool ViewerOsg::update(double timeNow)
         else
         {
             updated = true;
-#ifdef NEW_OSG
             if (imageS->getStatus() != osg::ImageStream::PAUSED)
             {
                 if (movDat->movieProp->stop > 0)
@@ -5560,7 +5559,6 @@ bool ViewerOsg::update(double timeNow)
                     movDat->movieProp->speed = -movDat->movieProp->speed;
                 }
             }
-#endif
         }
     }