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
ef966eb0
Commit
ef966eb0
authored
Aug 12, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
interface: Warning fixes on Mac OS X.
parent
11f5c39c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
src/interface/interface.c
src/interface/interface.c
+6
-4
No files found.
src/interface/interface.c
View file @
ef966eb0
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
*****************************************************************************/
*****************************************************************************/
static
void
*
RunInterface
(
vlc_object_t
*
p_this
);
static
void
*
RunInterface
(
vlc_object_t
*
p_this
);
#ifdef __APPLE__
#ifdef __APPLE__
static
void
MonitorLibVLCDeath
(
intf_thread_t
*
p_intf
);
static
void
*
MonitorLibVLCDeath
(
vlc_object_t
*
p_this
);
#endif
#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
*
);
...
@@ -150,7 +150,7 @@ int intf_RunThread( intf_thread_t *p_intf )
...
@@ -150,7 +150,7 @@ int intf_RunThread( intf_thread_t *p_intf )
msg_Err
(
p_intf
,
"cannot spawn libvlc death monitoring thread"
);
msg_Err
(
p_intf
,
"cannot spawn libvlc death monitoring thread"
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
RunInterface
(
p_intf
);
RunInterface
(
VLC_OBJECT
(
p_intf
)
);
/* Make sure our MonitorLibVLCDeath thread exit */
/* Make sure our MonitorLibVLCDeath thread exit */
vlc_object_kill
(
p_intf
);
vlc_object_kill
(
p_intf
);
...
@@ -265,8 +265,9 @@ static void* RunInterface( vlc_object_t *p_this )
...
@@ -265,8 +265,9 @@ static void* RunInterface( vlc_object_t *p_this )
/*****************************************************************************
/*****************************************************************************
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*****************************************************************************/
*****************************************************************************/
static
void
MonitorLibVLCDeath
(
intf_thread_t
*
p_intf
)
static
void
*
MonitorLibVLCDeath
(
vlc_object_t
*
p_this
)
{
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
libvlc_int_t
*
p_libvlc
=
p_intf
->
p_libvlc
;
libvlc_int_t
*
p_libvlc
=
p_intf
->
p_libvlc
;
vlc_object_lock
(
p_libvlc
);
vlc_object_lock
(
p_libvlc
);
while
(
vlc_object_alive
(
p_libvlc
)
)
while
(
vlc_object_alive
(
p_libvlc
)
)
...
@@ -274,7 +275,7 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
...
@@ -274,7 +275,7 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
if
(
p_intf
->
b_die
)
if
(
p_intf
->
b_die
)
{
{
vlc_object_unlock
(
p_libvlc
);
vlc_object_unlock
(
p_libvlc
);
return
;
return
NULL
;
}
}
vlc_object_wait
(
p_libvlc
);
vlc_object_wait
(
p_libvlc
);
}
}
...
@@ -291,6 +292,7 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
...
@@ -291,6 +292,7 @@ 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
);
return
NULL
;
}
}
#endif
#endif
...
...
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