Skip to content

Commit 14164d6

Browse files
committed
Merge pull request #243 from cchampet/dev_renameAvplayApp
Renamed avplay app to avplayer
2 parents 0625d58 + 77f0c52 commit 14164d6

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

app/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# C++ apps
22
add_subdirectory(avInfo)
33
add_subdirectory(avMeta)
4-
add_subdirectory(avPlay)
4+
add_subdirectory(avPlayer)
55
add_subdirectory(avProcessor)
66

77
# Python apps

app/avPlay/CMakeLists.txt renamed to app/avPlayer/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### cpp/avplay
1+
### cpp/avplayer
22

33
# Load custom cmake utilities
44
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -7,7 +7,7 @@ include(AvTranscoderMacros)
77
# Check OpenGL
88
find_package(OpenGL)
99
if(NOT OPENGL_FOUND)
10-
message("OpenGL not found, will not build avplay app.")
10+
message("OpenGL not found, will not build avplayer app.")
1111
return()
1212
endif()
1313

@@ -27,15 +27,15 @@ endif()
2727
include_directories( ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR} )
2828

2929
file(GLOB AVPLAY_SRC_FILES "*.cpp" "*.hpp")
30-
add_executable(avplay ${AVPLAY_SRC_FILES})
31-
set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
32-
target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
30+
add_executable(avplayer ${AVPLAY_SRC_FILES})
31+
set_target_properties(avplayer PROPERTIES VERSION ${AVTRANSCODER_VERSION})
32+
target_link_libraries(avplayer avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
3333

3434
# Install app
3535
if(WIN32)
36-
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay.exe")
36+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplayer.exe")
3737
else()
38-
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}")
38+
set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplayer" "${CMAKE_CURRENT_BINARY_DIR}/avplayer-${AVTRANSCODER_VERSION}")
3939
endif()
4040

4141
install(
File renamed without changes.
File renamed without changes.

app/avPlay/main.cpp renamed to app/avPlayer/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
1414

1515
std::string help;
1616
help += "Usage\n";
17-
help += "\tavplay filename [streamIndex] [--width width] [--height height] [--help]\n";
17+
help += "\tavplayer filename [streamIndex] [--width width] [--height height] [--help]\n";
1818
help += "Command line options\n";
1919
help += "\tstreamIndex: specify the index of the stream to read (by default 0)\n";
2020
help += "\t--width: specify the output width (by default the same as input)\n";

0 commit comments

Comments
 (0)