diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-13 03:26:28 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-13 03:26:28 +0000 |
| commit | fbad7f92c1dab4fb58d109491a5cf3a738e756ff (patch) | |
| tree | 06cc406d433145ce73c3a5f3ed0722a9b2b08412 | |
| parent | b92109a64fe2fca1520be0536f8092e2f50ef8f4 (diff) | |
| download | ampache-fbad7f92c1dab4fb58d109491a5cf3a738e756ff.tar.gz ampache-fbad7f92c1dab4fb58d109491a5cf3a738e756ff.tar.bz2 ampache-fbad7f92c1dab4fb58d109491a5cf3a738e756ff.zip | |
fix xspf playlists - fixes flash player display
| -rw-r--r-- | lib/class/stream.class.php | 8 | ||||
| -rw-r--r-- | templates/show_edit_user.inc.php | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 3d05cbdd..5676490b 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -411,8 +411,12 @@ class Stream { foreach ($this->media as $element) { $type = array_shift($element); $media = new $type(array_shift($element)); + $media->format(); + + $xml = array(); switch ($type) { + default: case 'song': $xml['track']['title'] = $media->title; $xml['track']['creator'] = $media->f_artist_full; @@ -421,12 +425,8 @@ class Stream { $xml['track']['album'] = $media->f_album_full; $length = $media->time; break; - default: - - break; } // type - $xml = array(); $xml['track']['location'] = call_user_func(array($type,'play_url'),$media->id) . $flash_hack; $xml['track']['identifier'] = $xml['track']['location']; $xml['track']['duration'] = $length * 1000; diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index a0a7e7f7..1571f0ee 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -103,6 +103,12 @@ <input type="checkbox" value="1" name="prevent_override" /><span class="information"> <?php echo _('This Affects all non-Admin accounts'); ?></span> </td> </tr> +<tr> + <td><?php echo _('Clear Stats'); ?></td> + <td> + <input type="checkbox" value="1" name="reset_stats" /> + </td> +</tr> </table> <div class="formValidation"> <input type="hidden" name="action" value="update_user" /> |