mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compiler warning cleanups

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1140 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2008-05-08 23:23:24 +00:00
parent 00b954a26d
commit 079e6ac7fa
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mumble/AudioWizard.cpp
View File

@ -744,21 +744,21 @@ void AudioWizard::on_Ticker_timeout() {
qWarning("It's at %f %f", qgiSource->x(), qgiSource->y());
}
} else if (currentPage() == qwpPositional) {
float x, y;
float xp, yp;
if ((fX == 0.0f) && (fY == 0.0f)) {
fAngle += 0.05;
x = sin(fAngle) * 2.0f;
y = cos(fAngle) * 2.0f;
xp = sin(fAngle) * 2.0f;
yp = cos(fAngle) * 2.0f;
} else {
x = fX;
y = fY;
xp = fX;
yp = fY;
}
qgiSource->setPos(x, y);
asSource->fPos[0] = x;
qgiSource->setPos(xp, yp);
asSource->fPos[0] = xp;
asSource->fPos[1] = 0;
asSource->fPos[2] = y;
asSource->fPos[2] = yp;
}
}

8
src/mumble/ConfigDialog.cpp
View File

@ -134,14 +134,14 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
void ConfigDialog::addPage(ConfigWidget *cw, unsigned int idx) {
QDesktopWidget dw;
int width = INT_MAX, height = INT_MAX;
int w = INT_MAX, h = INT_MAX;
for (int i=0;i<dw.numScreens();++i) {
QRect ds=dw.availableGeometry(i);
if (ds.isValid()) {
width = qMin(width, ds.width());
height = qMin(height, ds.height());
w = qMin(w, ds.width());
h = qMin(h, ds.height());
}
}
@ -151,7 +151,7 @@ void ConfigDialog::addPage(ConfigWidget *cw, unsigned int idx) {
ms.rwidth() += 128;
ms.rheight() += 192;
if ((ms.width() > width) || (ms.height() > height)) {
if ((ms.width() > w) || (ms.height() > h)) {
QScrollArea *qsa=new QScrollArea(this);
qsa->setWidgetResizable(true);
qsa->setWidget(cw);

2
src/mumble/PulseAudio.cpp
View File

@ -68,7 +68,7 @@ class PulseAudioInit : public DeferInit {
pasys = new PulseAudioSystem();
pasys->qmWait.lock();
pasys->start(QThread::TimeCriticalPriority);
pasys->qwcWait.wait(&pasys->qmWait);
pasys->qwcWait.wait(&pasys->qmWait, 1000);
if (pasys->bPulseIsGood) {
airPulseAudio = new PulseAudioInputRegistrar();
aorPulseAudio = new PulseAudioOutputRegistrar();