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
a3e989d4
Commit
a3e989d4
authored
Jun 17, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the last direct use of object_wait
parent
337933ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
10 deletions
+20
-10
src/libvlc.h
src/libvlc.h
+10
-0
src/playlist/control.c
src/playlist/control.c
+1
-1
src/playlist/item.c
src/playlist/item.c
+4
-4
src/playlist/search.c
src/playlist/search.c
+1
-1
src/video_output/vout_intf.c
src/video_output/vout_intf.c
+4
-4
No files found.
src/libvlc.h
View file @
a3e989d4
...
@@ -142,6 +142,16 @@ extern void *
...
@@ -142,6 +142,16 @@ extern void *
vlc_custom_create
(
vlc_object_t
*
p_this
,
size_t
i_size
,
int
i_type
,
vlc_custom_create
(
vlc_object_t
*
p_this
,
size_t
i_size
,
int
i_type
,
const
char
*
psz_type
);
const
char
*
psz_type
);
/* Signal an object without checking for locking consistency. This is wrong. */
#ifdef __GNUC__
__attribute__
((
deprecated
))
#endif
static
inline
void
vlc_object_signal_maybe
(
vlc_object_t
*
p_this
)
{
vlc_cond_signal
(
&
p_this
->
object_wait
);
}
/**
/**
* libvlc_global_data_t (global variable)
* libvlc_global_data_t (global variable)
*
*
...
...
src/playlist/control.c
View file @
a3e989d4
...
@@ -162,7 +162,7 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
...
@@ -162,7 +162,7 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
return
VLC_EBADVAR
;
return
VLC_EBADVAR
;
break
;
break
;
}
}
vlc_
cond_signal
(
&
p_playlist
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_playlist
)
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
src/playlist/item.c
View file @
a3e989d4
...
@@ -724,7 +724,7 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
...
@@ -724,7 +724,7 @@ int playlist_TreeMove( playlist_t * p_playlist, playlist_item_t *p_item,
else
else
i_ret
=
TreeMove
(
p_playlist
,
p_item
,
p_node
,
i_newpos
);
i_ret
=
TreeMove
(
p_playlist
,
p_item
,
p_node
,
i_newpos
);
p_playlist
->
b_reset_currently_playing
=
true
;
p_playlist
->
b_reset_currently_playing
=
true
;
vlc_
cond_signal
(
&
p_playlist
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_playlist
)
);
return
i_ret
;
return
i_ret
;
}
}
...
@@ -750,7 +750,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
...
@@ -750,7 +750,7 @@ void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
val
.
p_address
=
p_add
;
val
.
p_address
=
p_add
;
p_playlist
->
b_reset_currently_playing
=
true
;
p_playlist
->
b_reset_currently_playing
=
true
;
if
(
b_signal
)
if
(
b_signal
)
vlc_
cond_signal
(
&
p_playlist
->
object_wai
t
);
vlc_
object_signal_maybe
(
p_playlis
t
);
var_Set
(
p_playlist
,
"item-append"
,
val
);
var_Set
(
p_playlist
,
"item-append"
,
val
);
free
(
p_add
);
free
(
p_add
);
}
}
...
@@ -808,7 +808,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
...
@@ -808,7 +808,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
if
(
p_playlist
->
p_input
)
if
(
p_playlist
->
p_input
)
input_StopThread
(
p_playlist
->
p_input
);
input_StopThread
(
p_playlist
->
p_input
);
p_playlist
->
request
.
i_status
=
PLAYLIST_RUNNING
;
p_playlist
->
request
.
i_status
=
PLAYLIST_RUNNING
;
vlc_
cond_signal
(
&
p_playlist
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_playlist
)
);
}
}
/* Preparse if PREPARSE or SPREPARSE & not enough meta */
/* Preparse if PREPARSE or SPREPARSE & not enough meta */
char
*
psz_artist
=
input_item_GetArtist
(
p_item_cat
->
p_input
);
char
*
psz_artist
=
input_item_GetArtist
(
p_item_cat
->
p_input
);
...
@@ -890,7 +890,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
...
@@ -890,7 +890,7 @@ static int DeleteInner( playlist_t * p_playlist, playlist_item_t *p_item,
p_playlist
->
request
.
b_request
=
true
;
p_playlist
->
request
.
b_request
=
true
;
p_playlist
->
request
.
p_item
=
NULL
;
p_playlist
->
request
.
p_item
=
NULL
;
msg_Info
(
p_playlist
,
"stopping playback"
);
msg_Info
(
p_playlist
,
"stopping playback"
);
vlc_
cond_signal
(
&
p_playlist
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_playlist
)
);
}
}
b_delay_deletion
=
true
;
b_delay_deletion
=
true
;
}
}
...
...
src/playlist/search.c
View file @
a3e989d4
...
@@ -167,6 +167,6 @@ int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root,
...
@@ -167,6 +167,6 @@ int playlist_LiveSearchUpdate( playlist_t *p_playlist, playlist_item_t *p_root,
{
{
p_playlist
->
b_reset_currently_playing
=
true
;
p_playlist
->
b_reset_currently_playing
=
true
;
playlist_LiveSearchUpdateInternal
(
p_playlist
,
p_root
,
psz_string
);
playlist_LiveSearchUpdateInternal
(
p_playlist
,
p_root
,
psz_string
);
vlc_
cond_signal
(
&
p_playlist
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_playlist
)
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
src/video_output/vout_intf.c
View file @
a3e989d4
...
@@ -544,7 +544,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -544,7 +544,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
{
{
msg_Err
(
p_vout
,
"Could not get snapshot"
);
msg_Err
(
p_vout
,
"Could not get snapshot"
);
image_HandlerDelete
(
p_image
);
image_HandlerDelete
(
p_image
);
vlc_
cond_signal
(
&
p_dest
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_dest
)
);
vlc_object_release
(
p_dest
);
vlc_object_release
(
p_dest
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -556,7 +556,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -556,7 +556,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
{
{
block_Release
(
p_block
);
block_Release
(
p_block
);
image_HandlerDelete
(
p_image
);
image_HandlerDelete
(
p_image
);
vlc_
cond_signal
(
&
p_dest
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_dest
)
);
vlc_object_release
(
p_dest
);
vlc_object_release
(
p_dest
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
@@ -573,7 +573,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -573,7 +573,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
block_Release
(
p_block
);
block_Release
(
p_block
);
free
(
p_snapshot
);
free
(
p_snapshot
);
image_HandlerDelete
(
p_image
);
image_HandlerDelete
(
p_image
);
vlc_
cond_signal
(
&
p_dest
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_dest
)
);
vlc_object_release
(
p_dest
);
vlc_object_release
(
p_dest
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
@@ -584,7 +584,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
...
@@ -584,7 +584,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
block_Release
(
p_block
);
block_Release
(
p_block
);
/* Unlock the object */
/* Unlock the object */
vlc_
cond_signal
(
&
p_dest
->
object_wait
);
vlc_
object_signal_maybe
(
VLC_OBJECT
(
p_dest
)
);
vlc_object_release
(
p_dest
);
vlc_object_release
(
p_dest
);
image_HandlerDelete
(
p_image
);
image_HandlerDelete
(
p_image
);
...
...
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