diff options
| author | Holger Brunn <opensource@holgerbrunn.net> | 2013-01-24 16:13:17 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-28 13:26:11 -0500 |
| commit | 959aebe07fffe334bf3dc3f2bfcf9c5e77fad92a (patch) | |
| tree | e38e598eb859fdb906d8055c4d2724a62e854c0e /lib/class/stream.class.php | |
| parent | 499aef74145a32db8c73aeacb9c5d2dd5da40771 (diff) | |
| download | ampache-959aebe07fffe334bf3dc3f2bfcf9c5e77fad92a.tar.gz ampache-959aebe07fffe334bf3dc3f2bfcf9c5e77fad92a.tar.bz2 ampache-959aebe07fffe334bf3dc3f2bfcf9c5e77fad92a.zip | |
Add an HTML5 player
Merge request #20. Basic, not very pretty, but works and, unlike the
Flash player, is maintainable.
Diffstat (limited to 'lib/class/stream.class.php')
| -rw-r--r-- | lib/class/stream.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 338898a2..7304891c 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -144,8 +144,8 @@ class Stream { * This is a rather complex function that starts the transcoding or * resampling of a song and returns the opened file handle. */ - public static function start_transcode($song) { - $transcode_settings = $song->get_transcode_settings(); + public static function start_transcode($song, $type = null) { + $transcode_settings = $song->get_transcode_settings($type); // Bail out early if we're unutterably broken if ($transcode_settings == false) { debug_event('stream', 'Transcode requested, but get_transcode_settings failed', 2); |