From 92ef9b1c57130698b7882af7d0aa71339089e5b1 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sun, 19 Apr 2015 20:14:06 +0200 Subject: [PATCH] Rename to osg-ffmpeg-videoplayer --- CMakeLists.txt | 2 +- apps/openmw/CMakeLists.txt | 2 +- apps/openmw/mwgui/videowidget.cpp | 2 +- apps/openmw/mwsound/movieaudiofactory.cpp | 4 ++-- apps/openmw/mwsound/movieaudiofactory.hpp | 2 +- .../CMakeLists.txt | 8 ++++---- .../License.txt | 0 .../audiodecoder.cpp | 0 .../audiodecoder.hpp | 0 .../audiofactory.hpp | 0 .../libavwrapper.cpp | 0 .../videodefs.hpp | 0 .../videoplayer.cpp | 0 .../videoplayer.hpp | 0 .../videostate.cpp | 0 .../videostate.hpp | 0 16 files changed, 10 insertions(+), 10 deletions(-) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/CMakeLists.txt (78%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/License.txt (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/audiodecoder.cpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/audiodecoder.hpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/audiofactory.hpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/libavwrapper.cpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/videodefs.hpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/videoplayer.cpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/videoplayer.hpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/videostate.cpp (100%) rename extern/{ogre-ffmpeg-videoplayer => osg-ffmpeg-videoplayer}/videostate.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5319d600..e806b2578 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 46eb79462..c8854f84b 100644 --- a/apps/openmw/CMakeLists.txt +++ b/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 ) diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp index 4ead16c5b..28771f14f 100644 --- a/apps/openmw/mwgui/videowidget.cpp +++ b/apps/openmw/mwgui/videowidget.cpp @@ -1,6 +1,6 @@ #include "videowidget.hpp" -//#include +//#include #include diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp index 198a66c53..47889051a 100644 --- a/apps/openmw/mwsound/movieaudiofactory.cpp +++ b/apps/openmw/mwsound/movieaudiofactory.cpp @@ -1,7 +1,7 @@ #include "movieaudiofactory.hpp" -#include -#include +#include +#include #include "../mwbase/environment.hpp" #include "../mwbase/soundmanager.hpp" diff --git a/apps/openmw/mwsound/movieaudiofactory.hpp b/apps/openmw/mwsound/movieaudiofactory.hpp index a3c602197..1391a0012 100644 --- a/apps/openmw/mwsound/movieaudiofactory.hpp +++ b/apps/openmw/mwsound/movieaudiofactory.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H #define OPENMW_MWSOUND_MOVIEAUDIOFACTORY_H -#include +#include namespace MWSound { diff --git a/extern/ogre-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt similarity index 78% rename from extern/ogre-ffmpeg-videoplayer/CMakeLists.txt rename to extern/osg-ffmpeg-videoplayer/CMakeLists.txt index 299a57799..92a2f3424 100644 --- a/extern/ogre-ffmpeg-videoplayer/CMakeLists.txt +++ b/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}) -target_link_libraries(${OGRE_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES}) +add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES}) +target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${VIDEO_FFMPEG_LIBRARIES} ${Boost_LIBRARIES}) link_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/extern/ogre-ffmpeg-videoplayer/License.txt b/extern/osg-ffmpeg-videoplayer/License.txt similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/License.txt rename to extern/osg-ffmpeg-videoplayer/License.txt diff --git a/extern/ogre-ffmpeg-videoplayer/audiodecoder.cpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.cpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/audiodecoder.cpp rename to extern/osg-ffmpeg-videoplayer/audiodecoder.cpp diff --git a/extern/ogre-ffmpeg-videoplayer/audiodecoder.hpp b/extern/osg-ffmpeg-videoplayer/audiodecoder.hpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/audiodecoder.hpp rename to extern/osg-ffmpeg-videoplayer/audiodecoder.hpp diff --git a/extern/ogre-ffmpeg-videoplayer/audiofactory.hpp b/extern/osg-ffmpeg-videoplayer/audiofactory.hpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/audiofactory.hpp rename to extern/osg-ffmpeg-videoplayer/audiofactory.hpp diff --git a/extern/ogre-ffmpeg-videoplayer/libavwrapper.cpp b/extern/osg-ffmpeg-videoplayer/libavwrapper.cpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/libavwrapper.cpp rename to extern/osg-ffmpeg-videoplayer/libavwrapper.cpp diff --git a/extern/ogre-ffmpeg-videoplayer/videodefs.hpp b/extern/osg-ffmpeg-videoplayer/videodefs.hpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/videodefs.hpp rename to extern/osg-ffmpeg-videoplayer/videodefs.hpp diff --git a/extern/ogre-ffmpeg-videoplayer/videoplayer.cpp b/extern/osg-ffmpeg-videoplayer/videoplayer.cpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/videoplayer.cpp rename to extern/osg-ffmpeg-videoplayer/videoplayer.cpp diff --git a/extern/ogre-ffmpeg-videoplayer/videoplayer.hpp b/extern/osg-ffmpeg-videoplayer/videoplayer.hpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/videoplayer.hpp rename to extern/osg-ffmpeg-videoplayer/videoplayer.hpp diff --git a/extern/ogre-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/videostate.cpp rename to extern/osg-ffmpeg-videoplayer/videostate.cpp diff --git a/extern/ogre-ffmpeg-videoplayer/videostate.hpp b/extern/osg-ffmpeg-videoplayer/videostate.hpp similarity index 100% rename from extern/ogre-ffmpeg-videoplayer/videostate.hpp rename to extern/osg-ffmpeg-videoplayer/videostate.hpp