Commit 858057c2 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx/framework: Don't use deprecated functions, fix style and fix \t.

parent 73ebd279
...@@ -270,7 +270,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -270,7 +270,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
- (void)setCurrentVideoSubTitleIndex:(NSUInteger)index - (void)setCurrentVideoSubTitleIndex:(NSUInteger)index
{ {
libvlc_video_set_spu( instance, (int)index ); libvlc_video_set_spu(instance, (int)index);
} }
- (NSUInteger)currentVideoSubTitleIndex - (NSUInteger)currentVideoSubTitleIndex
...@@ -280,7 +280,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -280,7 +280,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
if (count <= 0) if (count <= 0)
return NSNotFound; return NSNotFound;
return libvlc_video_get_spu(instance); return libvlc_video_get_spu(instance);
} }
- (BOOL)openVideoSubTitlesFromFile:(NSString *)path - (BOOL)openVideoSubTitlesFromFile:(NSString *)path
...@@ -307,12 +307,12 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -307,12 +307,12 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
- (void)setVideoCropGeometry:(char *)value - (void)setVideoCropGeometry:(char *)value
{ {
libvlc_video_set_crop_geometry( instance, value ); libvlc_video_set_crop_geometry(instance, value);
} }
- (char *)videoCropGeometry - (char *)videoCropGeometry
{ {
char * result = libvlc_video_get_crop_geometry( instance ); char * result = libvlc_video_get_crop_geometry(instance);
return result; return result;
} }
...@@ -327,17 +327,16 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -327,17 +327,16 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
return result; return result;
} }
- (void)saveVideoSnapshotAt: (NSString *)path withWidth:(NSUInteger)width andHeight:(NSUInteger)height - (void)saveVideoSnapshotAt:(NSString *)path withWidth:(NSUInteger)width andHeight:(NSUInteger)height
{ {
libvlc_exception_t ex; int failure = libvlc_video_take_snapshot(instance, 0, [path UTF8String], width, height);
libvlc_exception_init( &ex ); if (failure)
libvlc_video_take_snapshot( instance, [path UTF8String], width, height, &ex ); [[NSException exceptionWithName:@"Can't take a video snapshot" reason:@"No video output" userInfo:nil] raise];
catch_exception( &ex );
} }
- (void)setDeinterlaceFilter: (NSString *)name - (void)setDeinterlaceFilter:(NSString *)name
{ {
libvlc_video_set_deinterlace( instance, [name UTF8String] ); libvlc_video_set_deinterlace(instance, [name UTF8String]);
} }
- (void)setRate:(float)value - (void)setRate:(float)value
...@@ -352,9 +351,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -352,9 +351,11 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
- (NSSize)videoSize - (NSSize)videoSize
{ {
NSSize result = NSMakeSize(libvlc_video_get_height((libvlc_media_player_t *)instance), unsigned height = 0, width = 0;
libvlc_video_get_width((libvlc_media_player_t *)instance)); int failure = libvlc_video_get_size(instance, 0, &width, &height);
return result; if (failure)
[[NSException exceptionWithName:@"Can't get video size" reason:@"No video output" userInfo:nil] raise];
return NSMakeSize(width, height);
} }
- (BOOL)hasVideoOut - (BOOL)hasVideoOut
......
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