Commit 91fe611c authored by David Fuhrmann's avatar David Fuhrmann

macosx: do not start same input item twice of startup

For playlist-autostart, PLAYLIST_PLAY is used now which does not restart
the current item if there is already one running.

This avoids restart of the same item in a quick succession, and thus
workarounds the issue described in refs #11488.

(cherry picked from commit e6dfd01f3dc2ff7b34006d214e57524f82e5ccd6)
Signed-off-by: default avatarDavid Fuhrmann <dfuhrmann@videolan.org>
parent aff86847
...@@ -773,12 +773,14 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -773,12 +773,14 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mainwindow updateTimeSlider]; [o_mainwindow updateTimeSlider];
[o_mainwindow updateVolumeSlider]; [o_mainwindow updateVolumeSlider];
// respect playlist-autostart
// note that PLAYLIST_PLAY will not stop any playback if already started
playlist_t * p_playlist = pl_Get(VLCIntf); playlist_t * p_playlist = pl_Get(VLCIntf);
PL_LOCK; PL_LOCK;
BOOL kidsAround = p_playlist->p_local_category->i_children != 0; BOOL kidsAround = p_playlist->p_local_category->i_children != 0;
PL_UNLOCK;
if (kidsAround && var_GetBool(p_playlist, "playlist-autostart")) if (kidsAround && var_GetBool(p_playlist, "playlist-autostart"))
[[self playlist] playItem:nil]; playlist_Control(p_playlist, PLAYLIST_PLAY, true);
PL_UNLOCK;
} }
/* don't allow a double termination call. If the user has /* don't allow a double termination call. If the user has
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment