← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mumble/maverick-security

« back to all changes in this revision

Viewing changes to src/mumble/Settings.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2009-12-10 20:29:29 UTC
  • mfrom: (9.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091210202929-3096zttdt0ie9kw6
Tags: 1.2.0-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/Settings.cpp
125
125
        bTTS = true;
126
126
        iTTSVolume = 75;
127
127
        iTTSThreshold = 250;
128
 
        iQuality = 32000;
 
128
        iQuality = 40000;
129
129
        fVolume = 1.0f;
130
130
        fOtherVolume = 0.5f;
131
131
        iMinLoudness = 1000;
243
243
        for (int i=Log::firstMsgType;i<=Log::lastMsgType;++i)
244
244
                qmMessageSounds.insert(i, QString());
245
245
 
 
246
        qmMessageSounds[Log::CriticalError] = QLatin1String(":/Critical.ogg");
 
247
        qmMessageSounds[Log::PermissionDenied] = QLatin1String(":/PermissionDenied.ogg");
 
248
        qmMessageSounds[Log::SelfMute] = QLatin1String(":/SelfMutedDeafened.ogg");
 
249
        qmMessageSounds[Log::ServerConnected] = QLatin1String(":/ServerConnected.ogg");
 
250
        qmMessageSounds[Log::ServerDisconnected] = QLatin1String(":/ServerDisconnected.ogg");
 
251
        qmMessageSounds[Log::TextMessage] = QLatin1String(":/TextMessage.ogg");
 
252
        qmMessageSounds[Log::ChannelJoin] = QLatin1String(":/UserJoinedChannel.ogg");
 
253
        qmMessageSounds[Log::ChannelLeave] = QLatin1String(":/UserLeftChannel.ogg");
 
254
        qmMessageSounds[Log::YouMutedOther] = QLatin1String(":/UserMutedYouOrByYou.ogg");
 
255
        qmMessageSounds[Log::YouMuted] = QLatin1String(":/UserMutedYouOrByYou.ogg");
 
256
        qmMessageSounds[Log::YouKicked] = QLatin1String(":/UserKickedYouOrByYou.ogg");
 
257
 
246
258
        qmMessages[Log::DebugInfo] = Settings::LogConsole;
 
259
        qmMessages[Log::Warning] = Settings::LogConsole | Settings::LogBalloon;
247
260
        qmMessages[Log::Information] = Settings::LogConsole;
 
261
        qmMessages[Log::UserJoin] = Settings::LogConsole;
 
262
        qmMessages[Log::UserLeave] = Settings::LogConsole;
 
263
        qmMessages[Log::UserKicked] = Settings::LogConsole;
 
264
        qmMessages[Log::OtherSelfMute] = Settings::LogConsole;
 
265
        qmMessages[Log::OtherMutedOther] = Settings::LogConsole;
248
266
}
249
267
 
250
268
bool Settings::doEcho() const {