Merge pull request #1148 from zklosko/js
Manually setting default mountpoint
This commit is contained in:
commit
104e9053e1
7 changed files with 8 additions and 21 deletions
|
@ -12,10 +12,7 @@ define('COMPANY_SITE' , 'libretime.org');
|
||||||
define('COMPANY_SITE_URL' , 'http://libretime.org');
|
define('COMPANY_SITE_URL' , 'http://libretime.org');
|
||||||
define('SUPPORT_ADDRESS' , 'https://discourse.libretime.org/');
|
define('SUPPORT_ADDRESS' , 'https://discourse.libretime.org/');
|
||||||
|
|
||||||
define("AIRTIMEPRO_API_URL", "https://account.example.com:5001/api/");
|
|
||||||
|
|
||||||
define('HELP_URL' , 'https://discourse.libretime.org/');
|
define('HELP_URL' , 'https://discourse.libretime.org/');
|
||||||
define('FAQ_URL' , 'http://libretime.org/faq');
|
|
||||||
define('WHOS_USING_URL' , 'https://github.com/orgs/LibreTime/people');
|
define('WHOS_USING_URL' , 'https://github.com/orgs/LibreTime/people');
|
||||||
define('TERMS_AND_CONDITIONS_URL' , 'https://github.com/LibreTime/libretime/blob/master/README.md');
|
define('TERMS_AND_CONDITIONS_URL' , 'https://github.com/LibreTime/libretime/blob/master/README.md');
|
||||||
define('PRIVACY_POLICY_URL' , 'https://github.com/LibreTime/code-of-conduct/blob/master/CODE_OF_CONDUCT.md');
|
define('PRIVACY_POLICY_URL' , 'https://github.com/LibreTime/code-of-conduct/blob/master/CODE_OF_CONDUCT.md');
|
||||||
|
|
|
@ -163,11 +163,6 @@ $pages[] = array(
|
||||||
'action' => 'help',
|
'action' => 'help',
|
||||||
'resource' => 'dashboard'
|
'resource' => 'dashboard'
|
||||||
),
|
),
|
||||||
array(
|
|
||||||
'label' => _('FAQ'),
|
|
||||||
'uri' => FAQ_URL,
|
|
||||||
'target' => "_blank"
|
|
||||||
),
|
|
||||||
array(
|
array(
|
||||||
'label' => _('User Manual'),
|
'label' => _('User Manual'),
|
||||||
'uri' => USER_MANUAL_URL,
|
'uri' => USER_MANUAL_URL,
|
||||||
|
|
|
@ -90,7 +90,7 @@ class ScheduleController extends Zend_Controller_Action
|
||||||
AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']);
|
AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']);
|
||||||
|
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone-with-data-2010-2020.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
|
|
||||||
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
$this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||||
|
|
|
@ -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',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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();
|
||||||
};
|
};
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -36,11 +36,12 @@ If the service isn't wanting to restart, look at its status for clues as to why
|
||||||
|
|
||||||
> If you find yourself constantly needing to restart a service, there's a chance it was never set to autostart on system boot. Use `sudo systemctl enable servicename` to fix this problem.
|
> If you find yourself constantly needing to restart a service, there's a chance it was never set to autostart on system boot. Use `sudo systemctl enable servicename` to fix this problem.
|
||||||
|
|
||||||
## 3. Basic troubleshooting
|
## 3. Known problems
|
||||||
|
|
||||||
If you have one of these issues, please try to resolve it with the instructions below before moving on in the
|
If you have one of these issues, please try to resolve it with the instructions below before moving on in the
|
||||||
troubleshooting checklist.
|
troubleshooting checklist.
|
||||||
|
|
||||||
|
- **Streaming player on Microsite and Listen player on Dashboard not working?** The problem could be caused by a bug in writing to the database during the setup wizard. This can be fixed by going to **Settings** -> **Stream Settings** and toggling the **Default Streaming** and **Custom/ 3rd Party Streaming** option, accepting the popup dialogues, and clicking **Save** at the top of the settings page.
|
||||||
- **File not importing successfully?** Libretime has been known to work with MP3 and WAV files, encoded using 41,100 Hz. Variable Bit Rate (VBR) files are currently hit or miss with the importer. Please convert your file to an MP3 or WAV at 41,100 Hz. and try uploading again.
|
- **File not importing successfully?** Libretime has been known to work with MP3 and WAV files, encoded using 41,100 Hz. Variable Bit Rate (VBR) files are currently hit or miss with the importer. Please convert your file to an MP3 or WAV at 41,100 Hz. and try uploading again.
|
||||||
- **Podcast hosted by Anchor.fm not importing?** There is no known work-around at this time. Ask your producers to provide their show files manually or check with the show's distributer.
|
- **Podcast hosted by Anchor.fm not importing?** There is no known work-around at this time. Ask your producers to provide their show files manually or check with the show's distributer.
|
||||||
- **Tracks won't publish?** We know the Publish screen is broken and we're working on it. A potential work-around is to use an external podcast host like [Anchor.fm](https://www.anchor.fm) or [Blubrry](https://blubrry.com/).
|
- **Tracks won't publish?** We know the Publish screen is broken and we're working on it. A potential work-around is to use an external podcast host like [Anchor.fm](https://www.anchor.fm) or [Blubrry](https://blubrry.com/).
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue