From 1153d74b2c0912760a77550e6e0ae4d74b5a9685 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Thu, 27 Nov 2025 11:27:12 +0100 Subject: [PATCH] playlist: remove STOPPED_PAUSE It's now 100% handled by the player. --- include/vlc_playlist.h | 2 -- modules/gui/qt/playlist/playlist_controller.hpp | 1 - src/libvlc.c | 2 -- src/playlist/control.c | 1 - src/playlist/player.c | 2 -- 5 files changed, 8 deletions(-) diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index f810272fdb..1d1b577b19 100644 --- a/include/vlc_playlist.h +++ b/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 */ diff --git a/modules/gui/qt/playlist/playlist_controller.hpp b/modules/gui/qt/playlist/playlist_controller.hpp index 38d1e0a8a9..15024dc599 100644 --- a/modules/gui/qt/playlist/playlist_controller.hpp +++ b/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 }; diff --git a/src/libvlc.c b/src/libvlc.c index 51ccfcb92d..7359ff51af 100644 --- a/src/libvlc.c +++ b/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; diff --git a/src/playlist/control.c b/src/playlist/control.c index a6f51c10c0..0f74c852f0 100644 --- a/src/playlist/control.c +++ b/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); diff --git a/src/playlist/player.c b/src/playlist/player.c index 4427b1e5ce..9585d2f1f0 100644 --- a/src/playlist/player.c +++ b/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); }