← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/mumble11x/Settings.h

Committer: Bazaar Package Importer
Author(s): Thorvald Natvig
Date: 2010-01-09 19:28:50 UTC
mfrom: (9.1.6 sid)
Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob

Tags: 1.2.1-2

Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

files added:
celt-0.7.0-src/libcelt/plc.c

debian/patches/.dpkg-source-applied

debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch

icons/tango/actions/bookmark-new.svg

plugins/bf1942

plugins/bf1942/bf1942.cpp

plugins/bf1942/bf1942.pro

plugins/etqw

plugins/etqw/etqw.cpp

plugins/etqw/etqw.pro

plugins/lotro

plugins/lotro/lotro.cpp

plugins/lotro/lotro.pro

plugins/ut2004

plugins/ut2004/ut2004.cpp

plugins/ut2004/ut2004.pro

plugins/ut3

plugins/ut3/ut3.cpp

plugins/ut3/ut3.pro

src/mumble/TaskList.cpp

src/mumble/TaskList.h

src/mumble/mumble_da.ts

src/mumble11x/CrashReporter.cpp

src/mumble11x/CrashReporter.h

src/mumble11x/mumble_it.ts

files removed:
speex/libspeex/DEADJOE

files modified:
CHANGES

LICENSE

celt-0.7.0-src/libcelt/_kiss_fft_guts.h

celt-0.7.0-src/libcelt/arch.h

celt-0.7.0-src/libcelt/bands.h

celt-0.7.0-src/libcelt/c64_fft.h

celt-0.7.0-src/libcelt/celt.c

celt-0.7.0-src/libcelt/celt.h

celt-0.7.0-src/libcelt/celt_header.h

celt-0.7.0-src/libcelt/celt_types.h

celt-0.7.0-src/libcelt/cwrs.h

celt-0.7.0-src/libcelt/fixed_c5x.h

celt-0.7.0-src/libcelt/fixed_c6x.h

celt-0.7.0-src/libcelt/fixed_debug.h

celt-0.7.0-src/libcelt/fixed_generic.h

celt-0.7.0-src/libcelt/float_cast.h

celt-0.7.0-src/libcelt/kfft_double.h

celt-0.7.0-src/libcelt/kfft_single.h

celt-0.7.0-src/libcelt/kiss_fft.h

celt-0.7.0-src/libcelt/kiss_fftr.h

celt-0.7.0-src/libcelt/laplace.h

celt-0.7.0-src/libcelt/mathops.h

celt-0.7.0-src/libcelt/mdct.h

celt-0.7.0-src/libcelt/modes.h

celt-0.7.0-src/libcelt/os_support.h

celt-0.7.0-src/libcelt/pitch.h

celt-0.7.0-src/libcelt/psy.h

celt-0.7.0-src/libcelt/quant_bands.h

celt-0.7.0-src/libcelt/rate.h

celt-0.7.0-src/libcelt/stack_alloc.h

celt-0.7.0-src/libcelt/vq.h

compiler.pri

debian/backports/jaunty

debian/changelog

debian/patches/series

g15helper/g15helper.plist

g15helper/g15helper.pro

g15helper/g15helper.rc

man/murmurd.1

overlay/d3d10.cpp

overlay/d3d9.cpp

overlay/lib.cpp

overlay/opengl.cpp

overlay/overlay.h

overlay_gl/overlay.c

overlay_gl/overlay_gl.pro

overlay_macx/common.pri

overlay_macx/launcher/launcher.plist

overlay_macx/overlay/overlay.m

plugins/aoc/aoc.cpp

plugins/bf2/bf2.cpp

plugins/bf2142/bf2142.cpp

plugins/bfheroes/bfheroes.cpp

plugins/cod2/cod2.cpp

plugins/cod4/cod4.cpp

plugins/cod5/cod5.cpp

plugins/codmw2/codmw2.cpp

plugins/codmw2so/codmw2so.cpp

plugins/css/css.cpp

