summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-11-12 09:41:14 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-15 12:49:40 (GMT)
commit609684a4196ccb979b85293ae61c16dd9d7b4671 (patch)
tree26996578a9879134987dfbe08de592eb62cdccdf /src/3rdparty/phonon
parent38f99b2e295c28acf0c74e06dde490cc6c2bb979 (diff)
downloadQt-609684a4196ccb979b85293ae61c16dd9d7b4671.zip
Qt-609684a4196ccb979b85293ae61c16dd9d7b4671.tar.gz
Qt-609684a4196ccb979b85293ae61c16dd9d7b4671.tar.bz2
On 32bit applications it would not get out of the waiting state
Specifically for 32bit applications it would not get out of the waiting state when using the Cocoa API, the QuickTime API works fine in this respect so we can fallback to this instead. Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee Reviewed-by: aavit <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/qt7/quicktimevideoplayer.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/qt7/quicktimevideoplayer.mm b/src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
index 3f76132..b35d787 100644
--- a/src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
+++ b/src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
@@ -452,7 +452,7 @@ float QuickTimeVideoPlayer::percentageLoaded()
void QuickTimeVideoPlayer::waitStatePlayable()
{
-#if defined(QT_MAC_USE_COCOA)
+#if defined(QT_MAC_USE_COCOA) && !defined(Q_OS_MAC32)
long state = [[m_QTMovie attributeForKey:@"QTMovieLoadStateAttribute"] longValue];
while (state != QTMovieLoadStateError && state < QTMovieLoadStatePlayable)
state = [[m_QTMovie attributeForKey:@"QTMovieLoadStateAttribute"] longValue];