workaround for FS#8748 (possibly others) where playback might freeze or get confused if you try starting a new playlist when party mode is enabled.

It now will ignore the setting if you try starting playback if there is nothing already playing.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18315 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-08-19 11:55:30 +00:00
parent 209245605b
commit ddc2176b4d

View file

@ -90,7 +90,7 @@ int ft_build_playlist(struct tree_context* c, int start_index)
*/ */
bool ft_play_playlist(char* pathname, char* dirname, char* filename) bool ft_play_playlist(char* pathname, char* dirname, char* filename)
{ {
if (global_settings.party_mode) if (global_settings.party_mode && audio_status())
{ {
splash(HZ, ID2P(LANG_PARTY_MODE)); splash(HZ, ID2P(LANG_PARTY_MODE));
return false; return false;
@ -404,7 +404,7 @@ int ft_enter(struct tree_context* c)
if (!warn_on_pl_erase()) if (!warn_on_pl_erase())
break; break;
if (global_settings.party_mode) if (global_settings.party_mode && audio_status())
{ {
playlist_insert_track(NULL, buf, playlist_insert_track(NULL, buf,
PLAYLIST_INSERT_LAST, true, true); PLAYLIST_INSERT_LAST, true, true);
@ -529,7 +529,7 @@ int ft_enter(struct tree_context* c)
/* plugin file */ /* plugin file */
case FILE_ATTR_ROCK: case FILE_ATTR_ROCK:
if (global_settings.party_mode) { if (global_settings.party_mode && audio_status()) {
splash(HZ, ID2P(LANG_PARTY_MODE)); splash(HZ, ID2P(LANG_PARTY_MODE));
break; break;
} }
@ -553,7 +553,7 @@ int ft_enter(struct tree_context* c)
{ {
const char* plugin; const char* plugin;
if (global_settings.party_mode) { if (global_settings.party_mode && audio_status()) {
splash(HZ, ID2P(LANG_PARTY_MODE)); splash(HZ, ID2P(LANG_PARTY_MODE));
break; break;
} }