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

feat: move off_air_meta stream setting to pref table (#2023)

Browse source
This commit is contained in:
Jonas L 2022-08-06 19:18:40 +02:00 • committed by GitHub
parent e408237be1
commit 6c59ff588b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
legacy/application/controllers/PreferenceController.php
View file

@ -292,7 +292,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_StreamSetting::setDjLiveStreamPort($values['show_source_port']);
Application_Model_StreamSetting::setDjLiveStreamMountPoint($values['show_source_mount']);
Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);
Application_Model_Preference::setOffAirMeta($values['offAirMeta']);
// store stream update timestamp
Application_Model_Preference::SetStreamUpdateTimestamp();

2
legacy/application/forms/StreamSetting.php
View file

@ -65,7 +65,7 @@ class Application_Form_StreamSetting extends Zend_Form
$offAirMeta = new Zend_Form_Element_Text('offAirMeta');
$offAirMeta->setLabel(_('Off Air Metadata'))
->setValue(Application_Model_StreamSetting::getOffAirMeta())
->setValue(Application_Model_Preference::getOffAirMeta())
->setDecorators(['ViewHelper']);
$this->addElement($offAirMeta);

10
legacy/application/models/Preference.php
View file

@ -350,6 +350,16 @@ class Application_Model_Preference
return self::getValue('stream_label_format');
}
public static function getOffAirMeta()
{
return self::getValue('off_air_meta');
}
public static function setOffAirMeta($offAirMeta)
{
self::setValue('off_air_meta', $offAirMeta);
}
public static function GetStationName()
{
return self::getValue('station_name');

12
legacy/application/models/StreamSetting.php
View file

@ -207,7 +207,7 @@ class Application_Model_StreamSetting
$settings['master_live_stream_mp'] = self::getMasterLiveStreamMountPoint();
$settings['dj_live_stream_port'] = self::getDjLiveStreamPort();
$settings['dj_live_stream_mp'] = self::getDjLiveStreamMountPoint();
$settings['off_air_meta'] = self::getOffAirMeta();
$settings['off_air_meta'] = Application_Model_Preference::getOffAirMeta();
$settings['icecast_vorbis_metadata'] = self::getIcecastVorbisMetadata();
$settings['output_sound_device'] = self::getOutputSoundDevice();
$settings['output_sound_device_type'] = self::getOutputSoundDeviceType();
@ -507,16 +507,6 @@ class Application_Model_StreamSetting
self::setValue($stream . '_admin_pass', $v, 'string');
}
public static function getOffAirMeta()
{
return self::getValue('off_air_meta');
}
public static function setOffAirMeta($offAirMeta)
{
self::setValue('off_air_meta', $offAirMeta, 'string');
}
public static function GetAllListenerStatErrors()
{
$sql = 'SELECT * FROM cc_stream_setting WHERE keyname like :p1';