plugins/dods/dods.cpp

plugins/dys/dys.cpp

plugins/gmod/gmod.cpp

plugins/hl2dm/hl2dm.cpp

plugins/insurgency/insurgency.cpp

plugins/l4d/l4d.cpp

plugins/link/link-posix.cpp

plugins/link/link.cpp

plugins/manual/manual.cpp

plugins/mumble_plugin.h

plugins/plugins.pro

plugins/tf2/tf2.cpp

plugins/wolfet/wolfet.cpp

plugins/wow/wow.cpp

scripts/icedemo.php

speex/include/speex/speex.h

speex/include/speex/speex_bits.h

speex/include/speex/speex_buffer.h

speex/include/speex/speex_callbacks.h

speex/include/speex/speex_echo.h

speex/include/speex/speex_header.h

speex/include/speex/speex_jitter.h

speex/include/speex/speex_preprocess.h

speex/include/speex/speex_resampler.h

speex/include/speex/speex_stereo.h

speex/include/speex/speex_types.h

speex/libspeex/_kiss_fft_guts.h

speex/libspeex/arch.h

speex/libspeex/cb_search.h

speex/libspeex/cb_search_arm4.h

speex/libspeex/cb_search_bfin.h

speex/libspeex/cb_search_sse.h

speex/libspeex/fftwrap.h

speex/libspeex/filters.h

speex/libspeex/filters_arm4.h

speex/libspeex/filters_bfin.h

speex/libspeex/filters_sse.h

speex/libspeex/fixed_arm4.h

speex/libspeex/fixed_arm5e.h

speex/libspeex/fixed_bfin.h

speex/libspeex/fixed_debug.h

speex/libspeex/fixed_generic.h

speex/libspeex/kiss_fft.h

speex/libspeex/kiss_fftr.h

speex/libspeex/lpc.h

speex/libspeex/lpc_bfin.h

speex/libspeex/lsp.h

speex/libspeex/lsp_bfin.h

speex/libspeex/ltp.h

speex/libspeex/ltp_arm4.h

speex/libspeex/ltp_bfin.h

speex/libspeex/ltp_sse.h

speex/libspeex/math_approx.h

speex/libspeex/misc_bfin.h

speex/libspeex/modes.h

speex/libspeex/nb_celp.h

speex/libspeex/os_support.h

speex/libspeex/pseudofloat.h

speex/libspeex/quant_lsp.h

speex/libspeex/quant_lsp_bfin.h

speex/libspeex/resample_sse.h

speex/libspeex/sb_celp.h

speex/libspeex/stack_alloc.h

speex/libspeex/vbr.h

speex/libspeex/vorbis_psy.h

speex/libspeex/vq.h

speex/libspeex/vq_arm4.h

speex/libspeex/vq_bfin.h

speex/libspeex/vq_sse.h

speexbuild/mumble_speex_init.c

speexbuild/speexbuild.pro

src/ACL.cpp

src/ACL.h

src/Channel.cpp

src/Channel.h

src/Connection.cpp

src/Connection.h

src/CryptState.cpp

src/CryptState.h

src/Group.cpp

src/Group.h

src/Message.h

src/Mumble.proto

src/Net.cpp

src/Net.h

src/OSInfo.cpp

src/OSInfo.h

src/PacketDataStream.h

src/SSL.cpp

src/SSL.h

src/Timer.cpp

src/Timer.h

src/User.cpp

src/User.h

src/Version.h

src/bonjour/bonjourserviceresolver.cpp

src/bonjour/bonjourserviceresolver.h

src/mumble.pri

src/mumble/ACLEditor.cpp

src/mumble/ACLEditor.h

src/mumble/ACLEditor.ui

src/mumble/ALSAAudio.cpp

src/mumble/ALSAAudio.h

src/mumble/ASIOInput.cpp

src/mumble/ASIOInput.h

src/mumble/About.cpp

src/mumble/About.h

src/mumble/Audio.cpp

