Commit 3f4aec54 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx/framework: libvlc_track_description_release.

parent bcfa8de4
...@@ -61,13 +61,6 @@ NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state) ...@@ -61,13 +61,6 @@ NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state)
return stateToStrings[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 */ /* libvlc event callback */
static void HandleMediaInstanceVolumeChanged(const libvlc_event_t * event, void * self) static void HandleMediaInstanceVolumeChanged(const libvlc_event_t * event, void * self)
{ {
...@@ -328,8 +321,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -328,8 +321,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
NSMutableArray *tempArray = [NSMutableArray array]; NSMutableArray *tempArray = [NSMutableArray array];
while (currentTrack) { while (currentTrack) {
[tempArray addObject:[NSString stringWithUTF8String:currentTrack->psz_name]]; [tempArray addObject:[NSString stringWithUTF8String:currentTrack->psz_name]];
currentTrack = freeAndGetNextTrack(currentTrack); currentTrack = currentTrack->p_next;
} }
libvlc_track_description_release(currentTrack);
return [NSArray arrayWithArray: tempArray]; return [NSArray arrayWithArray: tempArray];
} }
...@@ -525,8 +519,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -525,8 +519,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
for (i = 0; i < count ; i++) for (i = 0; i < count ; i++)
{ {
[tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]];
tracks = freeAndGetNextTrack(tracks); tracks = tracks->p_next;
} }
libvlc_track_description_release(tracks);
return [NSArray arrayWithArray: tempArray]; return [NSArray arrayWithArray: tempArray];
} }
...@@ -575,8 +570,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -575,8 +570,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
for (i = 0; i < [self countOfTitles] ; i++) for (i = 0; i < [self countOfTitles] ; i++)
{ {
[tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]];
tracks = freeAndGetNextTrack(tracks); tracks = tracks->p_next;
} }
libvlc_track_description_release(tracks);
return [NSArray arrayWithArray: tempArray]; return [NSArray arrayWithArray: tempArray];
} }
...@@ -619,8 +615,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s ...@@ -619,8 +615,9 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
for (i = 0; i < count ; i++) for (i = 0; i < count ; i++)
{ {
[tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]]; [tempArray addObject:[NSString stringWithUTF8String: tracks->psz_name]];
tracks = freeAndGetNextTrack(tracks); tracks = tracks->p_next;
} }
libvlc_track_description_release(tracks);
return [NSArray arrayWithArray: tempArray]; return [NSArray arrayWithArray: tempArray];
} }
......
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