Rename to osg-ffmpeg-videoplayer

CMakeLists.txt

@@ -549,7 +549,7 @@ include_directories(libs)
 add_subdirectory(libs/openengine)
 
 # Extern
-add_subdirectory (extern/ogre-ffmpeg-videoplayer)
+add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
 #add_subdirectory (extern/sdl4ogre)
 

apps/openmw/CMakeLists.txt

@@ -137,7 +137,7 @@ target_link_libraries(openmw
     ${MYGUI_LIBRARIES}
     ${SDL2_LIBRARY}
     ${MYGUI_PLATFORM_LIBRARIES}
-    "ogre-ffmpeg-videoplayer"
+    "osg-ffmpeg-videoplayer"
     "oics"
     components
 )

apps/openmw/mwgui/videowidget.cpp

@@ -1,6 +1,6 @@
 #include "videowidget.hpp"
 
-//#include <extern/ogre-ffmpeg-videoplayer/videoplayer.hpp>
+//#include <extern/osg-ffmpeg-videoplayer/videoplayer.hpp>
 
 #include <MyGUI_RenderManager.h>
 

apps/openmw/mwsound/movieaudiofactory.cpp

@@ -1,7 +1,7 @@
 #include "movieaudiofactory.hpp"
 
-#include <extern/ogre-ffmpeg-videoplayer/audiodecoder.hpp>
+#include <extern/osg-ffmpeg-videoplayer/audiodecoder.hpp>
-#include <extern/ogre-ffmpeg-videoplayer/videostate.hpp>
+#include <extern/osg-ffmpeg-videoplayer/videostate.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"

apps/openmw/mwsound/movieaudiofactory.hpp

@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
 #define OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H
 
-#include <extern/ogre-ffmpeg-videoplayer/audiofactory.hpp>
+#include <extern/osg-ffmpeg-videoplayer/audiofactory.hpp>
 
 namespace MWSound
 {

extern/osg-ffmpeg-videoplayer/CMakeLists.txt

@@ -1,8 +1,8 @@
-set(OGRE_FFMPEG_VIDEOPLAYER_LIBRARY "ogre-ffmpeg-videoplayer")
+set(OSG_FFMPEG_VIDEOPLAYER_LIBRARY "osg-ffmpeg-videoplayer")
 
 # Sources
 
-set(OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES
+set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
     videoplayer.cpp
     videostate.cpp
     videodefs.hpp
@@ -36,7 +36,7 @@ set(BOOST_COMPONENTS thread)
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 include_directories(${Boost_INCLUDE_DIRS})
 
-add_library(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OGRE_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
+add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
-target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})