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

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/audiocapture/audiocapture.pro
View File

@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qtmedia_audioengine
QT += multimediakit-private
QT += multimedia-private
PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = $$QT.multimediakit.plugins/$${PLUGIN_TYPE}
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
# Input
HEADERS += audioencodercontrol.h \

10
src/plugins/audiocapture/audioencodercontrol.cpp
View File

@@ -60,12 +60,12 @@ AudioEncoderControl::AudioEncoderControl(QObject *parent)
fmt.setByteOrder(QAudioFormat::LittleEndian);
m_session->setFormat(fmt);
m_settings.setEncodingMode(QtMultimediaKit::ConstantQualityEncoding);
m_settings.setEncodingMode(QtMultimedia::ConstantQualityEncoding);
m_settings.setCodec("audio/pcm");
m_settings.setBitRate(8000);
m_settings.setChannelCount(1);
m_settings.setSampleRate(8000);
m_settings.setQuality(QtMultimediaKit::LowQuality);
m_settings.setQuality(QtMultimedia::LowQuality);
}
AudioEncoderControl::~AudioEncoderControl()
@@ -130,14 +130,14 @@ void AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings
{
QAudioFormat fmt = m_session->format();
if (settings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
if (settings.quality() == QtMultimediaKit::LowQuality) {
if (settings.encodingMode() == QtMultimedia::ConstantQualityEncoding) {
if (settings.quality() == QtMultimedia::LowQuality) {
fmt.setSampleSize(8);
fmt.setChannels(1);
fmt.setFrequency(8000);
fmt.setSampleType(QAudioFormat::UnSignedInt);
} else if (settings.quality() == QtMultimediaKit::NormalQuality) {
} else if (settings.quality() == QtMultimedia::NormalQuality) {
fmt.setSampleSize(16);
fmt.setChannels(1);
fmt.setFrequency(22050);