Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
19fe54b3
Commit
19fe54b3
authored
Jan 28, 2010
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/framework: Fix a bunch of track related leaks.
parent
bf144ba3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
projects/macosx/framework/Sources/VLCMediaPlayer.m
projects/macosx/framework/Sources/VLCMediaPlayer.m
+12
-7
No files found.
projects/macosx/framework/Sources/VLCMediaPlayer.m
View file @
19fe54b3
...
...
@@ -61,6 +61,14 @@ 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
;
free
(
track
->
psz_name
);
free
(
track
);
return
next
;
}
/* libvlc event callback */
static
void
HandleMediaInstanceVolumeChanged
(
const
libvlc_event_t
*
event
,
void
*
self
)
{
...
...
@@ -321,10 +329,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
NSMutableArray
*
tempArray
=
[
NSMutableArray
array
];
while
(
currentTrack
)
{
[
tempArray
addObject
:[
NSString
stringWithUTF8String
:
currentTrack
->
psz_name
]];
free
(
currentTrack
->
psz_name
);
libvlc_track_description_t
*
tofree
=
currentTrack
;
currentTrack
=
currentTrack
->
p_next
;
free
(
tofree
);
currentTrack
=
freeAndGetNextTrack
(
currentTrack
);
}
return
[
NSArray
arrayWithArray
:
tempArray
];
}
...
...
@@ -521,7 +526,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
for
(
i
=
0
;
i
<
count
;
i
++
)
{
[
tempArray
addObject
:[
NSString
stringWithUTF8String
:
tracks
->
psz_name
]];
tracks
=
tracks
->
p_next
;
tracks
=
freeAndGetNextTrack
(
tracks
)
;
}
return
[
NSArray
arrayWithArray
:
tempArray
];
}
...
...
@@ -571,7 +576,7 @@ 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
=
tracks
->
p_next
;
tracks
=
freeAndGetNextTrack
(
tracks
)
;
}
return
[
NSArray
arrayWithArray
:
tempArray
];
}
...
...
@@ -615,7 +620,7 @@ static void HandleMediaPlayerMediaChanged(const libvlc_event_t * event, void * s
for
(
i
=
0
;
i
<
count
;
i
++
)
{
[
tempArray
addObject
:[
NSString
stringWithUTF8String
:
tracks
->
psz_name
]];
tracks
=
tracks
->
p_next
;
tracks
=
freeAndGetNextTrack
(
tracks
)
;
}
return
[
NSArray
arrayWithArray
:
tempArray
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment