Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3063: Live Stream Window: It doesn't play Shoutcast stream

Browse source 
- fixed. need special string appended when the stream is from shoutcast
- ';stream/1' need to be appended on shoutcast url.(that's how jplayer works)
This commit is contained in:
James 2011-11-21 11:57:36 -05:00
parent d4a02a655c
commit 65f2dd065b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View file

@ -2,10 +2,14 @@
<h1>Live stream</h1> <h1>Live stream</h1>
<?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?> <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
<script> <script>
function setjPlayer(url, type){ function setjPlayer(url, type, serverType){
var obj = new Object(); var obj = new Object();
obj[type] = url; obj[type] = url;
if(serverType == 'shoutcast'){
obj[type] = url + ";stream/1";
}
$("#jquery_jplayer_1").jPlayer("destroy"); $("#jquery_jplayer_1").jPlayer("destroy");
$("#jquery_jplayer_1").jPlayer({ $("#jquery_jplayer_1").jPlayer({
ready: function () { ready: function () {
@ -26,7 +30,7 @@ $(document).ready(function(){
var elem = $("#combo-box option:selected"); var elem = $("#combo-box option:selected");
console.log(elem); console.log(elem);
setjPlayer(elem.attr("data-url"), elem.attr("data-type")); setjPlayer(elem.attr("data-url"), elem.attr("data-type"), elem.attr("server-type"));
}); });
<?php <?php
@ -35,9 +39,10 @@ $(document).ready(function(){
$streamData = Application_Model_StreamSetting::getStreamData($id); $streamData = Application_Model_StreamSetting::getStreamData($id);
$url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"]; $url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"];
$type = $streamData["${id}_type"]; $type = $streamData["${id}_type"];
$serverType = $streamData["${id}_output"];
if ($type == "ogg") if ($type == "ogg")
$type = "oga"; $type = "oga";
echo "setjPlayer('$url', '$type');"; echo "setjPlayer('$url', '$type', '$serverType');";
} }
?> ?>
}); });
@ -53,11 +58,12 @@ $(document).ready(function(){
$streamData = Application_Model_StreamSetting::getStreamData($id); $streamData = Application_Model_StreamSetting::getStreamData($id);
$url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"]; $url = "http://".$streamData["${id}_host"].":".$streamData["${id}_port"]."/".$streamData["${id}_mount"];
$type = $streamData["${id}_type"]; $type = $streamData["${id}_type"];
$serverType = $streamData["${id}_output"];
if ($type == "ogg") if ($type == "ogg")
$type = "oga"; $type = "oga";
$label = $streamData["${id}_description"]." (".$streamData["${id}_bitrate"]." Kbit/s)"; $label = $streamData["${id}_description"]." (".$streamData["${id}_bitrate"]." Kbit/s)";
echo sprintf("<option class='stream' value='%s' data-url='%s' data-type='%s'>%s</option>", $id, $url, $type, $label); echo sprintf("<option class='stream' value='%s' data-url='%s' data-type='%s' server-type='%s'>%s</option>", $id, $url, $type, $serverType, $label);
} }
?> ?>
</select> </select>