diff --git a/lib/class/stream_playlist.class.php b/lib/class/stream_playlist.class.php index 16aea481..ae84e049 100644 --- a/lib/class/stream_playlist.class.php +++ b/lib/class/stream_playlist.class.php @@ -480,6 +480,16 @@ class Stream_Playlist $localplay->add_url($url); } if (!$append) { + // We don't have metadata on Stream_URL to know its kind + // so we check the content to know if it is democratic + if (count($this->urls) == 1) { + $furl = $this->urls[0]; + if (strpos($furl->url, "&demo_id=1") !== false && $furl->time == -1) { + // If democratic, repeat the song to get the next voted one. + debug_event('stream_playlist', 'Playing democratic on localplay, enabling repeat...', 5); + $localplay->repeat(true); + } + } $localplay->play(); } diff --git a/sql/ampache.sql b/sql/ampache.sql index 9c594121..c9699315 100644 --- a/sql/ampache.sql +++ b/sql/ampache.sql @@ -60,12 +60,12 @@ CREATE TABLE IF NOT EXISTS `access_list` ( -- INSERT INTO `access_list` (`id`, `name`, `start`, `end`, `level`, `type`, `user`, `enabled`) VALUES -(1, 'DEFAULTv4', '\0\0\0\0', '����', 75, 'interface', -1, 1), -(2, 'DEFAULTv4', '\0\0\0\0', '����', 75, 'stream', -1, 1), -(3, 'DEFAULTv4', '\0\0\0\0', '����', 75, 'rpc', -1, 1), -(4, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '����������������', 75, 'interface', -1, 1), -(5, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '����������������', 75, 'stream', -1, 1); -(6, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', '����������������', 75, 'rpc', -1, 1); +(1, 'DEFAULTv4', '\0\0\0\0', 'ÿÿÿÿ', 75, 'interface', -1, 1), +(2, 'DEFAULTv4', '\0\0\0\0', 'ÿÿÿÿ', 75, 'stream', -1, 1), +(3, 'DEFAULTv4', '\0\0\0\0', 'ÿÿÿÿ', 75, 'rpc', -1, 1), +(4, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', 'ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ', 75, 'interface', -1, 1), +(5, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', 'ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ', 75, 'stream', -1, 1); +(6, 'DEFAULTv6', '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', 'ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ', 75, 'rpc', -1, 1); -- -------------------------------------------------------- diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 72b9dcca..447196eb 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -106,8 +106,10 @@ $display_fields = (array) AmpConfig::get('registration_display_fields'); $apikey_qrcode .= "#ssl=true"; } ?> +
- +
+ apikey; ?>