Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
08a001aa
Commit
08a001aa
authored
Jan 19, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix OSX misuses of vlc_list_*
parent
e298f31f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
20 deletions
+3
-20
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+1
-1
src/interface/interface.c
src/interface/interface.c
+2
-19
No files found.
modules/gui/macosx/simple_prefs.m
View file @
08a001aa
...
@@ -372,7 +372,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
...
@@ -372,7 +372,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
p_list
=
module_list_get
(
NULL
);
p_list
=
module_list_get
(
NULL
);
if
(
!
p_item
||!
p_list
)
if
(
!
p_item
||!
p_list
)
{
{
if
(
p_list
)
vlc_list_releas
e
(
p_list
);
if
(
p_list
)
module_list_fre
e
(
p_list
);
NSLog
(
@"serious problem, item or list not found"
);
NSLog
(
@"serious problem, item or list not found"
);
return
;
return
;
}
}
...
...
src/interface/interface.c
View file @
08a001aa
...
@@ -233,28 +233,11 @@ static void * MonitorLibVLCDeath( vlc_object_t * p_this )
...
@@ -233,28 +233,11 @@ static void * MonitorLibVLCDeath( vlc_object_t * p_this )
int
canc
=
vlc_savecancel
();
int
canc
=
vlc_savecancel
();
vlc_object_lock
(
p_libvlc
);
vlc_object_lock
(
p_libvlc
);
while
(
vlc_object_alive
(
p_libvlc
)
)
while
(
vlc_object_alive
(
p_libvlc
)
)
{
if
(
p_intf
->
b_die
)
{
vlc_object_unlock
(
p_libvlc
);
return
NULL
;
}
vlc_object_wait
(
p_libvlc
);
vlc_object_wait
(
p_libvlc
);
}
vlc_object_unlock
(
p_libvlc
);
vlc_object_unlock
(
p_libvlc
);
/* Someone killed libvlc */
vlc_object_kill
(
p_intf
);
/* Kill the stupid first thread interface */
/* Make sure we kill all interface objects, especially
* those that are blocking libvlc (running on main thread) */
vlc_list_t
*
p_list
=
vlc_list_find
(
p_libvlc
,
VLC_OBJECT_INTF
,
FIND_CHILD
);
for
(
int
i
=
0
;
i
<
p_list
->
i_count
;
i
++
)
{
vlc_object_t
*
p_intf
=
p_list
->
p_values
[
i
].
p_object
;
vlc_object_kill
(
p_intf
);
}
vlc_list_release
(
p_list
);
vlc_restorecancel
(
canc
);
vlc_restorecancel
(
canc
);
return
NULL
;
return
NULL
;
}
}
...
...
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