src/mumble/Audio.h

src/mumble/AudioConfigDialog.cpp

src/mumble/AudioConfigDialog.h

src/mumble/AudioInput.cpp

src/mumble/AudioInput.h

src/mumble/AudioInput.ui

src/mumble/AudioOutput.cpp

src/mumble/AudioOutput.h

src/mumble/AudioOutput.ui

src/mumble/AudioStats.cpp

src/mumble/AudioStats.h

src/mumble/AudioWizard.cpp

src/mumble/AudioWizard.h

src/mumble/AudioWizard.ui

src/mumble/BanEditor.cpp

src/mumble/BanEditor.h

src/mumble/Cert.cpp

src/mumble/Cert.h

src/mumble/Cert.ui

src/mumble/ClientUser.cpp

src/mumble/ClientUser.h

src/mumble/ConfigDialog.cpp

src/mumble/ConfigDialog.h

src/mumble/ConfigDialog.mm

src/mumble/ConfigWidget.cpp

src/mumble/ConfigWidget.h

src/mumble/ConnectDialog.cpp

src/mumble/ConnectDialog.h

src/mumble/ConnectDialog.ui

src/mumble/CoreAudio.cpp

src/mumble/CoreAudio.h

src/mumble/CrashReporter.cpp

src/mumble/CustomElements.cpp

src/mumble/CustomElements.h

src/mumble/DBus.cpp

src/mumble/DBus.h

src/mumble/Database.cpp

src/mumble/Database.h

src/mumble/DirectSound.cpp

src/mumble/DirectSound.h

src/mumble/G15LCDEngine_lglcd.cpp

src/mumble/G15LCDEngine_lglcd.h

src/mumble/G15LCDEngine_unix.cpp

src/mumble/G15LCDEngine_unix.h

src/mumble/Global.cpp

src/mumble/Global.h

src/mumble/GlobalShortcut.cpp

src/mumble/GlobalShortcut.h

src/mumble/GlobalShortcutTarget.ui

src/mumble/GlobalShortcut_macx.cpp

src/mumble/GlobalShortcut_macx.h

src/mumble/GlobalShortcut_unix.cpp

src/mumble/GlobalShortcut_unix.h

src/mumble/GlobalShortcut_win.cpp

src/mumble/GlobalShortcut_win.h

src/mumble/LCD.cpp

src/mumble/LCD.h

src/mumble/Log.cpp

src/mumble/Log.h

src/mumble/LookConfig.cpp

src/mumble/LookConfig.h

src/mumble/LookConfig.ui

src/mumble/MainWindow.cpp

src/mumble/MainWindow.h

src/mumble/MainWindow.ui

src/mumble/Messages.cpp

src/mumble/NetworkConfig.cpp

src/mumble/NetworkConfig.h

src/mumble/OSS.cpp

src/mumble/OSS.h

src/mumble/Overlay.cpp

src/mumble/Overlay.h

src/mumble/Overlay.ui

src/mumble/Overlay_unix.cpp

src/mumble/Overlay_win.cpp

src/mumble/PAAudio.cpp

src/mumble/PAAudio.h

src/mumble/Plugins.cpp

src/mumble/Plugins.h

src/mumble/Plugins.ui

src/mumble/PulseAudio.cpp

src/mumble/PulseAudio.h

src/mumble/RichTextEditor.cpp

src/mumble/RichTextEditor.h

src/mumble/RichTextEditor.ui

src/mumble/ServerHandler.cpp

src/mumble/ServerHandler.h

src/mumble/Settings.cpp

src/mumble/Settings.h

src/mumble/TextMessage.cpp

src/mumble/TextMessage.h

src/mumble/TextToSpeech.h

src/mumble/TextToSpeech_macx.cpp

src/mumble/TextToSpeech_unix.cpp

src/mumble/TextToSpeech_win.cpp

src/mumble/Tokens.cpp

src/mumble/Tokens.h

src/mumble/Tokens.ui

