From 77f0c52ba83b979c144b563242217bd39a03ec7c Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Fri, 15 Apr 2016 09:10:01 +0200
Subject: [PATCH] Renamed avplay app to avplayer

Fix #240
---
 app/CMakeLists.txt                      |  2 +-
 app/{avPlay => avPlayer}/CMakeLists.txt | 14 +++++++-------
 app/{avPlay => avPlayer}/Window.cpp     |  0
 app/{avPlay => avPlayer}/Window.hpp     |  0
 app/{avPlay => avPlayer}/main.cpp       |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename app/{avPlay => avPlayer}/CMakeLists.txt (60%)
 rename app/{avPlay => avPlayer}/Window.cpp (100%)
 rename app/{avPlay => avPlayer}/Window.hpp (100%)
 rename app/{avPlay => avPlayer}/main.cpp (96%)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 2f43938a..83ed81df 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,7 +1,7 @@
 # C++ apps
 add_subdirectory(avInfo)
 add_subdirectory(avMeta)
-add_subdirectory(avPlay)
+add_subdirectory(avPlayer)
 add_subdirectory(avProcessor)
 
 # Python apps
diff --git a/app/avPlay/CMakeLists.txt b/app/avPlayer/CMakeLists.txt
similarity index 60%
rename from app/avPlay/CMakeLists.txt
rename to app/avPlayer/CMakeLists.txt
index 066fddd5..bf735c2e 100644
--- a/app/avPlay/CMakeLists.txt
+++ b/app/avPlayer/CMakeLists.txt
@@ -1,4 +1,4 @@
-### cpp/avplay
+### cpp/avplayer
 
 # Load custom cmake utilities
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -7,7 +7,7 @@ include(AvTranscoderMacros)
 # Check OpenGL
 find_package(OpenGL)
 if(NOT OPENGL_FOUND)
-	message("OpenGL not found, will not build avplay app.")
+	message("OpenGL not found, will not build avplayer app.")
 	return()
 endif()
 
@@ -27,15 +27,15 @@ endif()
 include_directories( ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIR} )
 
 file(GLOB AVPLAY_SRC_FILES "*.cpp" "*.hpp")
-add_executable(avplay ${AVPLAY_SRC_FILES})
-set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
-target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
+add_executable(avplayer ${AVPLAY_SRC_FILES})
+set_target_properties(avplayer PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avplayer avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
 
 # Install app
 if(WIN32)
-	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay.exe")
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplayer.exe")
 else()
-	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}")
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplayer" "${CMAKE_CURRENT_BINARY_DIR}/avplayer-${AVTRANSCODER_VERSION}")
 endif()
 
 install(
diff --git a/app/avPlay/Window.cpp b/app/avPlayer/Window.cpp
similarity index 100%
rename from app/avPlay/Window.cpp
rename to app/avPlayer/Window.cpp
diff --git a/app/avPlay/Window.hpp b/app/avPlayer/Window.hpp
similarity index 100%
rename from app/avPlay/Window.hpp
rename to app/avPlayer/Window.hpp
diff --git a/app/avPlay/main.cpp b/app/avPlayer/main.cpp
similarity index 96%
rename from app/avPlay/main.cpp
rename to app/avPlayer/main.cpp
index 2dd6ff1b..e250fa79 100644
--- a/app/avPlay/main.cpp
+++ b/app/avPlayer/main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
 
     std::string help;
     help += "Usage\n";
-    help += "\tavplay filename [streamIndex] [--width width] [--height height] [--help]\n";
+    help += "\tavplayer filename [streamIndex] [--width width] [--height height] [--help]\n";
     help += "Command line options\n";
     help += "\tstreamIndex: specify the index of the stream to read (by default 0)\n";
     help += "\t--width: specify the output width (by default the same as input)\n";