Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-03 21:29:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix warning and compile with Multimedia

Browse source
This commit is contained in:
Stephen Birarda 2015-01-21 13:28:18 -08:00
parent 343b09c855
commit a3529e745b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -68,7 +68,8 @@ if (ANDROID)
endif () endif ()
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
if (ANDROID_LIB_DIR) if (ANDROID_LIB_DIR)
list(APPEND CMAKE_FIND_ROOT_PATH ${ANDROID_LIB_DIR}) list(APPEND CMAKE_FIND_ROOT_PATH ${ANDROID_LIB_DIR})

2
libraries/audio-client/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(TARGET_NAME audio-client) set(TARGET_NAME audio-client)
# use setup_hifi_library macro to setup our project and link appropriate Qt modules # use setup_hifi_library macro to setup our project and link appropriate Qt modules
setup_hifi_library(Network) setup_hifi_library(Network Multimedia)
link_hifi_libraries(audio) link_hifi_libraries(audio)

7
libraries/audio-client/src/AudioClient.h
View file

@ -60,7 +60,7 @@ static const int MIN_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 1;
static const int MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 20; static const int MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 20;
static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED = true; static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED = true;
static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD = 3; static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_THRESHOLD = 3;
static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD = 10 * 1000; // 10 Seconds static const quint64 DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_PERIOD = 10 * 1000; // 10 Seconds
class QAudioInput; class QAudioInput;
class QAudioOutput; class QAudioOutput;
@ -117,7 +117,7 @@ public:
void setOutputStarveDetectionEnabled(bool enabled) { _outputStarveDetectionEnabled = enabled; } void setOutputStarveDetectionEnabled(bool enabled) { _outputStarveDetectionEnabled = enabled; }
int getOutputStarveDetectionPeriod() { return _outputStarveDetectionPeriodMsec; } int getOutputStarveDetectionPeriod() { return _outputStarveDetectionPeriodMsec; }
void setOutputStarveDetectionPeriod(int msecs) { _outputStarveDetectionPeriodMsec = msecs; } void setOutputStarveDetectionPeriod(quint64 msecs) { _outputStarveDetectionPeriodMsec = msecs; }
int getOutputStarveDetectionThreshold() { return _outputStarveDetectionThreshold; } int getOutputStarveDetectionThreshold() { return _outputStarveDetectionThreshold; }
void setOutputStarveDetectionThreshold(int threshold) { _outputStarveDetectionThreshold = threshold; } void setOutputStarveDetectionThreshold(int threshold) { _outputStarveDetectionThreshold = threshold; }
@ -209,9 +209,8 @@ private:
bool _outputStarveDetectionEnabled; bool _outputStarveDetectionEnabled;
quint64 _outputStarveDetectionStartTimeMsec; quint64 _outputStarveDetectionStartTimeMsec;
int _outputStarveDetectionCount; int _outputStarveDetectionCount;
int _outputStarveDetectionPeriodMsec; quint64 _outputStarveDetectionPeriodMsec;
int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size int _outputStarveDetectionThreshold; // Maximum number of starves per _outputStarveDetectionPeriod before increasing buffer size
StDev _stdev; StDev _stdev;
QElapsedTimer _timeSinceLastReceived; QElapsedTimer _timeSinceLastReceived;