src/mumble/Usage.cpp

src/mumble/Usage.h

src/mumble/UserEdit.cpp

src/mumble/UserEdit.h

src/mumble/UserEdit.ui

src/mumble/UserModel.cpp

src/mumble/UserModel.h

src/mumble/UserView.cpp

src/mumble/UserView.h

src/mumble/VersionCheck.cpp

src/mumble/VersionCheck.h

src/mumble/ViewCert.cpp

src/mumble/ViewCert.h

src/mumble/WASAPI.cpp

src/mumble/WASAPI.h

src/mumble/licenses.h

src/mumble/main.cpp

src/mumble/mumble.plist

src/mumble/mumble.pro

src/mumble/mumble.qrc

src/mumble/mumble.rc

src/mumble/mumble_cs.ts

src/mumble/mumble_de.ts

src/mumble/mumble_en.ts

src/mumble/mumble_es.ts

src/mumble/mumble_fr.ts

src/mumble/mumble_it.ts

src/mumble/mumble_ja.ts

src/mumble/mumble_pl.ts

src/mumble/mumble_ru.ts

src/mumble/mumble_tango.qrc

src/mumble/mumble_zh_CN.ts

src/mumble/mumble_zh_TW.ts

src/mumble/os_macx.cpp

src/mumble/os_win.cpp

src/mumble11x/ACL.cpp

src/mumble11x/ACL.h

src/mumble11x/ACLEditor.cpp

src/mumble11x/ACLEditor.h

src/mumble11x/ALSAAudio.cpp

src/mumble11x/ALSAAudio.h

src/mumble11x/ASIOInput.cpp

src/mumble11x/ASIOInput.h

src/mumble11x/About.cpp

src/mumble11x/About.h

src/mumble11x/Audio.cpp

src/mumble11x/Audio.h

src/mumble11x/AudioConfigDialog.cpp

src/mumble11x/AudioConfigDialog.h

src/mumble11x/AudioInput.cpp

src/mumble11x/AudioInput.h

src/mumble11x/AudioOutput.cpp

src/mumble11x/AudioOutput.h

src/mumble11x/AudioStats.cpp

src/mumble11x/AudioStats.h

src/mumble11x/AudioWizard.cpp

src/mumble11x/AudioWizard.h

src/mumble11x/BanEditor.cpp

src/mumble11x/BanEditor.h

src/mumble11x/Channel.cpp

src/mumble11x/Channel.h

src/mumble11x/ConfigDialog.cpp

src/mumble11x/ConfigDialog.h

src/mumble11x/ConfigDialog.mm

src/mumble11x/ConfigWidget.cpp

src/mumble11x/ConfigWidget.h

src/mumble11x/ConnectDialog.cpp

src/mumble11x/ConnectDialog.h

src/mumble11x/Connection.cpp

src/mumble11x/Connection.h

src/mumble11x/CoreAudio.cpp

src/mumble11x/CoreAudio.h

src/mumble11x/DBus.cpp

src/mumble11x/DBus.h

src/mumble11x/Database.cpp

src/mumble11x/Database.h

src/mumble11x/DirectSound.cpp

src/mumble11x/DirectSound.h

src/mumble11x/Global.cpp

src/mumble11x/Global.h

src/mumble11x/GlobalShortcut.cpp

src/mumble11x/GlobalShortcut.h

src/mumble11x/GlobalShortcut_macx.cpp

src/mumble11x/GlobalShortcut_macx.h

src/mumble11x/GlobalShortcut_unix.cpp

src/mumble11x/GlobalShortcut_unix.h

src/mumble11x/GlobalShortcut_win.cpp

src/mumble11x/GlobalShortcut_win.h

src/mumble11x/Group.cpp

src/mumble11x/LCD.cpp

src/mumble11x/LCD.h

src/mumble11x/Log.cpp

src/mumble11x/Log.h

src/mumble11x/LookConfig.cpp

src/mumble11x/LookConfig.h

