Commit ebcff5e1 authored by eric.carlson@apple.com's avatar eric.carlson@apple.com
Browse files

2010-04-02 Jer Noble <jer.noble@apple.com>

        Reviewed by Eric Carlson.

        Configure multi-language movies: when QuickTime has sufficiently loaded
        the movie, call into wkQTMovieSelectPreferredAlternates to select the
        movie's alternate tracks according to the user's language preferences.

        https://bugs.webkit.org/show_bug.cgi?id=36624

        * WebCore.base.exp:
        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm: 
        (WebCore::MediaPlayerPrivate::updateStates): If the movie is sufficiently loaded,
        call wkQTMovieSelectPreferredAlternates to set up the alternate tracks.
        * platform/mac/WebCoreSystemInterface.h: Declare WKQTMovieSelectPreferredAlternates.
        * platform/mac/WebCoreSystemInterface.mm: Add WKQTMovieSelectPreferredAlternates.

2010-04-02  Jer Noble  <jer.noble@apple.com>

        Reviewed by Eric Carlson.
        
        https://bugs.webkit.org/show_bug.cgi?id=36624

        Update WebKitSystemInterface

        * WebKitSystem...
parent 19548ad3
2010-04-02 Jer Noble <jer.noble@apple.com>
Reviewed by Eric Carlson.
Configure multi-language movies: when QuickTime has sufficiently loaded
the movie, call into wkQTMovieSelectPreferredAlternates to select the
movie's alternate tracks according to the user's language preferences.
https://bugs.webkit.org/show_bug.cgi?id=36624
* WebCore.base.exp:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivate::updateStates): If the movie is sufficiently loaded,
call wkQTMovieSelectPreferredAlternates to set up the alternate tracks.
* platform/mac/WebCoreSystemInterface.h: Declare WKQTMovieSelectPreferredAlternates.
* platform/mac/WebCoreSystemInterface.mm: Add WKQTMovieSelectPreferredAlternates.
2010-04-02 James Robinson <jamesr@chromium.org>
 
Reviewed by Darin Adler.
......@@ -1071,6 +1071,7 @@ _wkQTMovieMaxTimeLoaded
_wkQTMovieMaxTimeLoadedChangeNotification
_wkQTMovieMaxTimeSeekable
_wkQTMovieSetShowClosedCaptions
_wkQTMovieSelectPreferredAlternates
_wkQTMovieViewSetDrawSynchronously
_wkSetCGFontRenderingMode
_wkSetCONNECTProxyAuthorizationForStream
......
......@@ -939,6 +939,7 @@ void MediaPlayerPrivate::updateStates()
loadState = QTMovieLoadStateError;
if (loadState != QTMovieLoadStateError) {
wkQTMovieSelectPreferredAlternates(m_qtMovie.get());
cacheMovieScale();
MediaPlayer::MovieLoadType movieType = movieLoadType();
m_isStreaming = movieType == MediaPlayer::StoredStream || movieType == MediaPlayer::LiveStream;
......
......@@ -126,9 +126,10 @@ extern int (*wkQTMovieDataRate)(QTMovie*);
extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
extern float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
extern int (*wkQTMovieGetType)(QTMovie* movie);
extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie* movie);
extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie* movie, BOOL showClosedCaptions);
extern int (*wkQTMovieGetType)(QTMovie*);
extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
......
......@@ -58,9 +58,10 @@ int (*wkQTMovieDataRate)(QTMovie*);
float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
int (*wkQTMovieGetType)(QTMovie* movie);
BOOL (*wkQTMovieHasClosedCaptions)(QTMovie* movie);
void (*wkQTMovieSetShowClosedCaptions)(QTMovie* movie, BOOL showClosedCaptions);
int (*wkQTMovieGetType)(QTMovie*);
BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
void (*wkSetDragImage)(NSImage*, NSPoint offset);
......
2010-04-02 Jer Noble <jer.noble@apple.com>
Reviewed by Eric Carlson.
https://bugs.webkit.org/show_bug.cgi?id=36624
Add an INIT macro for the WebKitSystemInterface function wkQTMovieSelectPreferredAlternates.
* WebCoreSupport/WebSystemInterface.m:
(InitWebCoreSystemInterface):
2010-04-02 Alexey Proskuryakov <ap@apple.com>
Reviewed by Darin Adler.
......
......@@ -89,6 +89,7 @@ void InitWebCoreSystemInterface(void)
INIT(QTMovieGetType);
INIT(QTMovieHasClosedCaptions);
INIT(QTMovieSetShowClosedCaptions);
INIT(QTMovieSelectPreferredAlternates);
INIT(QTMovieViewSetDrawSynchronously);
#ifndef BUILDING_ON_TIGER
......
2010-04-02 Jer Noble <jer.noble@apple.com>
Reviewed by Eric Carlson.
https://bugs.webkit.org/show_bug.cgi?id=36624
Update WebKitSystemInterface
* WebKitSystemInterface.h: add WKQTMovieSelectPreferredAlternates.
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceSnowLeopard.a:
* libWebKitSystemInterfaceTiger.a:
2010-04-01 Kinuko Yasuda <kinuko@chromium.org>
Reviewed by Dmitry Titov.
......
......@@ -191,6 +191,8 @@ int WKQTMovieGetType(QTMovie* movie);
BOOL WKQTMovieHasClosedCaptions(QTMovie* movie);
void WKQTMovieSetShowClosedCaptions(QTMovie* movie, BOOL showClosedCaptions);
void WKQTMovieSelectPreferredAlternates(QTMovie* movie);
void WKQTMovieSelectPreferredAlternateTrackForMediaType(QTMovie* movie, NSString* mediaType);
unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
int WKQTMovieDataRate(QTMovie* movie);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment