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

Fix player's manual mode

Browse source
This commit is contained in:
drigato 2015-04-10 10:52:40 -04:00
parent fbcd5bc5bd
commit 9e62c71690
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/EmbedController.php
View file

@ -37,6 +37,7 @@ class EmbedController extends Zend_Controller_Action
if ($stream == "auto") { if ($stream == "auto") {
$this->view->playerMode = "auto"; $this->view->playerMode = "auto";
$this->view->streamURL = json_encode("");
foreach ($streamData as $s) { foreach ($streamData as $s) {
if ($s["mobile"]) { if ($s["mobile"]) {
array_push($availableMobileStreams, $s); array_push($availableMobileStreams, $s);
@ -44,7 +45,7 @@ class EmbedController extends Zend_Controller_Action
array_push($availableDesktopStreams, $s); array_push($availableDesktopStreams, $s);
} }
} }
} else { } elseif (!empty($stream)) {
$this->view->playerMode = "manual"; $this->view->playerMode = "manual";
$selectedStreamData = $streamData[$stream]; $selectedStreamData = $streamData[$stream];
$this->view->streamURL = json_encode($selectedStreamData["url"]); $this->view->streamURL = json_encode($selectedStreamData["url"]);

18
airtime_mvc/application/views/scripts/embed/player.phtml
View file

@ -35,7 +35,7 @@
}; };
if (this.playerMode == "manual") { if (this.playerMode == "manual") {
this.settings.url = '<?php echo $this->streamURL ?>'; this.settings.url = <?php echo $this->streamURL ?>;
this.settings.codec = "<?php echo $this->codec ?>"; this.settings.codec = "<?php echo $this->codec ?>";
} else if (this.playerMode == "auto") { } else if (this.playerMode == "auto") {
this.availableMobileStreamQueue = <?php echo $this->availableMobileStreams?>; this.availableMobileStreamQueue = <?php echo $this->availableMobileStreams?>;
@ -63,7 +63,6 @@
if (!this.flashDetect) { if (!this.flashDetect) {
MRP.html.audio.addEventListener('error', function failed(e) { MRP.html.audio.addEventListener('error', function failed(e) {
console.log("HTML error");
var stream = musesPlayer.getNextAvailableStream(); var stream = musesPlayer.getNextAvailableStream();
var audio = $(MRP.html.audio); var audio = $(MRP.html.audio);
audio.src = stream["url"]; audio.src = stream["url"];
@ -72,8 +71,6 @@
}, true); }, true);
MRP.html.audio.addEventListener('pause', function paused(e) { MRP.html.audio.addEventListener('pause', function paused(e) {
//this is when pause happens
console.log("HTML paused");
//src = MRP.html.audio.src; //src = MRP.html.audio.src;
//MRP.html.audio.src = ""; //MRP.html.audio.src = "";
}, true); }, true);
@ -256,19 +253,6 @@
</div> </div>
<!--
<div class="airtime_volume">
<div class="volume_control">
<span class="mute"></span>
</div>
<div class="airtime_volume_bar">
<div class="airtime_volume_bar_value" style="width: 80%;"></div>
</div>
</div>
-->
<div style="clear:both"></div> <div style="clear:both"></div>
<div class="airtime_schedule"> <div class="airtime_schedule">