videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-28 23:09:59 +02:00
Code Releases Activity

dbus: simplify previous/next detection

Browse Source 
Use the existing playlist API to detect if there is a previous or next
item in the playlist.
This commit is contained in:
Romain Vimont 2021-04-06 17:53:30 +02:00 committed by Rémi Denis-Courmont
parent 3a44de136b
commit 9a47f147ec
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/control/dbus/dbus_player.c
View File

@ -256,16 +256,10 @@ MarshalCanGoNext( intf_thread_t *p_intf, DBusMessageIter *container )
{
vlc_playlist_t *playlist = p_intf->p_sys->playlist;
vlc_playlist_Lock(playlist);
size_t count = vlc_playlist_Count(playlist);
ssize_t index = vlc_playlist_GetCurrentIndex(playlist);
enum vlc_playlist_playback_repeat repeat_mode =
vlc_playlist_GetPlaybackRepeat(playlist);
bool has_next = vlc_playlist_HasNext(playlist);
vlc_playlist_Unlock(playlist);
dbus_bool_t b_can_go_next =
count != 0 &&
((index != -1 && (size_t)index < count - 1) ||
repeat_mode != VLC_PLAYLIST_PLAYBACK_REPEAT_NONE);
dbus_bool_t b_can_go_next = has_next;
if( !dbus_message_iter_append_basic( container, DBUS_TYPE_BOOLEAN,
&b_can_go_next ) )
@ -279,15 +273,10 @@ MarshalCanGoPrevious( intf_thread_t *p_intf, DBusMessageIter *container )
{
vlc_playlist_t *playlist = p_intf->p_sys->playlist;
vlc_playlist_Lock(playlist);
size_t count = vlc_playlist_Count(playlist);
ssize_t index = vlc_playlist_GetCurrentIndex(playlist);
enum vlc_playlist_playback_repeat repeat_mode =
vlc_playlist_GetPlaybackRepeat(playlist);
bool has_prev = vlc_playlist_HasPrev(playlist);
vlc_playlist_Unlock(playlist);
dbus_bool_t b_can_go_previous =
count != 0 &&
(index > 0 || repeat_mode != VLC_PLAYLIST_PLAYBACK_REPEAT_NONE);
dbus_bool_t b_can_go_previous = has_prev;
if( !dbus_message_iter_append_basic( container, DBUS_TYPE_BOOLEAN,
&b_can_go_previous ) )