Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
16dc3ef6
Commit
16dc3ef6
authored
May 09, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: replaced dated threading hacks with the latest season stuff
Thanks to Rémi for the help
parent
dfa6e4ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
19 deletions
+8
-19
include/vlc_interface.h
include/vlc_interface.h
+0
-3
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+8
-2
src/interface/interface.c
src/interface/interface.c
+0
-14
No files found.
include/vlc_interface.h
View file @
16dc3ef6
...
...
@@ -54,9 +54,6 @@ typedef struct intf_thread_t
struct
intf_thread_t
*
p_next
;
/** LibVLC interfaces book keeping */
vlc_thread_t
thread
;
/** LibVLC thread */
/* Thread properties and locks */
#if defined( __APPLE__ )
bool
b_should_run_on_first_thread
;
#endif
/* Specific interfaces */
intf_sys_t
*
p_sys
;
/** system interface */
...
...
modules/gui/macosx/intf.m
View file @
16dc3ef6
...
...
@@ -65,6 +65,8 @@
#import <AddressBook/AddressBook.h>
/* for crashlog send mechanism */
#import <Sparkle/Sparkle.h>
/* we're the update delegate */
#include "../../../lib/libvlc_internal.h"
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
...
...
@@ -97,6 +99,7 @@ int OpenIntf ( vlc_object_t *p_this )
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[
VLCApplication
sharedApplication
];
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
p_intf
->
p_sys
=
malloc
(
sizeof
(
intf_sys_t
)
);
...
...
@@ -107,8 +110,9 @@ int OpenIntf ( vlc_object_t *p_this )
/* subscribe to LibVLCCore's messages */
vlc_Subscribe
(
&
p_intf
->
p_sys
->
sub
,
MsgCallback
,
NULL
);
p_intf
->
pf_run
=
Run
;
p_intf
->
b_should_run_on_first_thread
=
true
;
libvlc_SetExitHandler
(
p_intf
->
p_libvlc
,
vlc_object_kill
,
p_intf
);
Run
(
p_intf
);
[
o_pool
release
];
return
VLC_SUCCESS
;
...
...
@@ -205,6 +209,8 @@ static void Run( intf_thread_t *p_intf )
[[
VLCMain
sharedInstance
]
applicationWillTerminate
:
nil
];
[
o_appLock
release
];
[
o_pool
release
];
raise
(
SIGTERM
);
}
#pragma mark -
...
...
src/interface/interface.c
View file @
16dc3ef6
...
...
@@ -108,9 +108,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
var_AddCallback
(
p_intf
,
"intf-add"
,
AddIntfCallback
,
NULL
);
/* Attach interface to LibVLC */
#if defined( __APPLE__ )
p_intf
->
b_should_run_on_first_thread
=
false
;
#endif
/* Choose the best module */
p_intf
->
p_cfg
=
NULL
;
...
...
@@ -130,17 +127,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
goto
error
;
}
#if defined( __APPLE__ )
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
if
(
p_intf
->
b_should_run_on_first_thread
)
{
libvlc_SetExitHandler
(
p_libvlc
,
vlc_object_kill
,
p_intf
);
assert
(
p_intf
->
pf_run
);
p_intf
->
pf_run
(
p_intf
);
p_intf
->
pf_run
=
NULL
;
}
#endif
/* Run the interface in a separate thread */
if
(
p_intf
->
pf_run
&&
vlc_clone
(
&
p_intf
->
thread
,
...
...
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