src/mumble11x/MainWindow.cpp

src/mumble11x/MainWindow.h

src/mumble11x/Message.cpp

src/mumble11x/Message.h

src/mumble11x/Messages.cpp

src/mumble11x/NetworkConfig.cpp

src/mumble11x/NetworkConfig.h

src/mumble11x/OSS.cpp

src/mumble11x/OSS.h

src/mumble11x/Overlay.cpp

src/mumble11x/Overlay.h

src/mumble11x/Overlay_unix.cpp

src/mumble11x/Overlay_win.cpp

src/mumble11x/PAAudio.cpp

src/mumble11x/PAAudio.h

src/mumble11x/Player.cpp

src/mumble11x/Player.h

src/mumble11x/PlayerModel.cpp

src/mumble11x/PlayerModel.h

src/mumble11x/Plugins.cpp

src/mumble11x/Plugins.h

src/mumble11x/PulseAudio.cpp

src/mumble11x/PulseAudio.h

src/mumble11x/ServerHandler.cpp

src/mumble11x/ServerHandler.h

src/mumble11x/Settings.cpp

src/mumble11x/Settings.h

src/mumble11x/TextMessage.cpp

src/mumble11x/TextMessage.h

src/mumble11x/TextToSpeech.h

src/mumble11x/TextToSpeech_macx.cpp

src/mumble11x/TextToSpeech_unix.cpp

src/mumble11x/TextToSpeech_win.cpp

src/mumble11x/Usage.cpp

src/mumble11x/Usage.h

src/mumble11x/VersionCheck.cpp

src/mumble11x/VersionCheck.h

src/mumble11x/ViewCert.cpp

src/mumble11x/ViewCert.h

src/mumble11x/WASAPI.cpp

src/mumble11x/WASAPI.h

src/mumble11x/licenses.h

src/mumble11x/main.cpp

src/mumble11x/mumble.qrc

src/mumble11x/mumble.rc

src/mumble11x/mumble11x.plist

src/mumble11x/mumble11x.pro

src/mumble11x/mumble_cs.ts

src/mumble11x/mumble_de.ts

src/mumble11x/mumble_en.ts

src/mumble11x/mumble_es.ts

src/mumble11x/mumble_fr.ts

src/mumble11x/mumble_ja.ts

src/mumble11x/mumble_pl.ts

src/mumble11x/mumble_ru.ts

src/mumble11x/mumble_zh_CN.ts

src/mumble11x/mumble_zh_TW.ts

src/mumble11x/os_macx.cpp

src/mumble11x/os_win.cpp

src/murmur/Cert.cpp

src/murmur/DBus.cpp

src/murmur/DBus.h

src/murmur/Messages.cpp

src/murmur/Meta.cpp

src/murmur/Meta.h

src/murmur/Murmur.ice

src/murmur/MurmurI.h

src/murmur/MurmurIce.cpp

src/murmur/MurmurIce.h

src/murmur/MurmurIceWrapper.cpp

src/murmur/RPC.cpp

src/murmur/Register.cpp

src/murmur/Server.cpp

src/murmur/Server.h

src/murmur/ServerDB.cpp

src/murmur/ServerDB.h

src/murmur/Tray.cpp

src/murmur/Tray.h

src/murmur/UnixMurmur.cpp

src/murmur/UnixMurmur.h

src/murmur/main.cpp

src/murmur/murmur.plist

src/murmur/murmur.rc

src/murmur/murmur_pch.h

Show diffs side-by-side

added added

removed removed

src/mumble11x/Settings.h

1

/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>

1

/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>

2

2

3

3

All rights reserved.

4

4

74

74

QString qsAudioInput, qsAudioOutput;

75

75

float fVolume;

76

76

float fOtherVolume;

77

bool bAttenuateOthersOnTalk;

78

bool bAttenuateOthers;

77

79

int iOutputDelay;

78

80

79

81

QString qsALSAInput, qsALSAOutput;

Older »