mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-25 02:04:23 +00:00
Code Activity

Fix for OSX QuickTimeComponet

Browse source
This commit is contained in:
jules 2012-10-07 19:57:49 +01:00
parent d0974a537d
commit def462bad0
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm
View file

@ -87,9 +87,7 @@ static QTMovie* openMovieFromStream (InputStream* movieStream, File& movieFile)
QTMovie* movie = nil;
FileInputStream* const fin = dynamic_cast <FileInputStream*> (movieStream);
if (fin != nullptr)
if (FileInputStream* const fin = dynamic_cast <FileInputStream*> (movieStream))
{
movieFile = fin->getFile();
movie = [QTMovie movieWithFile: juceStringToNS (movieFile.getFullPathName())
@ -118,14 +116,12 @@ static QTMovie* openMovieFromStream (InputStream* movieStream, File& movieFile)
return movie;
}
bool QuickTimeMovieComponent::loadMovie (const File& movieFile_,
const bool isControllerVisible_)
bool QuickTimeMovieComponent::loadMovie (const File& movieFile_, const bool showController)
{
return loadMovie ((InputStream*) movieFile_.createInputStream(), isControllerVisible_);
return loadMovie ((InputStream*) movieFile_.createInputStream(), showController);
}
bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream,
const bool controllerVisible_)
bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream, const bool showController)
{
closeMovie();
@ -142,14 +138,15 @@ bool QuickTimeMovieComponent::loadMovie (InputStream* movieStream,
[theMovie retain];
QTMovieView* view = (QTMovieView*) getView();
[view setMovie: theMovie];
[view setControllerVisible: controllerVisible_];
controllerVisible = showController;
[view setControllerVisible: controllerVisible];
setLooping (looping);
return movie != nil;
}
bool QuickTimeMovieComponent::loadMovie (const URL& movieURL,
const bool isControllerVisible_)
bool QuickTimeMovieComponent::loadMovie (const URL& movieURL,, const bool showController)
{
// unfortunately, QTMovie objects can only be created on the main thread..
jassert (MessageManager::getInstance()->isThisTheMessageThread());
@ -172,6 +169,8 @@ bool QuickTimeMovieComponent::loadMovie (const URL& movieURL,
[theMovie retain];
QTMovieView* view = (QTMovieView*) getView();
[view setMovie: theMovie];
controllerVisible = showController;
[view setControllerVisible: controllerVisible];
setLooping (looping);
@ -308,7 +307,7 @@ void QuickTimeMovieComponent::setBoundsWithCorrectAspectRatio (const Rectangle<i
int normalWidth, normalHeight;
getMovieNormalSize (normalWidth, normalHeight);
const Rectangle<int> normalSize (0, 0, normalWidth, normalHeight);
const Rectangle<int> normalSize (normalWidth, normalHeight);
if (! (spaceToFitWithin.isEmpty() || normalSize.isEmpty()))
setBounds (placement.appliedTo (normalSize, spaceToFitWithin));