From 6ee778a4ea323a91929ae1caad5e87153ce190b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 20 Dec 2009 20:18:36 +0100
Subject: [PATCH] osx/framework: renamed a few methods for consistency, added
 an addition subs method

additionally, this changes the playback behavior of VLCKit. play-and-pause is no longer enabled.
---
 .../framework/Headers/Public/VLCMediaPlayer.h | 11 +++++----
 .../macosx/framework/Sources/VLCLibrary.m     |  1 -
 .../macosx/framework/Sources/VLCMediaPlayer.m | 23 ++++++++++++++++---
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/projects/macosx/framework/Headers/Public/VLCMediaPlayer.h b/projects/macosx/framework/Headers/Public/VLCMediaPlayer.h
index e95124c4fd..420d2b4d69 100644
--- a/projects/macosx/framework/Headers/Public/VLCMediaPlayer.h
+++ b/projects/macosx/framework/Headers/Public/VLCMediaPlayer.h
@@ -106,7 +106,8 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
 - (void)setVideoAspectRatio:(char *)value;
 - (char *)videoAspectRatio;
 - (void)setVideoSubTitles:(int)value;
-- (int)videoSubTitles;
+- (int)countOfVideoSubTitles;
+- (int)currentVideoSubTitles;
 
 - (void)setVideoCropGeometry:(char *)value;
 - (char *)videoCropGeometry;
@@ -159,16 +160,16 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
 @property (readonly) int fps;
 
 - (void)setChapter:(int)value;
-- (int)chapter;
+- (int)currentChapter;
 - (int)countOfChapters;
 
-- (void)setTitle:(int)value;
-- (int)title;
+- (void)setCurrentTitle:(int)value;
+- (int)currentTitle;
 - (int)countOfTitles;
 
 /* Audio Options */
 - (void)setAudioTrack:(int)value;
-- (int)audioTrack;
+- (int)currentAudioTrack;
 - (int)countOfAudioTracks;
 
 - (void)setAudioChannel:(int)value;
diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m
index a66143a2b8..ccf5beb9aa 100644
--- a/projects/macosx/framework/Sources/VLCLibrary.m
+++ b/projects/macosx/framework/Sources/VLCLibrary.m
@@ -79,7 +79,6 @@ void __catch_exception( void * e, const char * function, const char * file, int
             [defaultParams addObject:@"--verbose=2"];                               // Don't polute the log
             [defaultParams addObject:@"--vout=minimal_macosx"];
             [defaultParams addObject:@"--no-color"];
-            [defaultParams addObject:@"--play-and-pause"];                          // When ending a stream pause it instead of stopping it
             vlcParams = defaultParams;
         }
     
diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m
index 8f887a5acb..a49b8c7200 100644
--- a/projects/macosx/framework/Sources/VLCMediaPlayer.m
+++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m
@@ -283,7 +283,7 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
     catch_exception( &ex );
 }
 
-- (int)videoSubTitles
+- (int)countOfVideoSubTitles
 {
     libvlc_exception_t ex;
     libvlc_exception_init( &ex );
@@ -292,6 +292,23 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
     return result;
 }
 
+- (int)currentVideoSubTitles
+{
+    libvlc_exception_t ex;
+    libvlc_exception_init( &ex );
+    int result = libvlc_video_get_spu( instance, &ex );
+    if (libvlc_exception_raised(&ex))
+    {
+        libvlc_exception_clear(&ex);
+        return -1;
+    }
+    else
+    {
+        libvlc_exception_clear(&ex);
+        return result;
+    }
+}
+
 - (void)setVideoCropGeometry:(char *)value
 {
     libvlc_exception_t ex;
@@ -467,7 +484,7 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
     catch_exception( &ex );
 }
 
-- (void)setTitle:(int)value
+- (void)setCurrentTitle:(int)value
 {
     libvlc_exception_t ex;
     libvlc_exception_init( &ex );
@@ -501,7 +518,7 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
     catch_exception( &ex );
 }
 
-- (int)audioTrack
+- (int)currentAudioTrack
 {
     libvlc_exception_t ex;
     libvlc_exception_init( &ex );
-- 
2.39.5