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
d3d77668
Commit
d3d77668
authored
May 07, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove pl_Get. This endorsed unyielded playlist access.
parent
2b5eb318
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
22 deletions
+18
-22
include/vlc_playlist.h
include/vlc_playlist.h
+0
-2
src/input/input.c
src/input/input.c
+3
-3
src/video_output/video_output.c
src/video_output/video_output.c
+15
-17
No files found.
include/vlc_playlist.h
View file @
d3d77668
...
@@ -262,8 +262,6 @@ struct playlist_add_t
...
@@ -262,8 +262,6 @@ struct playlist_add_t
#define PL_LOCK vlc_object_lock( p_playlist )
#define PL_LOCK vlc_object_lock( p_playlist )
#define PL_UNLOCK vlc_object_unlock( p_playlist )
#define PL_UNLOCK vlc_object_unlock( p_playlist )
#define pl_Get( a ) a->p_libvlc->p_playlist
VLC_EXPORT
(
playlist_t
*
,
__pl_Yield
,
(
vlc_object_t
*
)
);
VLC_EXPORT
(
playlist_t
*
,
__pl_Yield
,
(
vlc_object_t
*
)
);
#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
...
...
src/input/input.c
View file @
d3d77668
...
@@ -553,7 +553,7 @@ static int Run( input_thread_t *p_input )
...
@@ -553,7 +553,7 @@ static int Run( input_thread_t *p_input )
/* We have finished */
/* We have finished */
p_input
->
b_eof
=
true
;
p_input
->
b_eof
=
true
;
playlist_Signal
(
p
l_Get
(
p_input
)
);
playlist_Signal
(
p
_input
->
p_libvlc
->
p_playlist
);
}
}
/* Wait until we are asked to die */
/* Wait until we are asked to die */
...
@@ -2110,7 +2110,7 @@ static int UpdateFromAccess( input_thread_t *p_input )
...
@@ -2110,7 +2110,7 @@ static int UpdateFromAccess( input_thread_t *p_input )
vlc_meta_t
*
p_meta
=
vlc_meta_New
();
vlc_meta_t
*
p_meta
=
vlc_meta_New
();
access_Control
(
p_input
->
p
->
input
.
p_access
,
ACCESS_GET_META
,
p_meta
);
access_Control
(
p_input
->
p
->
input
.
p_access
,
ACCESS_GET_META
,
p_meta
);
InputUpdateMeta
(
p_input
,
p_meta
);
InputUpdateMeta
(
p_input
,
p_meta
);
var_SetInteger
(
p
l_Get
(
p_input
)
,
"item-change"
,
p_input
->
p
->
input
.
p_item
->
i_id
);
var_SetInteger
(
p
_input
->
p_libvlc
->
p_playlist
,
"item-change"
,
p_input
->
p
->
input
.
p_item
->
i_id
);
p_access
->
info
.
i_update
&=
~
INPUT_UPDATE_META
;
p_access
->
info
.
i_update
&=
~
INPUT_UPDATE_META
;
}
}
...
@@ -2153,7 +2153,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
...
@@ -2153,7 +2153,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
if
(
!
p_input
->
b_preparsing
)
if
(
!
p_input
->
b_preparsing
)
{
{
pl_Yield
(
p_input
);
pl_Yield
(
p_input
);
var_SetInteger
(
p
l_Get
(
p_input
)
,
"item-change"
,
var_SetInteger
(
p
_input
->
p_libvlc
->
p_playlist
,
"item-change"
,
p_input
->
p
->
input
.
p_item
->
i_id
);
p_input
->
p
->
input
.
p_item
->
i_id
);
pl_Release
(
p_input
);
pl_Release
(
p_input
);
}
}
...
...
src/video_output/video_output.c
View file @
d3d77668
...
@@ -509,26 +509,24 @@ static void vout_Destructor( vlc_object_t * p_this )
...
@@ -509,26 +509,24 @@ static void vout_Destructor( vlc_object_t * p_this )
#ifndef __APPLE__
#ifndef __APPLE__
vout_thread_t
*
p_another_vout
;
vout_thread_t
*
p_another_vout
;
playlist_t
*
p_playlist
=
pl_Get
(
p_vout
);
playlist_t
*
p_playlist
=
pl_Yield
(
p_vout
);
if
(
p_playlist
->
b_die
)
return
;
if
(
p_playlist
->
b_die
)
vlc_object_yield
(
p_playlist
);
{
/* This is a dirty hack for mostly Linux, where there is no way to get the GUI
pl_Release
(
p_vout
);
back if you closed it while playing video. This is solved in Mac OS X,
return
;
where we have this novelty called menubar, that will always allow you access
}
to the applications main functionality. They should try that on linux sometime */
/* This is a dirty hack mostly for Linux, where there is no way to get the
* GUI back if you closed it while playing video. This is solved in
* Mac OS X, where we have this novelty called menubar, that will always
* allow you access to the applications main functionality. They should try
* that on linux sometime. */
p_another_vout
=
vlc_object_find
(
p_this
->
p_libvlc
,
p_another_vout
=
vlc_object_find
(
p_this
->
p_libvlc
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
if
(
p_another_vout
==
NULL
)
if
(
p_another_vout
==
NULL
)
{
var_SetBool
(
p_playlist
,
"intf-show"
,
true
);
vlc_value_t
val
;
val
.
b_bool
=
true
;
var_Set
(
p_playlist
,
"intf-show"
,
val
);
}
else
else
{
vlc_object_release
(
p_another_vout
);
vlc_object_release
(
p_another_vout
);
}
pl_Release
(
p_vout
);
vlc_object_release
(
p_playlist
);
#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