Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin'

Browse source
This commit is contained in:
Philip Rosedale 2013-02-12 13:18:59 -08:00
commit 98612c8705
3 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/modules/FindLodePNG.cmake
View file

@ -15,9 +15,12 @@ if (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS)
# in cache already
set(LODEPNG_FOUND TRUE)
else (LODEPNG_LIBRARY AND LODEPNG_INCLUDE_DIRS)
FIND_PATH(LODEPNG_INCLUDE_DIR "lodepng.h"
PATHS ${LODEPNG_ROOT_DIR})
set(LODEPNG_INCLUDE_DIRS
${LODEPNG_ROOT_DIR}/lodepng.h
${LODEPNG_INCLUDE_DIR}
)
set(LODEPNG_LIBRARY

30
interface/CMakeLists.txt
View file

@ -45,23 +45,23 @@ ExternalProject_Add(
BUILD_COMMAND make
)
if (UNIX AND NOT APPLE)
find_package(Threads REQUIRED)
find_package(Librt REQUIRED)
find_package(Jack REQUIRED)
find_package(ALSA REQUIRED)
target_link_libraries(portaudio
${CMAKE_THREAD_LIBS_INIT}
${LIBRT_LIBRARIES}
${JACK_LIBRARIES}
${ALSA_LIBRARIES}
)
endif (UNIX AND NOT APPLE)
ExternalProject_Get_Property(portaudio binary_dir)
ExternalProject_Get_Property(portaudio source_dir)
include_directories(${source_dir}/include)
add_dependencies(interface portaudio)
target_link_libraries(interface ${binary_dir}/lib/.libs/libportaudio.a)
target_link_libraries(interface ${binary_dir}/lib/.libs/libportaudio.a)
if (UNIX AND NOT APPLE)
find_package(Threads REQUIRED)
find_package(Librt REQUIRED)
find_package(ALSA)
find_package(Jack)
target_link_libraries(interface
${CMAKE_THREAD_LIBS_INIT}
${LIBRT_LIBRARIES}
${JACK_LIBRARIES}
${ALSA_LIBRARIES}
)
endif (UNIX AND NOT APPLE)

6
interface/src/AudioSource.cpp
View file

@ -23,7 +23,11 @@ int AudioSource::loadDataFromFile(const char *filename) {
std::rewind(soundFile);
sourceData = new int16_t[lengthInSamples];
std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
size_t bytesRead = std::fread(sourceData, sizeof(int16_t), lengthInSamples, soundFile);
if (bytesRead != lengthInSamples) {
std::cout << "Error loading audio source data from file " << filename << "!\n";
}
std::fclose(soundFile);