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

2
doc/src/snippets/multimedia-snippets/audiorecorder.cpp
View File

@@ -45,7 +45,7 @@
#include <qmediarecorder.h>
#include <qmediaservice.h>
#include <QtMultimediaKit/qaudioformat.h>
#include <QtMultimedia/qaudioformat.h>
#include "audiorecorder.h"

2
doc/src/snippets/multimedia-snippets/media.cpp
View File

@@ -210,7 +210,7 @@ void MediaExample::MediaRecorder()
QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/vorbis");
audioSettings.setQuality(QtMultimediaKit::HighQuality);
audioSettings.setQuality(QtMultimedia::HighQuality);
recorder->setEncodingSettings(audioSettings);

10
doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
View File

@@ -4,14 +4,14 @@ TEMPLATE = lib
TARGET = qtmmksnippets
INCLUDEPATH += ../../../../src/global \
../../../../src/multimediakit \
../../../../src/multimediakit/audio \
../../../../src/multimediakit/video \
../../../../src/multimediakit/effects
../../../../src/multimedia \
../../../../src/multimedia/audio \
../../../../src/multimedia/video \
../../../../src/multimedia/effects
CONFIG += console
qtAddLibrary(QtMultimediaKit)
QT += multimedia
SOURCES += \
audio.cpp \

8
doc/src/snippets/multimedia-snippets/player.cpp
View File

@@ -177,14 +177,14 @@ void Player::positionChanged(qint64 progress)
void Player::metaDataChanged()
{
//qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
//qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
if (player->isMetaDataAvailable()) {
setTrackInfo(QString("%1 - %2")
.arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
.arg(player->metaData(QtMultimediaKit::Title).toString()));
.arg(player->metaData(QtMultimedia::AlbumArtist).toString())
.arg(player->metaData(QtMultimedia::Title).toString()));
if (coverLabel) {
QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
coverLabel->setPixmap(!url.isEmpty()
? QPixmap(url.toString())

2
doc/src/snippets/multimedia-snippets/soundeffect.qml
View File

@@ -41,7 +41,7 @@
//! [complete snippet]
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Text {
text: "Click Me!";