changes for stub pull request of assignee work

audio-mixer/CMakeLists.txt

@@ -18,7 +18,7 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
 # link the shared hifi library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-# link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
+link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
 
 # link the stk library
 set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)

eve/CMakeLists.txt

@@ -18,4 +18,4 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
-# link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
+link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})

hifi.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
 
   # Specify the location from where the source should be retrieved.
   #
-  s.source       = { :git => "https://github.com/birarda/hifi.git" }
+  s.source       = { :git => "https://github.com/worklist/hifi.git" }
   
   s.platform = :ios
   s.ios.deployment_target = "6.0"

injector/CMakeLists.txt

@@ -18,5 +18,5 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
 # link the shared hifi library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-# link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
+link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})

interface/CMakeLists.txt

@@ -87,7 +87,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
-# link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
+link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
 
 # find required libraries
 find_package(GLM REQUIRED)

libraries/audio/src/AudioInjector.cpp

@@ -149,7 +149,6 @@ void AudioInjector::addSamples(int16_t* sampleBuffer, int numSamples) {
     if (_audioSampleArray + _indexOfNextSlot + numSamples <= _audioSampleArray + _numTotalSamples) {
         // only copy the audio from the sample buffer if there's space
         memcpy(_audioSampleArray + _indexOfNextSlot, sampleBuffer, numSamples * sizeof(int16_t));
-        printf("Copied %d samples to the buffer\n", numSamples);
         _indexOfNextSlot += numSamples;
     }
 }

libraries/avatars/src/AvatarData.cpp

@@ -15,7 +15,7 @@
 #include <SharedUtil.h>
 
 #include "AvatarData.h"
-//#include <VoxelConstants.h>
+#include <VoxelConstants.h>
 
 using namespace std;
 
@@ -309,8 +309,7 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
 }
 
 glm::vec3 AvatarData::calculateCameraDirection() const {
-//    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
-    glm::vec3 direction;
+    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
     return direction;
 }
 

libraries/shared/src/NodeList.cpp

@@ -116,10 +116,8 @@ void NodeList::processNodeData(sockaddr* senderAddress, unsigned char* packetDat
             sockaddr_in domainServerSocket = *(sockaddr_in*) senderAddress;
             const char* domainSenderIP = inet_ntoa(domainServerSocket.sin_addr);
             
-            processDomainServerList(packetData, dataBytes);
-            
             if (memcmp(domainSenderIP, _domainIP, strlen(domainSenderIP)) == 0) {
-                
+                processDomainServerList(packetData, dataBytes);
             }
             
             break;