osx/framework: renamed a few methods for consistency, added an addition subs method

[vlc] / projects / macosx / framework / Sources / VLCMediaPlayer.m

diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m
index 8f887a5acb5c171e167ed5d768a98ec2ba62391e..a49b8c72000187bcb3c7f1df75b7de29bb9bb2e7 100644 (file)
--- 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 );