From b74e45e675bd3596c7760b5c8f47a77ad222c21d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 12 Feb 2013 11:33:56 -0800
Subject: [PATCH 1/4] libraries for portaudio should be linked to interface

---
 interface/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index f1712aca8f..001ed2db8e 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -48,10 +48,10 @@ ExternalProject_Add(
 if (UNIX AND NOT APPLE)
     find_package(Threads REQUIRED)
     find_package(Librt REQUIRED)
-    find_package(Jack REQUIRED)
-    find_package(ALSA REQUIRED)
+    find_package(ALSA)
+    find_package(Jack)
     
-    target_link_libraries(portaudio
+    target_link_libraries(interface
         ${CMAKE_THREAD_LIBS_INIT}
         ${LIBRT_LIBRARIES}
         ${JACK_LIBRARIES}

From 04492b28bdb752cba2f91edd32da348ecf0b3951 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 12 Feb 2013 11:44:48 -0800
Subject: [PATCH 2/4] link portaudio required libraries after portaudio

---
 interface/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 001ed2db8e..efccdd9a70 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -45,6 +45,13 @@ ExternalProject_Add(
     BUILD_COMMAND make
 )
 
+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)
+
 if (UNIX AND NOT APPLE)
     find_package(Threads REQUIRED)
     find_package(Librt REQUIRED)
@@ -57,11 +64,4 @@ if (UNIX AND NOT APPLE)
         ${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)
\ No newline at end of file
+endif (UNIX AND NOT APPLE)
\ No newline at end of file

From 1ba48cf7fe402fbfd2ba86a761be69eaf23998ac Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 12 Feb 2013 11:55:46 -0800
Subject: [PATCH 3/4] make LODEPNG_INCLUDE_DIRS should be dir, not file

---
 cmake/modules/FindLodePNG.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/FindLodePNG.cmake b/cmake/modules/FindLodePNG.cmake
index d3631df907..4568d59765 100644
--- a/cmake/modules/FindLodePNG.cmake
+++ b/cmake/modules/FindLodePNG.cmake
@@ -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

From b426ea52d5e88c1fbdde96298445a16ce04a90bf Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 12 Feb 2013 12:11:24 -0800
Subject: [PATCH 4/4] fix unused fread return value warning

---
 interface/src/AudioSource.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interface/src/AudioSource.cpp b/interface/src/AudioSource.cpp
index 90955ed274..07b3d2ce65 100644
--- a/interface/src/AudioSource.cpp
+++ b/interface/src/AudioSource.cpp
@@ -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);