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
examples/spectrum/3rdparty/fftreal/fftreal.pro vendored
View File

@@ -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
examples/spectrum/README.txt
View File

@@ -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
examples/spectrum/app/app.pro
View File

@@ -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

4
examples/spectrum/app/engine.cpp
View File

@@ -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>

6
examples/spectrum/app/engine.h
View File

@@ -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.

2
examples/spectrum/app/main.cpp
View File

@@ -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();

2
examples/spectrum/app/mainwidget.h
View File

@@ -43,7 +43,7 @@
#include <QWidget>
#include <QIcon>
#include <QtMultimediaKit/qaudio.h>
#include <QtMultimedia/qaudio.h>
class Engine;
class FrequencySpectrum;

2
examples/spectrum/app/settingsdialog.h
View File

@@ -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)

2
examples/spectrum/app/spectrumanalyser.cpp
View File

@@ -43,7 +43,7 @@
#include <QtCore/qmath.h>
#include <QtCore/qmetatype.h>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include <QThread>
#include "fftreal_wrapper.h"

2
examples/spectrum/app/tonegenerator.cpp
View File

@@ -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>

2
examples/spectrum/app/tonegeneratordialog.h
View File

@@ -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)

2
examples/spectrum/app/utils.cpp
View File

@@ -38,7 +38,7 @@
**
****************************************************************************/
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include "utils.h"
qint64 audioDuration(const QAudioFormat &format, qint64 bytes)

2
examples/spectrum/app/waveform.h
View File

@@ -42,7 +42,7 @@
#define WAVEFORM_H
#include <QWidget>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include <QPixmap>
#include <QScopedPointer>

2
examples/spectrum/app/wavfile.h
View File

@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qfile.h>
#include <QtMultimediaKit/qaudioformat.h>
#include <QtMultimedia/qaudioformat.h>
class WavFile : public QFile
{

2
examples/spectrum/spectrum.pro
View File

@@ -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