diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
| commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
| tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /src/plugins/audiocapture | |
| parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) | |
Rename QtMultimediaKit to QtMultimedia.
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>
Diffstat (limited to 'src/plugins/audiocapture')
| -rw-r--r-- | src/plugins/audiocapture/audiocapture.pro | 4 | ||||
| -rw-r--r-- | src/plugins/audiocapture/audioencodercontrol.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index a776b7e22..8b30b2aa7 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -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 \ diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp index df8526694..ce2ab42e8 100644 --- a/src/plugins/audiocapture/audioencodercontrol.cpp +++ b/src/plugins/audiocapture/audioencodercontrol.cpp @@ -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); |