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

iOS: Fix build issues

Browse Source 
This also prevents anything meaningful from working, but it is a
good starting point.

Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Andy Nichols
2013-03-05 15:23:13 +01:00
committed by The Qt Project
parent 6a83c20318
commit 04860b7a37
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/audio/audio.pri
View File

@@ -39,7 +39,8 @@ SOURCES += \
audio/qaudiodecoder.cpp \ audio/qaudiodecoder.cpp \
audio/qaudiohelpers.cpp audio/qaudiohelpers.cpp
mac { mac:!ios {
PRIVATE_HEADERS += audio/qaudioinput_mac_p.h \ PRIVATE_HEADERS += audio/qaudioinput_mac_p.h \
audio/qaudiooutput_mac_p.h \ audio/qaudiooutput_mac_p.h \
audio/qaudiodeviceinfo_mac_p.h \ audio/qaudiodeviceinfo_mac_p.h \
@@ -49,7 +50,6 @@ mac {
audio/qaudiooutput_mac_p.cpp \ audio/qaudiooutput_mac_p.cpp \
audio/qaudioinput_mac_p.cpp \ audio/qaudioinput_mac_p.cpp \
audio/qaudio_mac.cpp audio/qaudio_mac.cpp
LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox
} }

14
src/multimedia/audio/qaudiodevicefactory.cpp
View File

@@ -52,7 +52,7 @@
#include "qaudiodeviceinfo_win32_p.h" #include "qaudiodeviceinfo_win32_p.h"
#include "qaudiooutput_win32_p.h" #include "qaudiooutput_win32_p.h"
#include "qaudioinput_win32_p.h" #include "qaudioinput_win32_p.h"
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#include "qaudiodeviceinfo_mac_p.h" #include "qaudiodeviceinfo_mac_p.h"
#include "qaudiooutput_mac_p.h" #include "qaudiooutput_mac_p.h"
#include "qaudioinput_mac_p.h" #include "qaudioinput_mac_p.h"
@@ -137,7 +137,7 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
{ {
QList<QAudioDeviceInfo> devices; QList<QAudioDeviceInfo> devices;
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode)) foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode))
devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode); devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode);
#endif #endif
@@ -170,7 +170,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
#endif #endif
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput); return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput);
#endif #endif
#endif #endif
@@ -190,7 +190,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
#endif #endif
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput); return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput);
#endif #endif
#endif #endif
@@ -202,7 +202,7 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re
QAbstractAudioDeviceInfo *rc = 0; QAbstractAudioDeviceInfo *rc = 0;
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
if (realm == QLatin1String("builtin")) if (realm == QLatin1String("builtin"))
return new QAudioDeviceInfoInternal(handle, mode); return new QAudioDeviceInfoInternal(handle, mode);
#endif #endif
@@ -234,7 +234,7 @@ QAbstractAudioInput* QAudioDeviceFactory::createInputDevice(QAudioDeviceInfo con
if (deviceInfo.isNull()) if (deviceInfo.isNull())
return new QNullInputDevice(); return new QNullInputDevice();
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
if (deviceInfo.realm() == QLatin1String("builtin")) { if (deviceInfo.realm() == QLatin1String("builtin")) {
QAbstractAudioInput* p = new QAudioInputPrivate(deviceInfo.handle()); QAbstractAudioInput* p = new QAudioInputPrivate(deviceInfo.handle());
if (p) p->setFormat(format); if (p) p->setFormat(format);
@@ -261,7 +261,7 @@ QAbstractAudioOutput* QAudioDeviceFactory::createOutputDevice(QAudioDeviceInfo c
if (deviceInfo.isNull()) if (deviceInfo.isNull())
return new QNullOutputDevice(); return new QNullOutputDevice();
#ifndef QT_NO_AUDIO_BACKEND #ifndef QT_NO_AUDIO_BACKEND
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA)) #if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
if (deviceInfo.realm() == QLatin1String("builtin")) { if (deviceInfo.realm() == QLatin1String("builtin")) {
QAbstractAudioOutput* p = new QAudioOutputPrivate(deviceInfo.handle()); QAbstractAudioOutput* p = new QAudioOutputPrivate(deviceInfo.handle());
if (p) p->setFormat(format); if (p) p->setFormat(format);

2
src/multimediawidgets/multimediawidgets.pro
View File

@@ -28,7 +28,7 @@ SOURCES += \
qvideowidgetcontrol.cpp \ qvideowidgetcontrol.cpp \
qvideowidget.cpp qvideowidget.cpp
mac { mac:!ios {
!simulator { !simulator {
PRIVATE_HEADERS += qpaintervideosurface_mac_p.h PRIVATE_HEADERS += qpaintervideosurface_mac_p.h
OBJECTIVE_SOURCES += qpaintervideosurface_mac.mm OBJECTIVE_SOURCES += qpaintervideosurface_mac.mm

7
src/plugins/plugins.pro
View File

@@ -45,8 +45,11 @@ unix:!mac {
} }
mac:!simulator { mac:!simulator {
SUBDIRS += audiocapture qt7 SUBDIRS += audiocapture
config_avfoundation: SUBDIRS += avfoundation !ios {
SUBDIRS += qt7
config_avfoundation: SUBDIRS += avfoundation
}
} }