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
36ca011c
Commit
36ca011c
authored
Jul 24, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the main thread hack on platforms with non-idiotic toolkits
parent
4794bb1e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
include/vlc_interface.h
include/vlc_interface.h
+2
-0
src/interface/interface.c
src/interface/interface.c
+8
-3
No files found.
include/vlc_interface.h
View file @
36ca011c
...
@@ -50,7 +50,9 @@ struct intf_thread_t
...
@@ -50,7 +50,9 @@ struct intf_thread_t
VLC_COMMON_MEMBERS
VLC_COMMON_MEMBERS
/* Thread properties and locks */
/* Thread properties and locks */
#ifdef __APPLE__
bool
b_should_run_on_first_thread
;
bool
b_should_run_on_first_thread
;
#endif
/* Specific interfaces */
/* Specific interfaces */
intf_console_t
*
p_console
;
/** console */
intf_console_t
*
p_console
;
/** console */
...
...
src/interface/interface.c
View file @
36ca011c
...
@@ -50,8 +50,9 @@
...
@@ -50,8 +50,9 @@
* Local prototypes
* Local prototypes
*****************************************************************************/
*****************************************************************************/
static
void
RunInterface
(
intf_thread_t
*
p_intf
);
static
void
RunInterface
(
intf_thread_t
*
p_intf
);
#ifdef __APPLE__
static
void
MonitorLibVLCDeath
(
intf_thread_t
*
p_intf
);
static
void
MonitorLibVLCDeath
(
intf_thread_t
*
p_intf
);
#endif
static
int
AddIntfCallback
(
vlc_object_t
*
,
char
const
*
,
static
int
AddIntfCallback
(
vlc_object_t
*
,
char
const
*
,
vlc_value_t
,
vlc_value_t
,
void
*
);
vlc_value_t
,
vlc_value_t
,
void
*
);
...
@@ -95,7 +96,9 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
...
@@ -95,7 +96,9 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
if
(
!
p_intf
)
if
(
!
p_intf
)
return
NULL
;
return
NULL
;
p_intf
->
b_interaction
=
false
;
p_intf
->
b_interaction
=
false
;
#ifdef __APPLE__
p_intf
->
b_should_run_on_first_thread
=
false
;
p_intf
->
b_should_run_on_first_thread
=
false
;
#endif
/* Choose the best module */
/* Choose the best module */
p_intf
->
psz_intf
=
strdup
(
psz_module
);
p_intf
->
psz_intf
=
strdup
(
psz_module
);
...
@@ -136,6 +139,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
...
@@ -136,6 +139,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
*/
*/
int
intf_RunThread
(
intf_thread_t
*
p_intf
)
int
intf_RunThread
(
intf_thread_t
*
p_intf
)
{
{
#ifdef __APPLE__
/* Hack to get Mac OS X Cocoa runtime running
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
* (it needs access to the main thread) */
if
(
p_intf
->
b_should_run_on_first_thread
)
if
(
p_intf
->
b_should_run_on_first_thread
)
...
@@ -158,7 +162,7 @@ int intf_RunThread( intf_thread_t *p_intf )
...
@@ -158,7 +162,7 @@ int intf_RunThread( intf_thread_t *p_intf )
vlc_object_release
(
p_intf
);
vlc_object_release
(
p_intf
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
#endif
/* Run the interface in a separate thread */
/* Run the interface in a separate thread */
if
(
vlc_thread_create
(
p_intf
,
"interface"
,
RunInterface
,
if
(
vlc_thread_create
(
p_intf
,
"interface"
,
RunInterface
,
VLC_THREAD_PRIORITY_LOW
,
false
)
)
VLC_THREAD_PRIORITY_LOW
,
false
)
)
...
@@ -254,6 +258,7 @@ static void RunInterface( intf_thread_t *p_intf )
...
@@ -254,6 +258,7 @@ static void RunInterface( intf_thread_t *p_intf )
while
(
p_intf
->
p_module
);
while
(
p_intf
->
p_module
);
}
}
#ifdef __APPLE__
/*****************************************************************************
/*****************************************************************************
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*****************************************************************************/
*****************************************************************************/
...
@@ -283,8 +288,8 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
...
@@ -283,8 +288,8 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
vlc_object_kill
(
p_intf
);
vlc_object_kill
(
p_intf
);
}
}
vlc_list_release
(
p_list
);
vlc_list_release
(
p_list
);
}
}
#endif
static
int
AddIntfCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
AddIntfCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
...
...
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