Ampache

I have installed JW Flash Player 5 to avoid needing to transcode my music to MP3. It also supports video (either FLV or MP4 variants). However, video in JW Flash Player does not work with the default XSPF playlist out of the box from Ampache due to the lack of a meta tag like the following:

<meta rel="provider">video</meta>

In order to get video functioning properly, some small changes must be made to Ampache. I would definitely appreciate the incorporation of these changes!

First, the function Stream::create_xspf() must be updated to actually support video. As it is, the default case just pretends everything is a song, so we need to simply add another case for video and include the above meta tag.

lib/class/stream.class.php:

433,442c433
< break;
< case 'video':
< $xml['track']['title'] = $media->title;
< $xml['track']['creator'] = $media->f_artist_full;
< $xml['track']['info'] = Config::get('web_path') . "/albums.php?action=show&album=" . $media->album;
< $xml['track']['image'] = Config::get('web_path') . "/image.php?id=" . $media->album . "&thumb=3&sid=" . session_id();
< $xml['track']['album'] = $media->f_album_full;
< // Video for JW Flash Player requires the following meta tag
< $xml['track']['meta rel="provider"'] = "video";
< break;
---
> break;

Alright, that's nice. Unfortunately, xmlData::keyed_array() doesn't support tags with arguments (like $xml['track']['meta rel="provider"']). Since we kinda need it here (and I really do think this could be useful later on as well), let's change xmlData::keyed_array() to support tag arguments:

/lib/class/xmldata.class.php:

159,174c159
< // Find the first space in the tag (from the left). If there is one, we can assume there is an argument
< $positionOfSpace = strpos($key, ' ');
< if ($positionOfSpace === false) // If there was no space
< {
< // Insert the tag like normal
< $string .= "\t<$key><![CDATA[$value]]></$key>\n";
< }
< else // If there was a space
< {
< // The opening tag and closing tag must be different. While the opening tag can contain
< // the argument, the closing tag cannot. So, let's strip the argument for the closing
< // tag.
< $closingTag = substr($key, 0, $positionOfSpace);
< // Insert the opening tag with the argument, and the closing tag without the argument
< $string .= "\t<$key><![CDATA[$value]]></$closingTag>\n";
< }
---
> $string .= "\t<$key><![CDATA[$value]]></$key>\n";