StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into alphabetize

Browse Source
This commit is contained in:
zero-one 2015-01-04 01:30:11 -08:00
commit 672cd42065
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -37,6 +37,6 @@ This client runs on Windows, Linux and Mac natively.<br/>
##Developer overview:
[GitStats](http://207.12.89.155/index.html)<br/>
[GitStats](http://104.219.184.93/index.html)<br/>
[Mac & Linux jenkins](https://jenkins.libtoxcore.so/user/tux3/my-views/view/qTox/)<br/>
[Windows jenkins](http://207.12.89.155:8080)<br/>
[Windows jenkins](http://104.219.184.93:8080)<br/>

8
qtox.pro
View File

@ -77,6 +77,14 @@ win32 {
LIBS += -liphlpapi -L$$PWD/libs/lib -lsodium -ltoxav -ltoxcore -ltoxencryptsave -ltoxdns -lvpx -lpthread
LIBS += -L$$PWD/libs/lib -lopencv_core248 -lopencv_highgui248 -lopencv_imgproc248 -lOpenAL32 -lopus
LIBS += -lopengl32 -lole32 -loleaut32 -luuid -lvfw32 -ljpeg -ltiff -lpng -ljasper -lIlmImf -lHalf -lws2_32 -lz
contains(DEFINES, QTOX_FILTER_AUDIO) {
contains(STATICPKG, YES) {
LIBS += -Wl,-Bstatic -lfilteraudio
} else {
LIBS += -lfilteraudio
}
}
} else {
macx {
BUNDLEID = im.tox.qtox

11
src/coreav.cpp
View File

@ -226,6 +226,11 @@ void Core::playCallAudio(void* toxav, int32_t callId, const int16_t *data, uint1
if (!calls[callId].alSource)
alGenSources(1, &calls[callId].alSource);
#ifdef QTOX_FILTER_AUDIO
if (filterer[callId])
filterer[callId]->filterAudio((int16_t*) data, samples);
#endif
ToxAvCSettings dest;
if (toxav_get_peer_csettings((ToxAv*)toxav, callId, 0, &dest) == 0)
playAudioBuffer(calls[callId].alSource, data, samples, dest.audio_channels, dest.audio_sample_rate);
@ -266,12 +271,6 @@ void Core::sendCallAudio(int callId, ToxAv* toxav)
return;
}
#ifdef QTOX_FILTER_AUDIO
if (filterer[callId])
{
filterer[callId]->filterAudio((int16_t*) buf, framesize);
}
#endif
if ((r = toxav_send_audio(toxav, callId, dest, r)) < 0)
{
qDebug() << "Core: toxav_send_audio error";