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

Removing forced HTTPS, forcing mount assignment

Browse source
This commit is contained in:
Zachary Klosko 2020-12-30 20:59:28 -05:00
parent fdf1f1e918
commit b6dee33852
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/StreamSetting.php
View file

@ -284,8 +284,8 @@ class Application_Model_StreamSetting
'output' => 'icecast', 'output' => 'icecast',
'user' => $config['stationId'], 'user' => $config['stationId'],
'pass' => Application_Model_Preference::getDefaultIcecastPassword(), 'pass' => Application_Model_Preference::getDefaultIcecastPassword(),
// Kind of ugly... convert prefix int to ascii char // Manually setting default mountpoint
'mount' => $config['stationId'] . '_' . chr($prefix[1] + 96), 'mount' => 'airtime_128',
); );
} }

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

@ -21,9 +21,9 @@
this.settings = { this.settings = {
'elementId': id_element, // leave alone 'elementId': id_element, // leave alone
'autoplay': false, // or true (only works on some browsers) 'autoplay': false, // or true (only works on some browsers)
'forceHTTPS': true, // or true if the stream is in SSL (beware of the listening port, usually 8000) 'forceHTTPS': false, // or true if the stream is in SSL (beware of the listening port, usually 8000)
'replacePort':false, // false for disabled or '8000' as the usual start port, forces to specify replacePortTo. 'replacePort': false, // false for disabled or '8000' as the usual start port, forces to specify replacePortTo.
'replacePortTo':'' // either '' to use the default port of the browser (80/http, 443/https) or '8443' to force the port of the stream. 'replacePortTo': '' // either '' to use the default port of the browser (80/http, 443/https) or '8443' to force the port of the stream.
}; };
if (this.playerMode == "manual") { if (this.playerMode == "manual") {
@ -109,7 +109,7 @@
Html5Player.prototype.play = function() { Html5Player.prototype.play = function() {
console.log('play'); console.log('play');
playerhtml5_audio.src = this.settings.url+'?'+Math.floor(Math.random() * Math.floor(100000)); playerhtml5_audio.src = this.settings.url;
playerhtml5_audio.play(); playerhtml5_audio.play();
togglePlayStopButton(); togglePlayStopButton();
}; };