diff options
-rw-r--r-- | CHANGES | 274 | ||||
-rw-r--r-- | g15helper/g15helper.h | 4 | ||||
-rw-r--r-- | plugins/aoc/aoc.cpp | 18 | ||||
-rw-r--r-- | plugins/codmw2so/codmw2so.cpp | 18 | ||||
-rw-r--r-- | plugins/css/css.cpp | 14 | ||||
-rw-r--r-- | plugins/hl2dm/hl2dm.cpp | 8 | ||||
-rw-r--r-- | plugins/manual/manual.cpp | 64 | ||||
-rw-r--r-- | plugins/manual/manual.h | 46 | ||||
-rw-r--r-- | src/mumble/AudioOutput.cpp | 2 | ||||
-rw-r--r-- | src/mumble/ClientUser.h | 6 | ||||
-rw-r--r-- | src/mumble/MainWindow.cpp | 15 | ||||
-rw-r--r-- | src/mumble/Messages.cpp | 18 | ||||
-rw-r--r-- | src/mumble/Usage.cpp | 8 | ||||
-rw-r--r-- | src/mumble/UserModel.cpp | 2 | ||||
-rw-r--r-- | src/murmur/ServerDB.cpp | 2 | ||||
-rw-r--r-- | src/tests/TestLink.cpp | 2 | ||||
-rw-r--r-- | symbols.pri | 2 |
17 files changed, 384 insertions, 119 deletions
@@ -1,11 +1,282 @@ +2009-12-01 + lolo_32 <Alex@.(none)> + d8188f7 Translations in French of new strings, and some minor write + and grammar errors corrected + + Mikkel Krautz <mikkel@krautz.dk> + fdc8261 Fix up dylib refs for libmanual.dylib. + 84099e5 Fix Mac ConfigDialog for Qt 4.6. + 36c015c OSX build fixes for Qt 4.6. + 7aa6e67 Fix graphical glitch on OSX. + 0e676a1 Strip debug symbols after extracting them for CONFIG+=symbol + for macx. + + Benjamin Jemlich <pcgod@users.sourceforge.net> + 8533e2a Fix manual positioning plugin on linux + + Thorvald Natvig <slicer@users.sourceforge.net> + 45ebdb6 Quiet down a few compiler warnings + a908b5a Use WId explicitly + 7b30399 Commit shortcut editor before adding/removing + ad9c725 Use SEH magic to work around __HrLoadAllImportsForDll oddities + ff4057b Try to promote libGL.so to global scope if we can't resolve it + directly + 14ff24f Add magic 0.7.0 detector + +2009-11-30 + lolo_32 <Alex@.(none)> + 0632e82 Add the new strings + + arrai <array.of.intellect@gmail.com> + 00f3aa2 Fixed linking temporary channels + + Stefan Hacker <dd0t@users.sourceforge.net> + 3a3926c Extend TestLink plugin with comments so its code can be used + directly in the documentation page + + Thorvald Natvig <slicer@users.sourceforge.net> + e7f089b String updates + 334fe4d Upgrade deps to 4.6.0-rc1, openssl 1.0.0b4, boost 1.41 + 6d9a0e0 Change to straight 4-byte encoding for floats + dfd87b0 For fresh IP bans, don't clone hash and username + 1f6e1dd Fall back to -ldns_sd if pkgconfig for avahi isn't found + +2009-11-28 + Stefan Hacker <dd0t@users.sourceforge.net> + 1c8d127 Fix mistake in previous message patch + + Natenom <natenom@googlemail.com> + f392cb6 Updated German translations for 1.2.0 + +2009-11-27 + Stefan Hacker <dd0t@users.sourceforge.net> + aa59399 Manual positioning plugin + + Mikkel Krautz <mikkel@krautz.dk> + 3089fbe Fix typo in ConfigDialog fix for OSX. + f61dd13 Make sure ConfigDialog is sized properly on OSX. + + Tuck Therebelos <snares@users.sourceforge.net> + 85919ce Remove uncommitted game plugin + f6c26d6 CoD5 version bump; fix MW2SO .pro + +2009-11-26 + Mikkel Krautz <mikkel@krautz.dk> + a7f4bea Fix mumble11x build. + + Benjamin Jemlich <pcgod@users.sourceforge.net> + fbb9989 Fix crash with importing a passworded cert + + Thorvald Natvig <slicer@users.sourceforge.net> + 4b9941f Update the celt codec yet again to fix more bugs + 4d64a01 Update celt version + 6bce206 Delay restoreGeometry to after windowflags are set + d042b70 Add jitter data to usage report + +2009-11-25 + Stefan Hacker <dd0t@users.sourceforge.net> + b2b8c10 Fix #2903204: wrong status message displayed for deafened + (server) event + + Mikkel Krautz <mikkel@krautz.dk> + 760bf63 Fix no-dbus build. + e0e8bc0 Fix OSX compatibility client launching and URL handling for + unversioned and ?version=1.1.x URLs. + + Benjamin Jemlich <pcgod@users.sourceforge.net> + a22567a Fix cert name display with non ascii chars + + Thorvald Natvig <slicer@users.sourceforge.net> + 23ada59 Update 0.7.0-src to a version that builds on Win32 + + Tuck Therebelos <snares@users.sourceforge.net> + 9766240 MW2 string updates, TF2 identifier update + +2009-11-24 + lolo_32 <Alex@.(none)> + 47d2398 Translations in French of installer and Mumble + + Benjamin Jemlich <pcgod@users.sourceforge.net> + 1d07f8a Store the comment in the user object if it's changed via RPC + + Thorvald Natvig <slicer@users.sourceforge.net> + 62aa53b Don't deref the mainwindow before it's created + + Tuck Therebelos <snares@users.sourceforge.net> + 50af882 MW2SO fix state value + +2009-11-23 + Thorvald Natvig <slicer@users.sourceforge.net> + 3f7ad99 Fix a few strings + 39cd472 Upgrade celt to exp_time_pitch + 67fc2c4 Change qwave loading to avoid a few XP bugs + + Tuck Therebelos <snares@users.sourceforge.net> + b7bc917 Fix MW2 positional data + +2009-11-22 + Stefan Hacker <dd0t@users.sourceforge.net> + 0c60717 Add channelname and username var to murmur.ini to make them + more visible + 6150c78 Fix Unicode handling in phpBB3auth.py and make it able to load + raw Ice configuration tuples + + Mikkel Krautz <mikkel@krautz.dk> + 860c105 Update Mac OS X Boost to 1.41.0. + a3cc6a2 Property list fixup for OSX binaries. + e96809e Extract .dSYM debug symbols on Mac OS X when using + CONFIG=symbols. + c365ac6 Clean up overlay_mac build. + ae45a2f Use -dead_strip linker option on OSX. + 0a2ef0e Clean up Unix section of compiler.pri. Keep platform specific + flags in their own sections. + 8a10baf Add phpBB3auth to OSX dist script. Remove dead PackageMaker + code. + + Benjamin Jemlich <pcgod@users.sourceforge.net> + 3172ae4 Fix client ban timezone handling + c180869 Check bans using UTC time + 248d44a Fix ban expiration + + Thorvald Natvig <slicer@users.sourceforge.net> + f16570e Stop findDesiredChannel while still connecting + 2dc541b Fix lingering channel comments + +2009-11-21 + BAYSSE Laurent <lolo_32@users.sourceforge.net> + 6390d4a French translation update for 1.2.0 + + Mikkel Krautz <mikkel@krautz.dk> + 88c1b27 Refine MainWindow aesthetics on OSX. + + Benjamin Jemlich <pcgod@users.sourceforge.net> + 3e66866 Use a new instance for each iteration so we don't leak + information of previous items in Ice replies + + Tuck Therebelos <snares@users.sourceforge.net> + 54a487e AOC, CSS full context support + 765c399 MW2 MP update + +2009-11-20 + Stefan Hacker <dd0t@users.sourceforge.net> + 01a72bb Integrate default sound pack into mumble + 4ad97d3 Add Server connect timeout of 30s. + 99b99e9 Reduce TTS/Notification Spam in defaults and reclassify some + unimportant log messages to info level. + + Mikkel Krautz <mikkel@krautz.dk> + 447ac82 General LCD fixups and make G15 on OSX a bit prettier. + +2009-11-19 + Martin Skilnand <cybknight@users.sourceforge.net> + 7f0ba42 Centered dD0T type authenticated.svg. + 62f9a8b dD0T version of authenticated.svg. Attempt two. + b803a43 Making comment icons less 3D. + 421d778 Replaced authenticated.svg + + Stefan Hacker <dd0t@users.sourceforge.net> + 6144233 Revert to second draft for authenticated.svg. + + Mikkel Krautz <mikkel@krautz.dk> + 81c9e78 Revert AudioDevice{set,get} parameter change in CoreAudio. + da18c1f Make sure G15 works on OSX. + +2009-11-18 + arcenciel <arcenciel@users.sourceforge.net> + a8a25e9 Japanese Translation + + Mikkel Krautz <mikkel@krautz.dk> + a3cbe21 Don't disable for CoreAudio builds on Mac. + + Thorvald Natvig <slicer@users.sourceforge.net> + 5254448 Initialize bCertRequired + + Tuck Therebelos <snares@users.sourceforge.net> + 1176bdf MW2 plugins version updates + +2009-11-17 + Stefan Hacker <dd0t@users.sourceforge.net> + 34f9ea9 Raise default quality to 40kbit/s + + Benjamin Jemlich <pcgod@users.sourceforge.net> + 3c050e9 Add an option to reject connections without a certificate + 298d342 Add a warning if the settings database is read-only + 2a582a6 Change reject type field to uint32 + + Thorvald Natvig <slicer@users.sourceforge.net> + 0c36a80 Add some type safetyp to denytype + c8b81b6 Make rejecttype optional + +2009-11-16 + Martin Skilnand <cybknight@users.sourceforge.net> + c4d99f5 New comment icons for review. + +2009-11-15 + Stefan Hacker <dd0t@users.sourceforge.net> + d28e95f Some comments and minimal refactoring of + Server::recheckCodecVersions() + 0eea7b5 Make hl2dm PA plugin compile again. + + Kissaki <kissaki@gmx.de> + 640d91e German translation update minor English text fix + +2009-11-14 + Álvaro Manuel Recio Pérez <naproxeno@users.sourceforge.net> + 4911c8a Update Spanish translation + + Tuck Therebelos <snares@users.sourceforge.net> + 5ec2225 Ins, TF2, L4D updates + ac11b54 Fix CoDMW2SO state value + 9cc7f15 Add MW2 plugins to installer + b560789 Add MW2 plugins to plugins.pro + d5777ef Fixed state and V/H for MW2; MW2SpecOps plugin added + dfd7909 Fixed state for MW2; MW2SpecOps plugin added + +2009-11-13 + Mikkel Krautz <mikkel@krautz.dk> + c81ff65 CoreAudio: Allow devices to run even if they have to use their + default buffer length (when we can't set it ourselves) + 71e1b7b Add buffer range debugging to CoreAudio. Fix isInput parameter + for setting buffer size. + +2009-11-12 + Stefan Hacker <dd0t@users.sourceforge.net> + 7411fc9 Use localeAwareCompare for overlay sorting. + + Álvaro Manuel Recio Pérez <naproxeno@users.sourceforge.net> + 382bca6 Updated Spanish translation + + Thorvald Natvig <slicer@users.sourceforge.net> + 3df0dce Add direct dependent libraries under X11 + + Tuck Therebelos <snares@users.sourceforge.net> + 7f146f2 CRLF + 2009-11-11 + Mikkel Krautz <mikkel@krautz.dk> + aba1fc2 Update osxdist script for beta and fix diskimage window + dimensions. + + Patrick Matthäi <pmatthaei@debian.org> + ec48050 Spelling fix + Thorvald Natvig <slicer@users.sourceforge.net> + ada9d58 Allow setting version on binserver script too + f3b2395 Allow release script to specify custom version + f3e9ed7 Automatically use system CELT if it's >= 0.7.0 + 66c2261 Change initialization order to allow direct-copy constructor bd33712 .ts file update a59ce15 Don't distribute older celt versions in tarball either f765851 Initialize ucFlags properly 786ed67 First check SSL cert errors, THEN check the SSL version + Tuck Therebelos <snares@users.sourceforge.net> + ddb16ce CoDMW2 plugin; HL2DM context example + 2009-11-10 + Karl Dietz <dekarl@users.sourceforge.net> + 6019fc1 plugins/wow: disable context in release builds + Ludwig Nussel <ludwig.nussel@suse.de> 7dae3ed silence integer/pointer cast warning 1b2647b Qt 4.4 doesn't have emitDataChanged(), the function is the @@ -32,6 +303,9 @@ aed4569 Italian translation for 1.2 2009-11-09 + Karl Dietz <dekarl@users.sourceforge.net> + 8589e57 Clarify condition in PA context handling + Thorvald Natvig <slicer@users.sourceforge.net> 0a0c83f Add overlay safety checks for 11x too 51f4bf3 Update benchmark test diff --git a/g15helper/g15helper.h b/g15helper/g15helper.h index 67ad642f7..3b95845be 100644 --- a/g15helper/g15helper.h +++ b/g15helper/g15helper.h @@ -38,9 +38,9 @@ #define G15_MAX_FBMEM (G15_MAX_WIDTH * G15_MAX_HEIGHT * G15_MAX_BPP) #define G15_MAX_FBMEM_BITS (G15_MAX_FBMEM / 8) #if defined(WIN32) - #define G15_WIDGET_NAME L"Mumble G15 Display" +#define G15_WIDGET_NAME L"Mumble G15 Display" #elif defined(APPLE) - #define G15_WIDGET_NAME CFSTR("Mumble G15 Display") +#define G15_WIDGET_NAME CFSTR("Mumble G15 Display") #endif enum { diff --git a/plugins/aoc/aoc.cpp b/plugins/aoc/aoc.cpp index 2f5b962e0..4136e96ae 100644 --- a/plugins/aoc/aoc.cpp +++ b/plugins/aoc/aoc.cpp @@ -133,15 +133,15 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa sTeam = "Unknown"; break; } - + new_context << "<context>" - << "<game>aoc</game>" - << "<hostport>" << chHostStr << "</hostport>" - << "<team>" << sTeam << "</team>" - << "</context>"; + << "<game>aoc</game>" + << "<hostport>" << chHostStr << "</hostport>" + << "<team>" << sTeam << "</team>" + << "</context>"; context = new_context.str(); -// // - +// // + /* TODO new_identity << "<identity>" << "<name>" << "SAS" << "</name>" @@ -203,11 +203,11 @@ static int trylock() { hostptr = mod_engine + 0x3bf69f; teamptr = mod + 0x71a0a4; - //Gamecheck + //Gamecheck char sMagic[13]; if (!peekProc(mod + 0x7071e8, sMagic, 13) || strncmp("ageofchivalry", sMagic, 13)!=0) return false; - + // Check if we can get meaningful data from it float apos[3], afront[3], atop[3]; float cpos[3], cfront[3], ctop[3]; diff --git a/plugins/codmw2so/codmw2so.cpp b/plugins/codmw2so/codmw2so.cpp index b41be87dd..8fe55ffa9 100644 --- a/plugins/codmw2so/codmw2so.cpp +++ b/plugins/codmw2so/codmw2so.cpp @@ -85,28 +85,28 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa 0x01597682 byte Magical state value */ - + so = peekProc((BYTE *) 0x019703A0, &specops, 1); // Magical state value - if (! so) + if (! so) return false; - - if (specops != 2) + + if (specops != 2) return false; // 2 value indicates you are playing Special Ops, 1 indicates SP, 0 indicates at three-way selection menu - + ok = peekProc((BYTE *) 0x01B12BBB, &state, 1); // Magical state value - if (! ok) + if (! ok) return false; // /* // state value is: // 0 while not in game // 4 to 5 while playing - + // This value is used for disabling pa for spectators // or people not on a server. // */ - - if (state == 0) + + if (state == 0) return true; // This results in all vectors beeing zero which tells mumble to ignore them. ok = peekProc((BYTE *) 0x00782A64, avatar_pos+2, 4) && //Z diff --git a/plugins/css/css.cpp b/plugins/css/css.cpp index 4ce68a0a1..d7a52c754 100644 --- a/plugins/css/css.cpp +++ b/plugins/css/css.cpp @@ -133,15 +133,15 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa sTeam = "Unknown"; break; } - + new_context << "<context>" - << "<game>css</game>" - << "<hostport>" << chHostStr << "</hostport>" - << "<team>" << sTeam << "</team>" - << "</context>"; + << "<game>css</game>" + << "<hostport>" << chHostStr << "</hostport>" + << "<team>" << sTeam << "</team>" + << "</context>"; context = new_context.str(); -// // - +// // + /* TODO new_identity << "<identity>" << "<name>" << "SAS" << "</name>" diff --git a/plugins/hl2dm/hl2dm.cpp b/plugins/hl2dm/hl2dm.cpp index 79812d5f0..26e90d4d4 100644 --- a/plugins/hl2dm/hl2dm.cpp +++ b/plugins/hl2dm/hl2dm.cpp @@ -114,9 +114,9 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa chHostStr[39] = 0; new_context << "<context>" - << "<game>hl2dm</game>" - << "<hostport>" << chHostStr << "</hostport>" - << "</context>"; + << "<game>hl2dm</game>" + << "<hostport>" << chHostStr << "</hostport>" + << "</context>"; context = new_context.str(); /* TODO @@ -174,7 +174,7 @@ static int trylock() { // Check if we are really running hl2dm char sMagic[4]; - if (!peekProc(mod + 0x3a5674, sMagic, 4) || strncmp("Dm/$", sMagic, 4) !=0 ) + if (!peekProc(mod + 0x3a5674, sMagic, 4) || strncmp("Dm/$", sMagic, 4) !=0) return false; // Check if we can get meaningfull data from it diff --git a/plugins/manual/manual.cpp b/plugins/manual/manual.cpp index ccc1e6e62..3381944ae 100644 --- a/plugins/manual/manual.cpp +++ b/plugins/manual/manual.cpp @@ -37,35 +37,35 @@ static struct { std::wstring identity; } my = {{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, - std::string(), std::wstring()}; + std::string(), std::wstring() +}; -Manual::Manual(QWidget *p) : QDialog(p) -{ - setupUi(this); +Manual::Manual(QWidget *p) : QDialog(p) { + setupUi(this); - qgvPosition->viewport()->installEventFilter(this); - qgvPosition->scale(1.0f, 1.0f); - qgsScene = new QGraphicsScene(QRectF(-5.0f, -5.0f, 10.0f, 10.0f), this); - qgiPosition = qgsScene->addEllipse(QRectF(-0.5f, -0.5f, 1.0f, 1.0f), QPen(Qt::black), QBrush(Qt::red)); + qgvPosition->viewport()->installEventFilter(this); + qgvPosition->scale(1.0f, 1.0f); + qgsScene = new QGraphicsScene(QRectF(-5.0f, -5.0f, 10.0f, 10.0f), this); + qgiPosition = qgsScene->addEllipse(QRectF(-0.5f, -0.5f, 1.0f, 1.0f), QPen(Qt::black), QBrush(Qt::red)); - qgvPosition->setScene(qgsScene); - qgvPosition->fitInView(-5.0f, -5.0f, 10.0f, 10.0f, Qt::KeepAspectRatio); + qgvPosition->setScene(qgsScene); + qgvPosition->fitInView(-5.0f, -5.0f, 10.0f, 10.0f, Qt::KeepAspectRatio); - qdsbX->setRange(-FLT_MAX, FLT_MAX); - qdsbY->setRange(-FLT_MAX, FLT_MAX); - qdsbZ->setRange(-FLT_MAX, FLT_MAX); + qdsbX->setRange(-FLT_MAX, FLT_MAX); + qdsbY->setRange(-FLT_MAX, FLT_MAX); + qdsbZ->setRange(-FLT_MAX, FLT_MAX); - qdsbX->setValue(my.avatar_pos[0]); - qdsbY->setValue(my.avatar_pos[1]); - qdsbZ->setValue(my.avatar_pos[2]); + qdsbX->setValue(my.avatar_pos[0]); + qdsbY->setValue(my.avatar_pos[1]); + qdsbZ->setValue(my.avatar_pos[2]); - qpbActivated->setChecked(bActive); - qpbLinked->setChecked(bLinkable); + qpbActivated->setChecked(bActive); + qpbLinked->setChecked(bLinkable); - qsbOrientation->setValue(iOrientation); - qsbAzimut->setValue(iAzimut); - updateTopAndFront(iOrientation, iAzimut); + qsbOrientation->setValue(iOrientation); + qsbAzimut->setValue(iAzimut); + updateTopAndFront(iOrientation, iAzimut); } bool Manual::eventFilter(QObject *obj, QEvent *evt) { @@ -83,16 +83,15 @@ bool Manual::eventFilter(QObject *obj, QEvent *evt) { return QDialog::eventFilter(obj, evt); } -void Manual::changeEvent(QEvent *e) -{ - QDialog::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - retranslateUi(this); - break; - default: - break; - } +void Manual::changeEvent(QEvent *e) { + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + retranslateUi(this); + break; + default: + break; + } } void Manual::on_qpbUnhinge_pressed() { @@ -215,8 +214,7 @@ static void config(HWND h) { if (mDlg) { mDlg->setParent(QWidget::find(h), Qt::Dialog); mDlg->qpbUnhinge->setEnabled(true); - } - else { + } else { mDlg = new Manual(QWidget::find(h)); } diff --git a/plugins/manual/manual.h b/plugins/manual/manual.h index 48bd03b92..f6e870811 100644 --- a/plugins/manual/manual.h +++ b/plugins/manual/manual.h @@ -7,31 +7,31 @@ #include "ui_manual.h" class Manual : public QDialog, public Ui::Manual { - Q_OBJECT -public: - Manual(QWidget *parent = 0); + Q_OBJECT + public: + Manual(QWidget *parent = 0); -public slots: - void on_qpbUnhinge_pressed(); - void on_qpbLinked_clicked(bool); - void on_qpbActivated_clicked(bool); - void on_qdsbX_valueChanged(double); - void on_qdsbY_valueChanged(double); - void on_qdsbZ_valueChanged(double); - void on_qsbOrientation_valueChanged(int); - void on_qsbAzimut_valueChanged(int); - void on_qdOrientation_valueChanged(int); - void on_qdAzimut_valueChanged(int); - void on_qleContext_editingFinished(); - void on_qleIdentity_editingFinished(); - void on_buttonBox_clicked(QAbstractButton *); -protected: - QGraphicsScene *qgsScene; - QGraphicsItem *qgiPosition; + public slots: + void on_qpbUnhinge_pressed(); + void on_qpbLinked_clicked(bool); + void on_qpbActivated_clicked(bool); + void on_qdsbX_valueChanged(double); + void on_qdsbY_valueChanged(double); + void on_qdsbZ_valueChanged(double); + void on_qsbOrientation_valueChanged(int); + void on_qsbAzimut_valueChanged(int); + void on_qdOrientation_valueChanged(int); + void on_qdAzimut_valueChanged(int); + void on_qleContext_editingFinished(); + void on_qleIdentity_editingFinished(); + void on_buttonBox_clicked(QAbstractButton *); + protected: + QGraphicsScene *qgsScene; + QGraphicsItem *qgiPosition; - bool eventFilter(QObject *, QEvent *); - void changeEvent(QEvent *e); - void updateTopAndFront(int orientation, int azimut); + bool eventFilter(QObject *, QEvent *); + void changeEvent(QEvent *e); + void updateTopAndFront(int orientation, int azimut); }; #endif // MANUAL_H diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index dd68d97c0..12d64a851 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -464,7 +464,7 @@ void AudioOutputSpeech::addFrameToBuffer(const QByteArray &qbaPacket, unsigned i jbp.len = qbaPacket.size(); jbp.span = iFrameSize * frames; jbp.timestamp = iFrameSize * iSeq; - + if (g.s.bUsage && (umtType != MessageHandler::UDPVoiceSpeex) && p && ! p->qsHash.isEmpty() && (p->qlTiming.count() < 3000)) { QMutexLocker qml(& p->qmTiming); ClientUser::JitterRecord jr; diff --git a/src/mumble/ClientUser.h b/src/mumble/ClientUser.h index 9fbca320c..ef2c9f95f 100644 --- a/src/mumble/ClientUser.h +++ b/src/mumble/ClientUser.h @@ -40,19 +40,19 @@ class ClientUser : public QObject, public User { Q_DISABLE_COPY(ClientUser) public: enum TalkState { TalkingOff, Talking, TalkingWhisperChannel, TalkingWhisper }; - + struct JitterRecord { int iSequence; int iFrames; quint64 uiElapsed; }; - + TalkState tsState; bool bLocalMute; float fPowerMin, fPowerMax; float fAverageAvailable; - + QMutex qmTiming; Timer tTiming; QList<JitterRecord> qlTiming; diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 017d409e4..ebf7b4a37 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -443,10 +443,10 @@ void MainWindow::openUrl(const QUrl &url) { return; } else #endif - if ((major != 1) || (minor != 2) || (patch > 0)) { - g.l->log(Log::Warning, tr("This version of Mumble can't handle URLs for Mumble version %1.%2.%3").arg(major).arg(minor).arg(patch)); - return; - } + if ((major != 1) || (minor != 2) || (patch > 0)) { + g.l->log(Log::Warning, tr("This version of Mumble can't handle URLs for Mumble version %1.%2.%3").arg(major).arg(minor).arg(patch)); + return; + } QString host = url.host(); unsigned short port = static_cast<unsigned short>(url.port(64738)); @@ -519,7 +519,7 @@ void MainWindow::findDesiredChannel() { } qtvUsers->setCurrentIndex(pmModel->index(chan)); } else if (g.uiSession) { - qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel)); + qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(g.uiSession)->cChannel)); } updateMenuPermissions(); } @@ -595,7 +595,7 @@ void MainWindow::setupView(bool toggle_minimize) { f |= Qt::WindowStaysOnTopHint; setWindowFlags(f); - + qdwLog->setVisible(showit); qdwChat->setVisible(showit && g.s.bShowChatbar); qtvUsers->header()->setVisible(showit); @@ -1840,8 +1840,7 @@ void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString re break; } } - } - else if (err == QAbstractSocket::SslHandshakeFailedError) { + } else if (err == QAbstractSocket::SslHandshakeFailedError) { if (QMessageBox::warning(this, tr("SSL Version mismatch"), tr("This server is using an older encryption standard. It might be an older 1.1 based Mumble server.<br />Would you like to launch the compatibility client to connect to it?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { QString host, user, pw; diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 2d80370f0..3f7b2ef66 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -250,11 +250,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) { if (pDst == pSelf) { if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) { g.l->log(Log::YouMuted, tr("You were muted and deafened by %1.").arg(admin)); - } - else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { + } else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { g.l->log(Log::YouMuted, tr("You were unmuted and undeafened by %1.").arg(admin)); - } - else { + } else { if (msg.has_mute()) { if (pDst->bMute) g.l->log(Log::YouMuted, tr("You were muted by %1.").arg(admin)); @@ -279,11 +277,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) { } else if (pSrc == pSelf) { if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) { g.l->log(Log::YouMutedOther, tr("You muted and deafened %1.").arg(vic)); - } - else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { + } else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { g.l->log(Log::YouMutedOther, tr("You unmuted and undeafened %1.").arg(vic)); - } - else { + } else { if (msg.has_mute()) { if (pDst->bMute) g.l->log(Log::YouMutedOther, tr("You muted %1.").arg(vic)); @@ -306,11 +302,9 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) { } else { if (msg.has_mute() && msg.has_deaf() && pDst->bMute && pDst->bDeaf) { g.l->log(Log::OtherMutedOther, tr("%1 muted and deafened by %2.").arg(vic, admin)); - } - else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { + } else if (msg.has_mute() && msg.has_deaf() && !pDst->bMute && !pDst->bDeaf) { g.l->log(Log::OtherMutedOther, tr("%1 unmuted and undeafened by %2.").arg(vic, admin)); - } - else { + } else { if (msg.has_mute()) { if (pDst->bMute) g.l->log(Log::OtherMutedOther, tr("%1 muted by %2.").arg(vic, admin)); diff --git a/src/mumble/Usage.cpp b/src/mumble/Usage.cpp index 516043f6d..c21f44107 100644 --- a/src/mumble/Usage.cpp +++ b/src/mumble/Usage.cpp @@ -42,7 +42,7 @@ Usage::Usage(QObject *p) : QObject(p) { qdsReport.setDevice(&qbReport); qdsReport.setVersion(QDataStream::Qt_4_5); qdsReport << static_cast<unsigned int>(1); - + // Wait 10 minutes (so we know they're actually using this), then... QTimer::singleShot(60 * 10 * 1000, this, SLOT(registerUsage())); QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter())); @@ -52,7 +52,7 @@ void Usage::addJitter(ClientUser *cu) { QMutexLocker qml(& cu->qmTiming); if (! cu->qlTiming.isEmpty()) { qdsReport << cu->qsHash; - + qdsReport << cu->qlTiming; } } @@ -100,7 +100,7 @@ void Usage::registerUsage() { void Usage::reportJitter() { QTimer::singleShot(60 * 10 * 1000, this, SLOT(reportJitter())); - + if (qbReport.size() == 0) return; @@ -109,7 +109,7 @@ void Usage::reportJitter() { QNetworkReply *rep = g.nam->post(req, qCompress(qbReport.buffer(), 9)); connect(rep, SIGNAL(finished()), rep, SLOT(deleteLater())); - + qbReport.close(); qbReport.setData(QByteArray()); diff --git a/src/mumble/UserModel.cpp b/src/mumble/UserModel.cpp index 559f0c88b..a5048a68c 100644 --- a/src/mumble/UserModel.cpp +++ b/src/mumble/UserModel.cpp @@ -830,7 +830,7 @@ void UserModel::removeUser(ClientUser *p) { if (g.uiSession && (c == ClientUser::get(g.uiSession)->cChannel)) updateOverlay(); - + g.mw->uUsage.addJitter(p); delete p; diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 3091c2fe2..460c270f8 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -1056,7 +1056,7 @@ void Server::addLink(Channel *c, Channel *l) { } void Server::removeLink(Channel *c, Channel *l) { - c->unlink(l); + c->unlink(l); if (c->bTemporary || l->bTemporary) return; diff --git a/src/tests/TestLink.cpp b/src/tests/TestLink.cpp index 9b69a750b..e07a56464 100644 --- a/src/tests/TestLink.cpp +++ b/src/tests/TestLink.cpp @@ -71,7 +71,7 @@ void updateMumble() { if (! lm) return; - if(lm->uiVersion != 2) { + if (lm->uiVersion != 2) { wcsncpy(lm->name, L"TestLink", 256); wcsncpy(lm->description, L"TestLink is a test of the Link plugin.", 2048); lm->uiVersion = 2; diff --git a/symbols.pri b/symbols.pri index 20b374525..cffa381c4 100644 --- a/symbols.pri +++ b/symbols.pri @@ -18,7 +18,7 @@ CONFIG(symbols):macx { contains(TEMPLATE, 'lib') { DSYM_TARGET_FULLPATH = $${DESTDIR}/${TARGET} DSYM_OUT = $${DSYM_DESTDIR}/symbols/${TARGET}.dSYM - } + } dsym.target = $${DSYM_OUT} dsym.commands = $(MKDIR) $${DSYM_DESTDIR}/symbols/ && dsymutil $${DSYM_TARGET_FULLPATH} -o $${DSYM_OUT} |