[Pkg-voip-commits] r8842 - in /mumble/trunk/debian: changelog patches/0002-remove-opengl-for-client patches/series
thorvald at alioth.debian.org
thorvald at alioth.debian.org
Sun Mar 27 04:06:51 UTC 2011
Author: thorvald
Date: Sun Mar 27 04:06:23 2011
New Revision: 8842
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8842
Log:
Add patch from Benjamin Jemlich to remove OpenGL for AudioStats dialog.
Added:
mumble/trunk/debian/patches/0002-remove-opengl-for-client
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/patches/series
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=8842&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Mar 27 04:06:23 2011
@@ -4,6 +4,7 @@
Closes: #618092
* Add patch from Conor Curran to fix PulseAudio role.
Closes: #615994
+ * Add patch from Benjamin Jemlich to remove OpenGL for AudioStats dialog.
-- Thorvald Natvig <thorvald at debian.org> Fri, 25 Mar 2011 07:45:13 +0100
Added: mumble/trunk/debian/patches/0002-remove-opengl-for-client
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/0002-remove-opengl-for-client?rev=8842&op=file
==============================================================================
--- mumble/trunk/debian/patches/0002-remove-opengl-for-client (added)
+++ mumble/trunk/debian/patches/0002-remove-opengl-for-client Sun Mar 27 04:06:23 2011
@@ -1,0 +1,167 @@
+diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp
+index 89975dd..f088d85 100644
+--- a/src/mumble/AudioStats.cpp
++++ b/src/mumble/AudioStats.cpp
+@@ -124,30 +124,11 @@ void AudioBar::paintEvent(QPaintEvent *) {
+
+ }
+
+-AudioEchoWidget::AudioEchoWidget(QWidget *p) : QGLWidget(p) {
++AudioEchoWidget::AudioEchoWidget(QWidget *p) : QWidget(p) {
+ setMinimumSize(100, 60);
+ }
+
+-void AudioEchoWidget::initializeGL() {
+- glDisable(GL_LIGHTING);
+-
+- glClearColor(0,0,0,0);
+- glShadeModel(GL_SMOOTH);
+-
+- glEnable(GL_COLOR_MATERIAL);
+- glDisable(GL_CULL_FACE);
+-}
+-
+-void AudioEchoWidget::resizeGL(int w, int h) {
+- glViewport(0, 0, w, h);
+- glMatrixMode(GL_PROJECTION);
+- glLoadIdentity();
+- glOrtho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
+- glMatrixMode(GL_MODELVIEW);
+- glLoadIdentity();
+-}
+-
+-static inline void mapEchoToColor(float echo) {
++static inline const QColor mapEchoToColor(float echo) {
+ bool neg = (echo < 0.0f);
+ echo = fabsf(echo);
+
+@@ -162,21 +143,26 @@ static inline void mapEchoToColor(float echo) {
+
+ if (echo < 0.5f) {
+ a = echo * 2.0f;
+- b = 0;
++ b = 0.0f;
+ } else {
+- a = 1;
++ a = 1.0f;
+ b = (echo - 0.5f) * 2.0f;
+ }
+
+ if (neg)
+- glColor3f(a, b, c);
++ return QColor::fromRgbF(a, b, c);
+ else
+- glColor3f(c, b, a);
++ return QColor::fromRgbF(c, b, a);
+ }
+
+ #define WGT(x,y) st->W[(y)*N + 2*(x)+1]
+
+-void AudioEchoWidget::paintGL() {
++void AudioEchoWidget::paintEvent(QPaintEvent *) {
++ QPainter paint(this);
++
++ paint.scale(width(), height());
++ paint.fillRect(rect(), Qt::black);
++
+ AudioInputPtr ai = g.ai;
+ if (! ai || ! ai->sesEcho)
+ return;
+@@ -211,8 +197,6 @@ void AudioEchoWidget::paintGL() {
+ float xscale = 1.0f / static_cast<float>(N);
+ float yscale = 1.0f / static_cast<float>(M);
+
+- glBegin(GL_QUADS);
+-
+ for (int j = 0; j < M; j++) {
+ for (int i=1;i < N; i++) {
+ float xa = static_cast<float>(i) * xscale;
+@@ -221,24 +205,19 @@ void AudioEchoWidget::paintGL() {
+ float xb = xa + xscale;
+ float yb = ya + yscale;
+
+- mapEchoToColor(sqrtf(W[j*n+2*i]*W[j*n+2*i]+W[j*n+2*i-1]*W[j*n+2*i-1]) / 65536.f);
+- glVertex2f(xa, ya);
+- glVertex2f(xb, ya);
+- glVertex2f(xb, yb);
+- glVertex2f(xa, yb);
++ const QColor &c = mapEchoToColor(sqrtf(W[j*n+2*i]*W[j*n+2*i]+W[j*n+2*i-1]*W[j*n+2*i-1]) / 65536.f);
++ paint.fillRect(QRectF(QPointF(xa, ya), QPointF(xb, yb)), c);
+ }
+ }
+
+- glEnd();
+-
+- glBegin(GL_LINE_STRIP);
+- glColor3f(1.0f, 0.0f, 1.0f);
+- xscale = 1.0f / (2.0f*static_cast<float>(n));
++ QPolygonF poly;
++ xscale = 1.0f / (2.0f * static_cast<float>(n));
+ yscale = 1.0f / (200.0f * 32767.0f);
+- for (int i=0;i<2*n;i++) {
+- glVertex2f(static_cast<float>(i)*xscale, 0.5f + static_cast<float>(w[i]) * yscale);
++ for (int i = 0; i < 2 * n; i++) {
++ poly << QPointF(static_cast<float>(i) * xscale, 0.5f + static_cast<float>(w[i]) * yscale);
+ }
+- glEnd();
++ paint.setPen(QColor::fromRgbF(1.0f, 0.0f, 1.0f));
++ paint.drawPolyline(poly);
+ }
+
+ AudioNoiseWidget::AudioNoiseWidget(QWidget *p) : QWidget(p) {
+@@ -424,5 +403,5 @@ void AudioStats::on_Tick_timeout() {
+
+ anwNoise->update();
+ if (aewEcho)
+- aewEcho->updateGL();
++ aewEcho->update();
+ }
+diff --git a/src/mumble/AudioStats.h b/src/mumble/AudioStats.h
+index 17828dc..8ea1496 100644
+--- a/src/mumble/AudioStats.h
++++ b/src/mumble/AudioStats.h
+@@ -50,16 +50,14 @@ class AudioBar : public QWidget {
+ QList<Qt::BrushStyle> qlReplacementBrushes;
+ };
+
+-class AudioEchoWidget : public QGLWidget {
++class AudioEchoWidget : public QWidget {
+ private:
+ Q_OBJECT
+ Q_DISABLE_COPY(AudioEchoWidget)
+ public:
+ AudioEchoWidget(QWidget *parent);
+- protected:
+- void initializeGL();
+- void resizeGL(int w, int h);
+- void paintGL();
++ protected slots:
++ void paintEvent(QPaintEvent *event);
+ };
+
+ class AudioNoiseWidget : public QWidget {
+diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
+index 5ba00b5..57d0368 100644
+--- a/src/mumble/mumble.pro
++++ b/src/mumble/mumble.pro
+@@ -2,7 +2,7 @@ include(../mumble.pri)
+
+ DEFINES *= MUMBLE
+ TEMPLATE = app
+-QT *= network sql opengl xml svg
++QT *= network sql xml svg
+ TARGET = mumble
+ HEADERS *= BanEditor.h ACLEditor.h ConfigWidget.h Log.h AudioConfigDialog.h AudioStats.h AudioInput.h AudioOutput.h CustomElements.h MainWindow.h ServerHandler.h About.h ConnectDialog.h GlobalShortcut.h TextToSpeech.h Settings.h Database.h VersionCheck.h Global.h UserModel.h Audio.h ConfigDialog.h Plugins.h LookConfig.h Overlay.h OverlayText.h SharedMemory.h AudioWizard.h ViewCert.h TextMessage.h NetworkConfig.h LCD.h Usage.h Cert.h ClientUser.h UserEdit.h Tokens.h UserView.h RichTextEditor.h UserInformation.h FileEngine.h SocketRPC.h VoiceRecorder.h VoiceRecorderDialog.h
+ SOURCES *= BanEditor.cpp ACLEditor.cpp ConfigWidget.cpp Log.cpp AudioConfigDialog.cpp AudioStats.cpp AudioInput.cpp AudioOutput.cpp main.cpp CustomElements.cpp MainWindow.cpp ServerHandler.cpp About.cpp ConnectDialog.cpp Settings.cpp Database.cpp VersionCheck.cpp Global.cpp UserModel.cpp Audio.cpp ConfigDialog.cpp Plugins.cpp LookConfig.cpp OverlayClient.cpp OverlayConfig.cpp OverlayEditor.cpp OverlayEditorScene.cpp OverlayUser.cpp OverlayUserGroup.cpp Overlay.cpp OverlayText.cpp SharedMemory.cpp AudioWizard.cpp ViewCert.cpp Messages.cpp TextMessage.cpp GlobalShortcut.cpp NetworkConfig.cpp LCD.cpp Usage.cpp Cert.cpp ClientUser.cpp UserEdit.cpp Tokens.cpp UserView.cpp RichTextEditor.cpp UserInformation.cpp FileEngine.cpp SocketRPC.cpp VoiceRecorder.cpp VoiceRecorderDialog.cpp
+diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp
+index ef6ea64..1799bb2 100644
+--- a/src/mumble/mumble_pch.hpp
++++ b/src/mumble/mumble_pch.hpp
+@@ -33,7 +33,6 @@
+ #include <QtDBus/QtDBus>
+ #endif
+ #include <QtNetwork/QtNetwork>
+-#include <QtOpenGL/QtOpenGL>
+ #include <QtSql/QtSql>
+ #include <QtXml/QtXml>
+
Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=8842&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Sun Mar 27 04:06:23 2011
@@ -1,1 +1,2 @@
0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
+0002-remove-opengl-for-client
More information about the Pkg-voip-commits
mailing list