diff options
Diffstat (limited to 'network/mumble/patches')
-rw-r--r-- | network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch | 31 | ||||
-rw-r--r-- | network/mumble/patches/MainWindow-set-the-window-icon.patch | 27 |
2 files changed, 0 insertions, 58 deletions
diff --git a/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch b/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch deleted file mode 100644 index 211396f7948c4..0000000000000 --- a/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48b4c991164c1aff4699f30ec0df9df660be75b8 Mon Sep 17 00:00:00 2001 -From: jgeboski <jgeboski@gmail.com> -Date: Thu, 22 Mar 2012 18:16:23 -0400 -Subject: [PATCH 1/2] AudioInput: compilation fix for builds using celt >= - 0.11.0 - ---- - src/mumble/AudioInput.cpp | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp -index 93b7b8e..b541aea 100644 ---- a/src/mumble/AudioInput.cpp -+++ b/src/mumble/AudioInput.cpp -@@ -823,7 +823,12 @@ void AudioInput::encodeAudioFrame() { - - cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0)); - -- cCodec->celt_encoder_ctl(ceEncoder,CELT_SET_VBR_RATE(iAudioQuality)); -+#ifdef CELT_SET_VBR_RATE -+ cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_VBR_RATE(iAudioQuality)); -+#else -+ cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_BITRATE(iAudioQuality)); -+#endif -+ - len = cCodec->encode(ceEncoder, psSource, buffer, qMin(iAudioQuality / 800, 127)); - iBitrate = len * 100 * 8; - } else { --- -1.7.4.4 - diff --git a/network/mumble/patches/MainWindow-set-the-window-icon.patch b/network/mumble/patches/MainWindow-set-the-window-icon.patch deleted file mode 100644 index 5b3db8670474f..0000000000000 --- a/network/mumble/patches/MainWindow-set-the-window-icon.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 38bdb16b33436a11bd506a80af9191cfc6f98bb3 Mon Sep 17 00:00:00 2001 -From: jgeboski <jgeboski@gmail.com> -Date: Thu, 22 Mar 2012 18:17:56 -0400 -Subject: [PATCH 2/2] MainWindow: directly set the window icon - ---- - src/mumble/MainWindow.cpp | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp -index ee71d6e..ce88421 100644 ---- a/src/mumble/MainWindow.cpp -+++ b/src/mumble/MainWindow.cpp -@@ -160,6 +160,10 @@ MainWindow::MainWindow(QWidget *p) : QMainWindow(p) { - // current open document (i.e. you can copy the open document anywhere - // simply by dragging this icon). - qApp->setWindowIcon(qiIcon); -+ -+ // Set the icon on the MainWindow directly. This fixes the icon not -+ // being set on the MainWindow in certain environments (Ex: GTK+). -+ setWindowIcon(qiIcon); - #endif - - #ifdef Q_OS_WIN --- -1.7.4.4 - |