Skip to content

Renamed avplay app to avplayer #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2016
Merged

Renamed avplay app to avplayer #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# C++ apps
add_subdirectory(avInfo)
add_subdirectory(avMeta)
add_subdirectory(avPlay)
add_subdirectory(avPlayer)
add_subdirectory(avProcessor)

# Python apps
Expand Down
14 changes: 7 additions & 7 deletions app/avPlay/CMakeLists.txt → app/avPlayer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### cpp/avplay
### cpp/avplayer

# Load custom cmake utilities
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
Expand All @@ -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()

Expand All @@ -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(
Expand Down
0 app/avPlay/Window.cpp → app/avPlayer/Window.cpp
View file
Open in desktop
File renamed without changes.
0 app/avPlay/Window.hpp → app/avPlayer/Window.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/avPlay/main.cpp → app/avPlayer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down