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

Bugfixes from testing (release of 3d buffer, saving of transmit from settings, better rolloff defaults, smaller indentation for the channelview).

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@199 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2005-09-24 00:13:22 +00:00
parent 36b374935a
commit 5ec2fcffdf
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DXAudioOutput.cpp
View File

@ -125,6 +125,8 @@ DXAudioOutputPlayer::DXAudioOutputPlayer(DXAudioOutput *ao, Player *player) : Au
DXAudioOutputPlayer::~DXAudioOutputPlayer() {
qWarning("DXAudioOutputPlayer: %s: Removed", p->qsName.toLatin1().constData());
if (pDS3dBuffer)
pDS3dBuffer->Release();
if (pDSNotify)
pDSNotify->Release();
if (pDSBOutput) {

10
DXConfigDialog.cpp
View File

@ -196,10 +196,10 @@ DXConfigDialog::DXConfigDialog(QWidget *p) : ConfigWidget(p) {
grid->addWidget(qsMaxDistance, 2, 1);
grid->addWidget(qlMaxDistance, 2, 2);
qsRollOff->setRange(lround(DS3D_MINROLLOFFFACTOR*10), lround(DS3D_MAXROLLOFFFACTOR *10));
qsRollOff->setRange(0, 200);
qsRollOff->setSingleStep(1);
qsRollOff->setPageStep(10);
qsRollOff->setValue(lround(g.s.fDXRollOff * 10));
qsRollOff->setValue(lround(g.s.fDXRollOff * 100));
qsRollOff->setObjectName("RollOff");
l = new QLabel(tr("RollOff"));
l->setBuddy(qsRollOff);
@ -266,7 +266,7 @@ void DXConfigDialog::accept() {
g.s.fDXMinDistance = qsMinDistance->value() / 10.0;
g.s.fDXMaxDistance = qsMaxDistance->value() / 10.0;
g.s.fDXDoppler = qsDoppler->value() / 10.0;
g.s.fDXRollOff = qsRollOff->value() / 10.0;
g.s.fDXRollOff = qsRollOff->value() / 100.0;
}
void DXConfigDialog::on_OutputDelay_valueChanged(int v) {
@ -292,14 +292,14 @@ void DXConfigDialog::on_Doppler_valueChanged(int v) {
}
void DXConfigDialog::on_RollOff_valueChanged(int v) {
qlRollOff->setText(tr("%1").arg(v/10.0, 0, 'f', 1));
qlRollOff->setText(tr("%1").arg(v/100.0, 0, 'f', 2));
updateIntensity();
}
void DXConfigDialog::updateIntensity() {
float min = qsMinDistance->value() / 10.0;
float max = qsMaxDistance->value() / 10.0;
float roll = qsRollOff->value() / 10.0;
float roll = qsRollOff->value() / 100.0;
float intensity = min / (min + (max-min)*roll);
qlIntensity->setText(tr("Players more than %1 meters away have %2% intensity").arg(max,0,'f',1).arg(intensity * 100.0, 0, 'f', 1));

1
MainWindow.cpp
View File

@ -182,6 +182,7 @@ void MainWindow::setupGui() {
view->setDragEnabled(true);
view->setDropIndicatorShown(true);
view->setAcceptDrops(true);
view->setIndentation(10);
qteLog = new QTextEdit(this);
qteLog->setReadOnly(true);

1
Plugins.cpp
View File

@ -136,6 +136,7 @@ QIcon PluginConfig::icon() const {
}
void PluginConfig::accept() {
g.s.ptTransmit = static_cast<Settings::PosTransmit>(qcbTransmit->currentIndex());
}
void PluginConfig::on_Config_clicked() {

2
Server.cpp
View File

@ -405,6 +405,8 @@ void MessageServerAuthenticate::process(Connection *cCon) {
g_sServer->sendMessage(cCon, &mpm);
}
// Legg til MOVE
MessageServerSync mssMsg;
mssMsg.sPlayerId = pSrcPlayer->sId;
mssMsg.qsWelcomeText = g_sp.qsWelcomeText;

6
Settings.cpp
View File

@ -44,10 +44,10 @@ Settings::Settings() {
iVoiceHold = 30;
iJitterBufferSize = 8;
iDXOutputDelay = 1;
fDXMinDistance = 5.0;
fDXMaxDistance = 35.0;
fDXMinDistance = 10.0;
fDXMaxDistance = 50.0;
fDXDoppler = 0.0;
fDXRollOff = 0.5;
fDXRollOff = 0.15;
}
void Settings::load() {