From 3f4aec548fcf911be1695e214f13febe704843b2 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Fri, 29 Jan 2010 11:48:38 +0100 Subject: [PATCH] macosx/framework: libvlc_track_description_release. --- .../macosx/framework/Sources/VLCMediaPlayer.m | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m index d85f08b919..14fccd3491 100644 --- a/projects/macosx/framework/Sources/VLCMediaPlayer.m +++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m @@ -61,13 +61,6 @@ NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state) return stateToStrings[state]; } -static inline libvlc_track_description_t *freeAndGetNextTrack(libvlc_track_description_t *track) -{ - libvlc_track_description_t *next = track->p_next; - libvlc_track_description_release(track); - return next; -} - /* libvlc event callback */ static void HandleMediaInstanceVolumeChanged(const libvlc_event_t * event, void * self) { @@ -328,8 +321,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s NSMutableArray *tempArray = [NSMutableArray array]; while (currentTrack) { [tempArray addObject:[NSString stringWithUTF8String:currentTrack->psz_name]]; - currentTrack = freeAndGetNextTrack(currentTrack); + currentTrack = currentTrack->p_next; } + libvlc_track_description_release(currentTrack); return [NSArray arrayWithArray: tempArray]; } @@ -525,8 +519,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s for (i = 0; i < count ; i++) { [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; - tracks = freeAndGetNextTrack(tracks); + tracks = tracks->p_next; } + libvlc_track_description_release(tracks); return [NSArray arrayWithArray: tempArray]; } @@ -575,8 +570,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s for (i = 0; i < [self countOfTitles] ; i++) { [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; - tracks = freeAndGetNextTrack(tracks); + tracks = tracks->p_next; } + libvlc_track_description_release(tracks); return [NSArray arrayWithArray: tempArray]; } @@ -619,8 +615,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s for (i = 0; i < count ; i++) { [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; - tracks = freeAndGetNextTrack(tracks); + tracks = tracks->p_next; } + libvlc_track_description_release(tracks); return [NSArray arrayWithArray: tempArray]; } -- 2.39.2