Align branding of supporting technologies with their stated names
"LiquidSoap" -> "Liquidsoap", "IceCast" -> "Icecast", "ShoutCast" -> "SHOUTcast"
This commit is contained in:
Buster "Silver Eagle" Neece
parent
78138af979
commit
0b185d4fc3
10
README.md
10
README.md
|
|
@ -32,9 +32,9 @@ With AzuraCast, you can:
|
|||
|
||||
### Supported Web Radio Software
|
||||
|
||||
AzuraCast uses [LiquidSoap](http://liquidsoap.fm/) as an "AutoDJ" to shuffle songs and playlists and provide an always-online radio stream. You can connect to LiquidSoap and broadcast your own live events as a DJ as well.
|
||||
AzuraCast uses [Liquidsoap](http://liquidsoap.fm/) as an "AutoDJ" to shuffle songs and playlists and provide an always-online radio stream. You can connect to Liquidsoap and broadcast your own live events as a DJ as well.
|
||||
|
||||
To broadcast your radio station to the public, AzuraCast supports both of the gold standards in web radio, [IceCast](http://icecast.org/) (v2.4) and [ShoutCast](http://wiki.shoutcast.com/wiki/SHOUTcast_Broadcaster) (v2). You can switch which of these your station uses anytime you want.
|
||||
To broadcast your radio station to the public, AzuraCast supports both of the gold standards in web radio, [Icecast](http://icecast.org/) (v2.4) and [SHOUTcast](http://wiki.shoutcast.com/wiki/SHOUTcast_Broadcaster) (v2). You can switch which of these your station uses anytime you want.
|
||||
|
||||
You can also use AzuraCast as a tool for relaying or collecting listener statistics and other data about stations that AzuraCast doesn't manage.
|
||||
|
||||
|
|
@ -63,9 +63,9 @@ Whether you're using the traditional installer or Docker containers, AzuraCast d
|
|||
* **[PHP 7.2](https://secure.php.net/)** powering the web application
|
||||
* **[InfluxDB](https://www.influxdata.com/)** for time-series based statistics
|
||||
* **[Redis](https://redis.io/)** for sessions, database and general caching
|
||||
* **[LiquidSoap](http://savonet.sourceforge.net/)** as the always-playing "AutoDJ"
|
||||
* **[IceCast 2](http://icecast.org/)** as a radio broadcasting frontend (Icecast-KH installed on supported platforms)
|
||||
* **[ShoutCast 2 DNAS](http://wiki.shoutcast.com/wiki/SHOUTcast_DNAS_Server_2)** as an alternative radio frontend (x86/x64 only)
|
||||
* **[Liquidsoap](http://savonet.sourceforge.net/)** as the always-playing "AutoDJ"
|
||||
* **[Icecast 2.4](http://icecast.org/)** as a radio broadcasting frontend (Icecast-KH installed on supported platforms)
|
||||
* **[SHOUTcast 2 DNAS](http://wiki.shoutcast.com/wiki/SHOUTcast_DNAS_Server_2)** as an alternative radio frontend (x86/x64 only)
|
||||
|
||||
All of these components are automatically downloaded and installed using either of the installation methods below.
|
||||
|
||||
|
|
|
|||
|
|
@ -349,24 +349,24 @@ return function (\Slim\Container $di, $settings) {
|
|||
);
|
||||
};
|
||||
|
||||
$di[Azuracast\Radio\Backend\LiquidSoap::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Backend\LiquidSoap($di);
|
||||
$di[Azuracast\Radio\Backend\Liquidsoap::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Backend\Liquidsoap($di);
|
||||
};
|
||||
|
||||
$di[AzuraCast\Radio\Backend\None::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Backend\None($di);
|
||||
};
|
||||
|
||||
$di[\AzuraCast\Radio\Frontend\IceCast::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Frontend\IceCast($di);
|
||||
$di[\AzuraCast\Radio\Frontend\Icecast::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Frontend\Icecast($di);
|
||||
};
|
||||
|
||||
$di[\AzuraCast\Radio\Frontend\Remote::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Frontend\Remote($di);
|
||||
};
|
||||
|
||||
$di[\AzuraCast\Radio\Frontend\ShoutCast2::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Frontend\ShoutCast2($di);
|
||||
$di[\AzuraCast\Radio\Frontend\SHOUTcast::class] = function($di) {
|
||||
return new \AzuraCast\Radio\Frontend\SHOUTcast($di);
|
||||
};
|
||||
|
||||
$di[\AzuraCast\Sync::class] = function ($di) {
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ return [
|
|||
'label' => _('Remote Station Type'),
|
||||
'required' => true,
|
||||
'options' => [
|
||||
'shoutcast1' => 'ShoutCast v1',
|
||||
'shoutcast2' => 'ShoutCast v2',
|
||||
'icecast' => 'IceCast v2.4+',
|
||||
'shoutcast1' => 'SHOUTcast v1',
|
||||
'shoutcast2' => 'SHOUTcast v2',
|
||||
'icecast' => 'Icecast v2.4+',
|
||||
],
|
||||
]
|
||||
],
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ return [
|
|||
'text',
|
||||
[
|
||||
'label' => _('YP Directory Authorization Hash'),
|
||||
'description' => sprintf(_('If your stream is set to advertise to YP directories above, you must specify an authorization hash. You can manage authhashes <a href="%s" target="_blank">on the ShoutCast web site</a>.'),
|
||||
'description' => sprintf(_('If your stream is set to advertise to YP directories above, you must specify an authorization hash. You can manage authhashes <a href="%s" target="_blank">on the SHOUTcast web site</a>.'),
|
||||
'https://rmo.shoutcast.com'),
|
||||
'default' => '',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ return [
|
|||
'once_per_x_songs' => '<b>' . _('Once per x Songs Playlist') . ':</b> ' . _('Play exactly once every <i>x</i> songs. Useful for station ID/jingles.'),
|
||||
'once_per_x_minutes' => '<b>' . _('Once Per x Minutes Playlist') . ':</b> ' . _('Play exactly once every <i>x</i> minutes. Useful for station ID/jingles.'),
|
||||
'once_per_day' => '<b>' . _('Daily Playlist') . '</b>: ' . _('Play once per day at the specified time. Useful for timely reminders.'),
|
||||
'custom' => '<b>' . _('Custom Playlist') .'</b>: ' . _('Manually define how this playlist is used in LiquidSoap configuration. For advanced users only!'),
|
||||
'custom' => '<b>' . _('Custom Playlist') .'</b>: ' . _('Manually define how this playlist is used in Liquidsoap configuration. For advanced users only!'),
|
||||
],
|
||||
'default' => 'default',
|
||||
'required' => true,
|
||||
|
|
|
|||
|
|
@ -163,9 +163,9 @@ return [
|
|||
'label' => _('Remote Station Type'),
|
||||
'belongsTo' => 'frontend_config',
|
||||
'options' => [
|
||||
'shoutcast1' => 'ShoutCast v1',
|
||||
'shoutcast2' => 'ShoutCast v2',
|
||||
'icecast' => 'IceCast v2.4+',
|
||||
'shoutcast1' => 'SHOUTcast v1',
|
||||
'shoutcast2' => 'SHOUTcast v2',
|
||||
'icecast' => 'Icecast v2.4+',
|
||||
],
|
||||
]
|
||||
],
|
||||
|
|
@ -223,7 +223,7 @@ return [
|
|||
],
|
||||
|
||||
'backend_liquidsoap' => [
|
||||
'legend' => _('Configure LiquidSoap'),
|
||||
'legend' => _('Configure Liquidsoap'),
|
||||
'class' => 'backend_fieldset',
|
||||
|
||||
'elements' => [
|
||||
|
|
@ -252,7 +252,7 @@ return [
|
|||
'radio',
|
||||
[
|
||||
'label' => _('Character Set Encoding'),
|
||||
'description' => _('For most cases, use the default UTF-8 encoding. The older ISO-8859-1 encoding can be used if accepting connections from ShoutCast 1 DJs or using other legacy software.'),
|
||||
'description' => _('For most cases, use the default UTF-8 encoding. The older ISO-8859-1 encoding can be used if accepting connections from SHOUTcast 1 DJs or using other legacy software.'),
|
||||
'belongsTo' => 'backend_config',
|
||||
'default' => 'UTF-8',
|
||||
'options' => [
|
||||
|
|
@ -317,7 +317,7 @@ return [
|
|||
'label' => _('Advanced: Custom Configuration'),
|
||||
'belongsTo' => 'backend_config',
|
||||
'class' => 'text-preformatted',
|
||||
'description' => _('This code will be inserted into your station\'s LiquidSoap configuration, below the playlist configuration and just before the IceCast output. Only use valid LiquidSoap code for this section!'),
|
||||
'description' => _('This code will be inserted into your station\'s Liquidsoap configuration, below the playlist configuration and just before the Icecast output. Only use valid Liquidsoap code for this section!'),
|
||||
]
|
||||
],
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -80,11 +80,11 @@ class Adapters
|
|||
$adapters = [
|
||||
'icecast' => [
|
||||
'name' => sprintf(_('Use <b>%s</b> on this server'), 'Icecast 2.4'),
|
||||
'class' => Frontend\IceCast::class,
|
||||
'class' => Frontend\Icecast::class,
|
||||
],
|
||||
'shoutcast2' => [
|
||||
'name' => sprintf(_('Use <b>%s</b> on this server'), 'Shoutcast 2'),
|
||||
'class' => Frontend\ShoutCast2::class,
|
||||
'name' => sprintf(_('Use <b>%s</b> on this server'), 'SHOUTcast DNAS 2'),
|
||||
'class' => Frontend\SHOUTcast::class,
|
||||
],
|
||||
'remote' => [
|
||||
'name' => _('Connect to a <b>remote radio server</b>'),
|
||||
|
|
@ -115,8 +115,8 @@ class Adapters
|
|||
if ($adapters === null) {
|
||||
$adapters = [
|
||||
'liquidsoap' => [
|
||||
'name' => sprintf(_('Use <b>%s</b> on this server'), 'LiquidSoap'),
|
||||
'class' => Backend\LiquidSoap::class,
|
||||
'name' => sprintf(_('Use <b>%s</b> on this server'), 'Liquidsoap'),
|
||||
'class' => Backend\Liquidsoap::class,
|
||||
],
|
||||
'none' => [
|
||||
'name' => _('<b>Do not use</b> an AutoDJ service'),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace AzuraCast\Radio\Backend;
|
|||
use Doctrine\ORM\EntityManager;
|
||||
use Entity;
|
||||
|
||||
class LiquidSoap extends BackendAbstract
|
||||
class Liquidsoap extends BackendAbstract
|
||||
{
|
||||
/**
|
||||
* @inheritdoc
|
||||
|
|
@ -17,7 +17,7 @@ class LiquidSoap extends BackendAbstract
|
|||
/**
|
||||
* Write configuration from Station object to the external service.
|
||||
*
|
||||
* Special thanks to the team of PonyvilleFM for assisting with LiquidSoap configuration and debugging.
|
||||
* Special thanks to the team of PonyvilleFM for assisting with Liquidsoap configuration and debugging.
|
||||
*
|
||||
* @return bool
|
||||
* @throws \Doctrine\ORM\OptimisticLockException
|
||||
|
|
@ -6,7 +6,7 @@ use App\Utilities;
|
|||
use Doctrine\ORM\EntityManager;
|
||||
use Entity;
|
||||
|
||||
class IceCast extends FrontendAbstract
|
||||
class Icecast extends FrontendAbstract
|
||||
{
|
||||
protected $force_proxy_on_secure_pages = true;
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ use App\Utilities;
|
|||
use Doctrine\ORM\EntityManager;
|
||||
use Entity;
|
||||
|
||||
class ShoutCast2 extends FrontendAbstract
|
||||
class SHOUTcast extends FrontendAbstract
|
||||
{
|
||||
protected $force_proxy_on_secure_pages = true;
|
||||
|
||||
|
|
@ -180,9 +180,9 @@ class ShoutCast2 extends FrontendAbstract
|
|||
$sc_config = $config_path . '/sc_serv.conf';
|
||||
|
||||
return $binary . ' ' . $sc_config;
|
||||
} else {
|
||||
return '/bin/false';
|
||||
}
|
||||
|
||||
return '/bin/false';
|
||||
}
|
||||
|
||||
public function getAdminUrl()
|
||||
|
|
@ -197,9 +197,7 @@ class ShoutCast2 extends FrontendAbstract
|
|||
protected function _getConfig()
|
||||
{
|
||||
$config_dir = $this->station->getRadioConfigDir();
|
||||
$config = @parse_ini_file($config_dir . '/sc_serv.conf', false, INI_SCANNER_RAW);
|
||||
|
||||
return $config;
|
||||
return @parse_ini_file($config_dir . '/sc_serv.conf', false, INI_SCANNER_RAW);
|
||||
}
|
||||
|
||||
protected function _loadFromConfig($config)
|
||||
|
|
@ -233,12 +231,12 @@ class ShoutCast2 extends FrontendAbstract
|
|||
|
||||
public static function getBinary()
|
||||
{
|
||||
$new_path = realpath(APP_INCLUDE_ROOT . '/..') . '/servers/shoutcast2/sc_serv';
|
||||
$new_path = dirname(APP_INCLUDE_ROOT) . '/servers/shoutcast2/sc_serv';
|
||||
|
||||
if (APP_INSIDE_DOCKER || file_exists($new_path)) {
|
||||
return $new_path;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -186,10 +186,10 @@ $assets
|
|||
<section class="card" role="region">
|
||||
<div class="card-header <?php if ($frontend_is_running): ?>bgm-green<?php else: ?>bgm-red<?php endif; ?> ch-alt">
|
||||
<h2>
|
||||
<?php if ($frontend_type == 'icecast'): ?>
|
||||
<?=_('IceCast (Broadcasting Service)') ?>
|
||||
<?php elseif ($frontend_type == 'shoutcast2'): ?>
|
||||
<?=_('ShoutCast (Broadcasting Service)') ?>
|
||||
<?php if ($frontend_type === 'icecast'): ?>
|
||||
<?=_('Icecast (Broadcasting Service)') ?>
|
||||
<?php elseif ($frontend_type === 'shoutcast2'): ?>
|
||||
<?=_('SHOUTcast DNAS 2 (Broadcasting Service)') ?>
|
||||
<?php endif; ?>
|
||||
<br><small><?php if ($frontend_is_running): ?><?=_('Running') ?><?php else: ?><?=_('Not Running') ?><?php endif; ?></small>
|
||||
</h2>
|
||||
|
|
@ -274,7 +274,7 @@ $assets
|
|||
<div class="card-header <?php if ($backend_is_running): ?>bgm-green<?php else: ?>bgm-red<?php endif; ?> ch-alt">
|
||||
<h2>
|
||||
<?php if ($backend_type == 'liquidsoap'): ?>
|
||||
<?=_('LiquidSoap (AutoDJ Service)') ?><br>
|
||||
<?=_('Liquidsoap (AutoDJ Service)') ?><br>
|
||||
<?php endif; ?>
|
||||
<small><?php if ($backend_is_running): ?><?=_('Running') ?><?php else: ?><?=_('Not Running') ?><?php endif; ?></small>
|
||||
</h2>
|
||||
|
|
|
|||
Loading…
Reference in New Issue