slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash in audioinput and audiooutput examples.

Browse Source 
Do not call tr while initializing static objects.

Change-Id: Ia75ddd53ae22b0e4179f174da7d933156744e261
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-06-26 12:07:20 +10:00
committed by Qt by Nokia
parent 4af40afe46
commit 1c81d25e4f
4 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/audioinput/audioinput.cpp
View File

@@ -52,10 +52,10 @@
#include "audioinput.h"
const QString InputTest::PushModeLabel(tr("Enable push mode"));
const QString InputTest::PullModeLabel(tr("Enable pull mode"));
const QString InputTest::SuspendLabel(tr("Suspend recording"));
const QString InputTest::ResumeLabel(tr("Resume recording"));
#define PUSH_MODE_LABEL "Enable push mode"
#define PULL_MODE_LABEL "Enable pull mode"
#define SUSPEND_LABEL "Suspend recording"
#define RESUME_LABEL "Resume recording"
const int BufferSize = 4096;
@@ -242,12 +242,12 @@ void InputTest::initializeWindow()
layout->addWidget(m_volumeSlider);
m_modeButton = new QPushButton(this);
m_modeButton->setText(PushModeLabel);
m_modeButton->setText(tr(PUSH_MODE_LABEL));
connect(m_modeButton, SIGNAL(clicked()), SLOT(toggleMode()));
layout->addWidget(m_modeButton);
m_suspendResumeButton = new QPushButton(this);
m_suspendResumeButton->setText(SuspendLabel);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
connect(m_suspendResumeButton, SIGNAL(clicked()), SLOT(toggleSuspend()));
layout->addWidget(m_suspendResumeButton);
@@ -318,17 +318,17 @@ void InputTest::toggleMode()
m_audioInput->stop();
if (m_pullMode) {
m_modeButton->setText(PullModeLabel);
m_modeButton->setText(tr(PULL_MODE_LABEL));
m_input = m_audioInput->start();
connect(m_input, SIGNAL(readyRead()), SLOT(readMore()));
m_pullMode = false;
} else {
m_modeButton->setText(PushModeLabel);
m_modeButton->setText(tr(PUSH_MODE_LABEL));
m_pullMode = true;
m_audioInput->start(m_audioInfo);
}
m_suspendResumeButton->setText(SuspendLabel);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
}
void InputTest::toggleSuspend()
@@ -337,15 +337,15 @@ void InputTest::toggleSuspend()
if(m_audioInput->state() == QAudio::SuspendedState) {
qWarning() << "status: Suspended, resume()";
m_audioInput->resume();
m_suspendResumeButton->setText(SuspendLabel);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
} else if (m_audioInput->state() == QAudio::ActiveState) {
qWarning() << "status: Active, suspend()";
m_audioInput->suspend();
m_suspendResumeButton->setText(ResumeLabel);
m_suspendResumeButton->setText(tr(RESUME_LABEL));
} else if (m_audioInput->state() == QAudio::StoppedState) {
qWarning() << "status: Stopped, resume()";
m_audioInput->resume();
m_suspendResumeButton->setText(SuspendLabel);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
} else if (m_audioInput->state() == QAudio::IdleState) {
qWarning() << "status: IdleState";
}

5
examples/audioinput/audioinput.h
View File

@@ -131,11 +131,6 @@ private:
QIODevice *m_input;
bool m_pullMode;
QByteArray m_buffer;
static const QString PushModeLabel;
static const QString PullModeLabel;
static const QString SuspendLabel;
static const QString ResumeLabel;
};
#endif