From 258396bb17b7fb0b66181653dfc59c9914625436 Mon Sep 17 00:00:00 2001 From: Toralf Niebuhr Date: Sun, 7 Feb 2010 14:01:41 +0100 Subject: [PATCH] removed unused exceptions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Paul Kühne --- projects/macosx/framework/Sources/VLCLibrary.m | 17 ----------------- .../macosx/framework/Sources/VLCMediaLibrary.m | 7 ++----- .../framework/Sources/VLCMediaListPlayer.m | 6 ------ .../macosx/framework/Sources/VLCMediaPlayer.m | 3 --- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m index 1595dda53f..4870787316 100644 --- a/projects/macosx/framework/Sources/VLCLibrary.m +++ b/projects/macosx/framework/Sources/VLCLibrary.m @@ -34,21 +34,6 @@ static VLCLibrary * sharedLibrary = nil; -void __catch_exception( void * e, const char * function, const char * file, int line_number ) -{ - libvlc_exception_t * ex = (libvlc_exception_t *)e; - if( libvlc_exception_raised( ex ) ) - { - NSException* libvlcException = [NSException - exceptionWithName:@"LibVLCException" - reason:[NSString stringWithFormat:@"libvlc has thrown us an error: %s (%s:%d %s)", - libvlc_errmsg(), file, line_number, function] - userInfo:nil]; - libvlc_exception_clear( ex ); - @throw libvlcException; - } -} - @implementation VLCLibrary + (VLCLibrary *)sharedLibrary { @@ -64,8 +49,6 @@ void __catch_exception( void * e, const char * function, const char * file, int { if (self = [super init]) { - libvlc_exception_t ex; - libvlc_exception_init( &ex ); NSArray *vlcParams = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"VLCParams"]; if (!vlcParams) { diff --git a/projects/macosx/framework/Sources/VLCMediaLibrary.m b/projects/macosx/framework/Sources/VLCMediaLibrary.m index ca6a1f165b..d3c3786393 100644 --- a/projects/macosx/framework/Sources/VLCMediaLibrary.m +++ b/projects/macosx/framework/Sources/VLCMediaLibrary.m @@ -46,10 +46,7 @@ { mlib = libvlc_media_library_new( [VLCLibrary sharedInstance]); - libvlc_exception_t p_e; - libvlc_exception_init( &p_e ); - libvlc_media_library_load( mlib, &p_e ); - catch_exception( &p_e ); + libvlc_media_library_load( mlib ); allMedia = nil; } @@ -70,7 +67,7 @@ { if( !allMedia ) { - libvlc_media_list_t * p_mlist = libvlc_media_library_media_list( mlib, NULL ); + libvlc_media_list_t * p_mlist = libvlc_media_library_media_list( mlib ); allMedia = [[VLCMediaList mediaListWithLibVLCMediaList:p_mlist] retain]; libvlc_media_list_release(p_mlist); } diff --git a/projects/macosx/framework/Sources/VLCMediaListPlayer.m b/projects/macosx/framework/Sources/VLCMediaListPlayer.m index cf90295c86..48c8389772 100644 --- a/projects/macosx/framework/Sources/VLCMediaListPlayer.m +++ b/projects/macosx/framework/Sources/VLCMediaListPlayer.m @@ -102,18 +102,12 @@ - (void)playMedia:(VLCMedia *)media { - libvlc_exception_t ex; - libvlc_exception_init(&ex); libvlc_media_list_player_play_item(instance, [media libVLCMediaDescriptor]); - catch_exception(&ex); } - (void)play { - libvlc_exception_t ex; - libvlc_exception_init(&ex); libvlc_media_list_player_play(instance); - catch_exception(&ex); } - (void)stop diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m index 05b641fa8f..44bddacc26 100644 --- a/projects/macosx/framework/Sources/VLCMediaPlayer.m +++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m @@ -724,10 +724,7 @@ static const VLCMediaPlayerState libvlc_to_local_state[] = // Create a media instance, it doesn't matter what library we start off with // it will change depending on the media descriptor provided to the media // instance - libvlc_exception_t ex; - libvlc_exception_init( &ex ); instance = libvlc_media_player_new([VLCLibrary sharedInstance]); - catch_exception( &ex ); [self registerObservers]; -- 2.39.2