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>
This commit is contained in:
committed by
Qt by Nokia
parent
55bc4f2b46
commit
03f22bcdaf
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = audiodevices
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
HEADERS = audiodevices.h
|
||||
|
||||
@@ -10,9 +10,9 @@ SOURCES = audiodevices.cpp \
|
||||
|
||||
FORMS += audiodevicesbase.ui
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
TEMPLATE = app
|
||||
TARGET = audioinput
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
HEADERS = audioinput.h
|
||||
|
||||
SOURCES = audioinput.cpp \
|
||||
main.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
TEMPLATE = app
|
||||
TARGET += audiooutput
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
HEADERS = audiooutput.h
|
||||
|
||||
SOURCES = audiooutput.cpp \
|
||||
main.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -88,8 +88,8 @@ AudioRecorder::AudioRecorder(QWidget *parent)
|
||||
sampleRate));
|
||||
}
|
||||
|
||||
ui->qualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
|
||||
ui->qualitySlider->setValue(int(QtMultimediaKit::NormalQuality));
|
||||
ui->qualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
|
||||
ui->qualitySlider->setValue(int(QtMultimedia::NormalQuality));
|
||||
|
||||
//bitrates:
|
||||
ui->bitrateBox->addItem(QString("Default"), QVariant(0));
|
||||
@@ -172,10 +172,10 @@ void AudioRecorder::toggleRecord()
|
||||
settings.setCodec(boxValue(ui->audioCodecBox).toString());
|
||||
settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
|
||||
settings.setBitRate(boxValue(ui->bitrateBox).toInt());
|
||||
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->qualitySlider->value()));
|
||||
settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value()));
|
||||
settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
|
||||
QtMultimediaKit::ConstantQualityEncoding :
|
||||
QtMultimediaKit::ConstantBitRateEncoding);
|
||||
QtMultimedia::ConstantQualityEncoding :
|
||||
QtMultimedia::ConstantBitRateEncoding);
|
||||
|
||||
QString container = boxValue(ui->containerBox).toString();
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = audiorecorder
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
HEADERS = \
|
||||
audiorecorder.h
|
||||
@@ -16,9 +16,9 @@ maemo*: {
|
||||
FORMS += audiorecorder.ui
|
||||
}
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice)
|
||||
connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime()));
|
||||
connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError()));
|
||||
|
||||
mediaRecorder->setMetaData(QtMultimediaKit::Title, QVariant(QLatin1String("Test Title")));
|
||||
mediaRecorder->setMetaData(QtMultimedia::Title, QVariant(QLatin1String("Test Title")));
|
||||
|
||||
connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int)));
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = camera
|
||||
|
||||
QT += multimediakit multimediakitwidgets
|
||||
QT += multimedia multimediawidgets
|
||||
|
||||
HEADERS = \
|
||||
camera.h \
|
||||
@@ -19,9 +19,9 @@ FORMS += \
|
||||
videosettings.ui \
|
||||
imagesettings.ui
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
|
||||
ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
|
||||
}
|
||||
|
||||
ui->imageQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
|
||||
ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
|
||||
|
||||
ui->imageResolutionBox->addItem(tr("Default Resolution"));
|
||||
QList<QSize> supportedResolutions = imagecapture->supportedResolutions();
|
||||
@@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
|
||||
{
|
||||
QImageEncoderSettings settings = imagecapture->encodingSettings();
|
||||
settings.setCodec(boxValue(ui->imageCodecBox).toString());
|
||||
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->imageQualitySlider->value()));
|
||||
settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
|
||||
settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
|
||||
|
||||
return settings;
|
||||
|
||||
@@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
|
||||
ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
|
||||
}
|
||||
|
||||
ui->audioQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
|
||||
ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
|
||||
|
||||
//video codecs
|
||||
ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
|
||||
@@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
|
||||
ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
|
||||
}
|
||||
|
||||
ui->videoQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
|
||||
ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
|
||||
|
||||
|
||||
ui->videoResolutionBox->addItem(tr("Default"));
|
||||
@@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const
|
||||
{
|
||||
QAudioEncoderSettings settings = mediaRecorder->audioSettings();
|
||||
settings.setCodec(boxValue(ui->audioCodecBox).toString());
|
||||
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->audioQualitySlider->value()));
|
||||
settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value()));
|
||||
settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt());
|
||||
return settings;
|
||||
}
|
||||
@@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const
|
||||
{
|
||||
QVideoEncoderSettings settings = mediaRecorder->videoSettings();
|
||||
settings.setCodec(boxValue(ui->videoCodecBox).toString());
|
||||
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->videoQualitySlider->value()));
|
||||
settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value()));
|
||||
settings.setResolution(boxValue(ui->videoResolutionBox).toSize());
|
||||
settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>());
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
Item {
|
||||
id: propertyButton
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
FocusScope {
|
||||
property Camera camera
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
CameraButton {
|
||||
property Camera camera
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
Item {
|
||||
property alias source : preview.source
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
Item {
|
||||
id : zoomControl
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
TEMPLATE=app
|
||||
|
||||
QT += declarative qtquick1 network multimediakit
|
||||
QT += declarative qtquick1 network multimedia
|
||||
|
||||
contains(QT_CONFIG, opengl) {
|
||||
QT += opengl
|
||||
@@ -13,9 +13,9 @@ else:TARGET = QmlCamera
|
||||
|
||||
RESOURCES += declarative-camera.qrc
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import Qt 4.7
|
||||
import QtMultimediaKit 1.1
|
||||
import QtMultimedia 4.0
|
||||
|
||||
Rectangle {
|
||||
id : cameraUI
|
||||
|
||||
@@ -2,7 +2,7 @@ TEMPLATE = app
|
||||
TARGET = declarative-radio
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += .
|
||||
QT += declarative multimediakit
|
||||
QT += declarative multimedia
|
||||
|
||||
# Input
|
||||
SOURCES += main.cpp
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import Qt.multimediakit 4.0
|
||||
import Qt.multimedia 4.0
|
||||
|
||||
Rectangle {
|
||||
width: 400; height: 300;
|
||||
|
||||
@@ -221,14 +221,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())
|
||||
|
||||
@@ -5,8 +5,8 @@ CONFIG += qt warn_on
|
||||
|
||||
QT += network \
|
||||
xml \
|
||||
multimediakit \
|
||||
multimediakitwidgets
|
||||
multimedia \
|
||||
multimediawidgets
|
||||
|
||||
HEADERS = \
|
||||
player.h \
|
||||
@@ -24,9 +24,9 @@ maemo* {
|
||||
}
|
||||
|
||||
#install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
|
||||
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
|
||||
INSTALLS += target sources
|
||||
|
||||
QT+=widgets
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#ifndef PLAYLISTMODEL_H
|
||||
#define PLAYLISTMODEL_H
|
||||
|
||||
#include <qtmultimediakitdefs.h>
|
||||
#include <qtmultimediadefs.h>
|
||||
#include <QtCore/qabstractitemmodel.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = radio
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
HEADERS = \
|
||||
radio.h
|
||||
@@ -10,9 +10,9 @@ SOURCES = \
|
||||
main.cpp \
|
||||
radio.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = slideshow
|
||||
|
||||
QT += multimediakit multimediakitwidgets
|
||||
QT += multimedia multimediawidgets
|
||||
|
||||
HEADERS = \
|
||||
slideshow.h
|
||||
@@ -10,9 +10,9 @@ SOURCES = \
|
||||
main.cpp \
|
||||
slideshow.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -41,6 +41,6 @@ macx {
|
||||
|
||||
sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
|
||||
sources.files += bwins/fftreal.def eabi/fftreal.def
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/3rdparty/fftreal
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal
|
||||
INSTALLS += sources
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ Spectrum analyser demo app
|
||||
Introduction
|
||||
------------
|
||||
|
||||
This application is a demo which uses the QtMultimediaKit APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
|
||||
This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
|
||||
|
||||
|
||||
Acknowledgments
|
||||
@@ -96,7 +96,7 @@ If you don't like the combination of the waveform and progress bar in a single w
|
||||
|
||||
The spectrum.h file defines a number of parameters which can be played with. These control things such as the number of audio samples analysed per FFT calculation, the range and number of bands displayed by the spectrograph, and so on.
|
||||
|
||||
The part of the application which interacts with QtMultimediaKit is in the Engine class.
|
||||
The part of the application which interacts with QtMultimedia is in the Engine class.
|
||||
|
||||
Some ideas for enhancements to the app are listed in TODO.txt. Feel free to start work on any of them :)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ TEMPLATE = app
|
||||
|
||||
TARGET = spectrum
|
||||
|
||||
QT += multimediakit
|
||||
QT += multimedia
|
||||
|
||||
SOURCES += main.cpp \
|
||||
engine.cpp \
|
||||
@@ -59,9 +59,9 @@ RESOURCES = spectrum.qrc
|
||||
# Install
|
||||
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app
|
||||
images.files += images/record.png images/settings.png
|
||||
images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app/images
|
||||
images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app/images
|
||||
INSTALLS += sources images
|
||||
|
||||
# Deployment
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
#include <QCoreApplication>
|
||||
#include <QMetaObject>
|
||||
#include <QSet>
|
||||
#include <QtMultimediaKit/QAudioInput>
|
||||
#include <QtMultimediaKit/QAudioOutput>
|
||||
#include <QtMultimedia/QAudioInput>
|
||||
#include <QtMultimedia/QAudioOutput>
|
||||
#include <QDebug>
|
||||
#include <QThread>
|
||||
#include <QFile>
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
#include <QByteArray>
|
||||
#include <QBuffer>
|
||||
#include <QVector>
|
||||
#include <QtMultimediaKit/QAudioDeviceInfo>
|
||||
#include <QtMultimediaKit/QAudioFormat>
|
||||
#include <QtMultimedia/QAudioDeviceInfo>
|
||||
#include <QtMultimedia/QAudioFormat>
|
||||
|
||||
#ifdef DUMP_CAPTURED_AUDIO
|
||||
#define DUMP_DATA
|
||||
@@ -70,7 +70,7 @@ QT_FORWARD_DECLARE_CLASS(QAudioOutput)
|
||||
QT_FORWARD_DECLARE_CLASS(QFile)
|
||||
|
||||
/**
|
||||
* This class interfaces with the QtMultimediaKit audio classes, and also with
|
||||
* This class interfaces with the QtMultimedia audio classes, and also with
|
||||
* the SpectrumAnalyser class. Its role is to manage the capture and playback
|
||||
* of audio data, meanwhile performing real-time analysis of the audio level
|
||||
* and frequency spectrum.
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QApplication app(argc, argv);
|
||||
app.setApplicationName("QtMultimediaKit spectrum analyzer");
|
||||
app.setApplicationName("QtMultimedia spectrum analyzer");
|
||||
MainWidget w;
|
||||
|
||||
w.show();
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
#include <QIcon>
|
||||
#include <QtMultimediaKit/qaudio.h>
|
||||
#include <QtMultimedia/qaudio.h>
|
||||
|
||||
class Engine;
|
||||
class FrequencySpectrum;
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
#include "spectrum.h"
|
||||
#include <QDialog>
|
||||
#include <QtMultimediaKit/QAudioDeviceInfo>
|
||||
#include <QtMultimedia/QAudioDeviceInfo>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QComboBox)
|
||||
QT_FORWARD_DECLARE_CLASS(QCheckBox)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
#include <QtCore/qmath.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#include <QtMultimediaKit/QAudioFormat>
|
||||
#include <QtMultimedia/QAudioFormat>
|
||||
#include <QThread>
|
||||
|
||||
#include "fftreal_wrapper.h"
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "spectrum.h"
|
||||
#include "utils.h"
|
||||
#include <QByteArray>
|
||||
#include <QtMultimediaKit/QAudioFormat>
|
||||
#include <QtMultimedia/QAudioFormat>
|
||||
#include <QtCore/qmath.h>
|
||||
#include <QtCore/qendian.h>
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
#include "spectrum.h"
|
||||
#include <QDialog>
|
||||
#include <QtMultimediaKit/QAudioDeviceInfo>
|
||||
#include <QtMultimedia/QAudioDeviceInfo>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QCheckBox)
|
||||
QT_FORWARD_DECLARE_CLASS(QSlider)
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtMultimediaKit/QAudioFormat>
|
||||
#include <QtMultimedia/QAudioFormat>
|
||||
#include "utils.h"
|
||||
|
||||
qint64 audioDuration(const QAudioFormat &format, qint64 bytes)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#define WAVEFORM_H
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtMultimediaKit/QAudioFormat>
|
||||
#include <QtMultimedia/QAudioFormat>
|
||||
#include <QPixmap>
|
||||
#include <QScopedPointer>
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
#include <QtCore/qobject.h>
|
||||
#include <QtCore/qfile.h>
|
||||
#include <QtMultimediaKit/qaudioformat.h>
|
||||
#include <QtMultimedia/qaudioformat.h>
|
||||
|
||||
class WavFile : public QFile
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@ SUBDIRS += app
|
||||
TARGET = spectrum
|
||||
|
||||
sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
|
||||
INSTALLS += sources
|
||||
|
||||
QT+=widgets
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = videographicsitem
|
||||
|
||||
QT += multimediakit multimediakitwidgets
|
||||
QT += multimedia multimediawidgets
|
||||
|
||||
contains(QT_CONFIG, opengl): QT += opengl
|
||||
|
||||
@@ -12,9 +12,9 @@ SOURCES += main.cpp \
|
||||
videoplayer.cpp \
|
||||
videoitem.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = app
|
||||
TARGET = videowidget
|
||||
|
||||
QT += multimediakit multimediakitwidgets
|
||||
QT += multimedia multimediawidgets
|
||||
|
||||
HEADERS = \
|
||||
videoplayer.h \
|
||||
@@ -14,9 +14,9 @@ SOURCES = \
|
||||
videowidget.cpp \
|
||||
videowidgetsurface.cpp
|
||||
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
|
||||
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
|
||||
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
|
||||
|
||||
INSTALLS += target sources
|
||||
|
||||
|
||||
Reference in New Issue
Block a user