From 7647c5af7deab29b3386fab5cdac9586bf0a277e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sat, 8 Mar 2008 20:54:34 +0100 Subject: [PATCH] Remove PLAYLIST_AUTOPLAY and use PLAYLIST_PLAY instead. Fix #1477 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafaël Carré --- include/vlc_common.h | 1 - modules/gui/macosx/intf.m | 2 +- modules/gui/skins2/src/skin_main.cpp | 2 +- src/playlist/control.c | 8 -------- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 5b0452707b..bc179a0f4b 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -200,7 +200,6 @@ typedef struct msg_subscription_t msg_subscription_t; */ typedef enum { PLAYLIST_PLAY, /**< No arg. res=can fail*/ - PLAYLIST_AUTOPLAY, /**< No arg. res=cant fail*/ PLAYLIST_VIEWPLAY, /**< arg1= playlist_item_t*,*/ /** arg2 = playlist_item_t* , res=can fail */ PLAYLIST_PAUSE, /**< No arg res=can fail*/ diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 18381cb431..9d87106c8d 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -553,7 +553,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* Check if we need to start playing */ if( p_intf->b_play ) { - playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE ); + playlist_Control( p_playlist, PLAYLIST_PLAY, VLC_FALSE ); } var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); val.b_bool = VLC_FALSE; diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 017f885af7..f9072e5a6b 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -262,7 +262,7 @@ static void Run( intf_thread_t *p_intf ) FIND_ANYWHERE ); if( p_playlist ) { - playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE ); + playlist_Control( p_playlist, PLAYLIST_PLAY, VLC_FALSE ); vlc_object_release( p_playlist ); } } diff --git a/src/playlist/control.c b/src/playlist/control.c index 3ff414102b..70ccf5a7ba 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -122,14 +122,6 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args } break; - case PLAYLIST_AUTOPLAY: - // AUTOPLAY is an ugly hack for initial status. - // Hopefully it will disappear - p_playlist->status.i_status = PLAYLIST_RUNNING; - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.b_request = VLC_FALSE; - break; - case PLAYLIST_PAUSE: val.i_int = 0; if( p_playlist->p_input ) -- 2.39.2