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

Compile in 32-bit mode.

Browse Source 
CGRect == NSRect only in 64-bit mode.

Don't add -framework QuickTime based on the host arch,
use QT_ARCH instead.

Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Morten Johan Sørvig
2013-01-08 14:39:10 +01:00
committed by The Qt Project
parent c414890d85
commit 77494db8d2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
View File

@@ -257,8 +257,8 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo]; NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo];
if ([tracks count]) { if ([tracks count]) {
AVAssetTrack *videoTrack = [tracks objectAtIndex:0]; AVAssetTrack *videoTrack = [tracks objectAtIndex:0];
m_playerLayer.anchorPoint = NSMakePoint(0.0f, 0.0f); m_playerLayer.anchorPoint = CGPointMake(0.0f, 0.0f);
m_playerLayer.bounds = NSMakeRect(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height); m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
} }
} }
@@ -368,8 +368,8 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo]; NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo];
if ([tracks count]) { if ([tracks count]) {
AVAssetTrack *videoTrack = [tracks objectAtIndex:0]; AVAssetTrack *videoTrack = [tracks objectAtIndex:0];
m_playerLayer.anchorPoint = NSMakePoint(0.0f, 0.0f); m_playerLayer.anchorPoint = CGPointMake(0.0f, 0.0f);
m_playerLayer.bounds = NSMakeRect(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height); m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
} }
} }

2
src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
View File

@@ -207,7 +207,7 @@ void AVFVideoWidgetControl::updateVideoFrame(const CVTimeStamp &ts)
void AVFVideoWidgetControl::setupVideoOutput() void AVFVideoWidgetControl::setupVideoOutput()
{ {
NSRect layerBounds = [(AVPlayerLayer*)m_playerLayer bounds]; CGRect layerBounds = [(AVPlayerLayer*)m_playerLayer bounds];
m_nativeSize = QSize(layerBounds.size.width, layerBounds.size.height); m_nativeSize = QSize(layerBounds.size.width, layerBounds.size.height);
m_videoWidget->setNativeSize(m_nativeSize); m_videoWidget->setNativeSize(m_nativeSize);

2
src/plugins/qt7/qt7.pro
View File

@@ -23,7 +23,7 @@ LIBS += -framework AppKit -framework AudioUnit \
# QUICKTIME_C_API_AVAILABLE is true only on i386 # QUICKTIME_C_API_AVAILABLE is true only on i386
# so make sure to link QuickTime # so make sure to link QuickTime
contains(QMAKE_HOST.arch, i386) { contains(QT_ARCH, i386) {
LIBS += -framework QuickTime LIBS += -framework QuickTime
} }