Browse Source

playlist: remove STOPPED_PAUSE

It's now 100% handled by the player.
pull/192/head
Thomas Guillem 4 months ago
committed by Felix Paul Kühne
parent
commit
1153d74b2c
  1. 2
      include/vlc_playlist.h
  2. 1
      modules/gui/qt/playlist/playlist_controller.hpp
  3. 2
      src/libvlc.c
  4. 1
      src/playlist/control.c
  5. 2
      src/playlist/player.c

2
include/vlc_playlist.h

@ -176,8 +176,6 @@ enum vlc_playlist_preparsing
enum vlc_playlist_media_stopped_action {
/** Continue (or stop if there is no next media), default behavior */
VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE,
/** Pause when reaching the end of file */
VLC_PLAYLIST_MEDIA_STOPPED_PAUSE,
/** Stop, even if there is a next media to play */
VLC_PLAYLIST_MEDIA_STOPPED_STOP,
/** Exit VLC */

1
modules/gui/qt/playlist/playlist_controller.hpp

@ -84,7 +84,6 @@ public:
enum MediaStopAction
{
MEDIA_STOPPED_CONTINUE = VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE,
MEDIA_STOPPED_PAUSE = VLC_PLAYLIST_MEDIA_STOPPED_PAUSE,
MEDIA_STOPPED_STOP = VLC_PLAYLIST_MEDIA_STOPPED_STOP,
MEDIA_STOPPED_EXIT = VLC_PLAYLIST_MEDIA_STOPPED_EXIT
};

2
src/libvlc.c

@ -461,8 +461,6 @@ PlaylistConfigureFromVariables(vlc_playlist_t *playlist, vlc_object_t *obj)
media_stopped_action = VLC_PLAYLIST_MEDIA_STOPPED_EXIT;
else if (var_InheritBool(obj, "play-and-stop"))
media_stopped_action = VLC_PLAYLIST_MEDIA_STOPPED_STOP;
else if (var_InheritBool(obj, "play-and-pause"))
media_stopped_action = VLC_PLAYLIST_MEDIA_STOPPED_PAUSE;
else
media_stopped_action = VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE;

1
src/playlist/control.c

@ -439,7 +439,6 @@ vlc_playlist_UpdateNextMedia(vlc_playlist_t *playlist)
switch (playlist->stopped_action)
{
case VLC_PLAYLIST_MEDIA_STOPPED_CONTINUE:
case VLC_PLAYLIST_MEDIA_STOPPED_PAUSE:
case VLC_PLAYLIST_MEDIA_STOPPED_EXIT:
{
ssize_t index = vlc_playlist_GetNextMediaIndex(playlist);

2
src/playlist/player.c

@ -206,8 +206,6 @@ vlc_playlist_SetMediaStoppedAction(vlc_playlist_t *playlist,
{
vlc_playlist_AssertLocked(playlist);
playlist->stopped_action = action;
var_SetBool(playlist->player, "play-and-pause",
action == VLC_PLAYLIST_MEDIA_STOPPED_PAUSE);
vlc_playlist_UpdateNextMedia(playlist);
vlc_playlist_Notify(playlist, on_media_stopped_action_changed, action);
}

Loading…
Cancel
Save