Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 06:24:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
wangyix 2014-06-24 17:39:13 -07:00
commit d098edcdf0
2 changed files with 5 additions and 2 deletions
libraries/audio/src
AudioRingBuffer.h
tests/octree/src
ModelTests.cpp

2
libraries/audio/src/AudioRingBuffer.h
View file

@ -31,7 +31,7 @@ const int NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL = NETWORK_BUFFER_LENGTH_BYTE
const unsigned int BUFFER_SEND_INTERVAL_USECS = floorf((NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL
/ (float) SAMPLE_RATE) * 1000 * 1000);
const short RING_BUFFER_LENGTH_FRAMES = 100;
const short RING_BUFFER_LENGTH_FRAMES = 10;
const int MAX_SAMPLE_VALUE = std::numeric_limits<int16_t>::max();
const int MIN_SAMPLE_VALUE = std::numeric_limits<int16_t>::min();

5
tests/octree/src/ModelTests.cpp
View file

@ -14,6 +14,7 @@
#include <QDebug>
#if 0
#include <ModelItem.h>
#include <ModelTree.h>
#include <ModelTreeElement.h>
@ -21,11 +22,12 @@
#include <OctreeConstants.h>
#include <PropertyFlags.h>
#include <SharedUtil.h>
#endif
#include "ModelTests.h"
void ModelTests::modelTreeTests(bool verbose) {
#if 0
int testsTaken = 0;
int testsPassed = 0;
int testsFailed = 0;
@ -256,6 +258,7 @@ void ModelTests::modelTreeTests(bool verbose) {
if (verbose) {
qDebug() << "******************************************************************************************";
}
#endif
}