Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 07:03:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix accidental changes to Audio.cpp

Browse source
This commit is contained in:
Stephen Birarda 2014-04-09 14:52:01 -07:00
parent 29f8ed3c09
commit 7dec499b79
1 changed files with 45 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
interface/src/Audio.cpp
View file

@ -98,7 +98,8 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples, QObject* p
void Audio::init(QGLWidget *parent) { void Audio::init(QGLWidget *parent) {
_micTextureId = parent->bindTexture(QImage(Application::resourcesPath() + "images/mic.svg")); _micTextureId = parent->bindTexture(QImage(Application::resourcesPath() + "images/mic.svg"));
_muteTextureId = parent->bindTexture(QImage(Application::resourcesPath() + "images/mute.svg")); _muteTextureId = parent->bindTexture(QImage(Application::resourcesPath() + "images/mic-mute.svg"));
_boxTextureId = parent->bindTexture(QImage(Application::resourcesPath() + "images/audio-box.svg"));
} }
void Audio::reset() { void Audio::reset() {
@ -861,48 +862,68 @@ void Audio::handleAudioByteArray(const QByteArray& audioByteArray) {
// or send to the mixer and use delayed loopback // or send to the mixer and use delayed loopback
} }
void Audio::renderMuteIcon(int x, int y) { void Audio::renderToolBox(int x, int y, bool boxed) {
_iconBounds = QRect(x, y, MUTE_ICON_SIZE, MUTE_ICON_SIZE);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, _micTextureId); if (boxed) {
glColor3f(.93f, .93f, .93f);
bool isClipping = ((getTimeSinceLastClip() > 0.f) && (getTimeSinceLastClip() < 1.f));
const int BOX_LEFT_PADDING = 5;
const int BOX_TOP_PADDING = 10;
const int BOX_WIDTH = 266;
const int BOX_HEIGHT = 44;
QRect boxBounds = QRect(x - BOX_LEFT_PADDING, y - BOX_TOP_PADDING, BOX_WIDTH, BOX_HEIGHT);
glBindTexture(GL_TEXTURE_2D, _boxTextureId);
if (isClipping) {
glColor3f(1.f,0.f,0.f);
} else {
glColor3f(.41f,.41f,.41f);
}
glBegin(GL_QUADS); glBegin(GL_QUADS);
glTexCoord2f(1, 1); glTexCoord2f(1, 1);
glVertex2f(_iconBounds.left(), _iconBounds.top()); glVertex2f(boxBounds.left(), boxBounds.top());
glTexCoord2f(0, 1); glTexCoord2f(0, 1);
glVertex2f(_iconBounds.right(), _iconBounds.top()); glVertex2f(boxBounds.right(), boxBounds.top());
glTexCoord2f(0, 0); glTexCoord2f(0, 0);
glVertex2f(_iconBounds.right(), _iconBounds.bottom()); glVertex2f(boxBounds.right(), boxBounds.bottom());
glTexCoord2f(1, 0); glTexCoord2f(1, 0);
glVertex2f(_iconBounds.left(), _iconBounds.bottom()); glVertex2f(boxBounds.left(), boxBounds.bottom());
glEnd();
if (_muted) {
glBindTexture(GL_TEXTURE_2D, _muteTextureId);
glBegin(GL_QUADS);
glTexCoord2f(1, 1);
glVertex2f(_iconBounds.left(), _iconBounds.top());
glTexCoord2f(0, 1);
glVertex2f(_iconBounds.right(), _iconBounds.top());
glTexCoord2f(0, 0);
glVertex2f(_iconBounds.right(), _iconBounds.bottom());
glTexCoord2f(1, 0);
glVertex2f(_iconBounds.left(), _iconBounds.bottom());
glEnd(); glEnd();
} }
_iconBounds = QRect(x, y, MUTE_ICON_SIZE, MUTE_ICON_SIZE);
if (!_muted) {
glBindTexture(GL_TEXTURE_2D, _micTextureId);
} else {
glBindTexture(GL_TEXTURE_2D, _muteTextureId);
}
glColor3f(1,1,1);
glBegin(GL_QUADS);
glTexCoord2f(1, 1);
glVertex2f(_iconBounds.left(), _iconBounds.top());
glTexCoord2f(0, 1);
glVertex2f(_iconBounds.right(), _iconBounds.top());
glTexCoord2f(0, 0);
glVertex2f(_iconBounds.right(), _iconBounds.bottom());
glTexCoord2f(1, 0);
glVertex2f(_iconBounds.left(), _iconBounds.bottom());
glEnd();
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }