diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 86f22822a..7ac5b8c1b 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -66,7 +66,6 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetSoundCloudGenre($values["SoundCloudGenre"]); Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]); Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]); - Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]); $this->view->statusMsg = "
". _("Preferences updated.")."
"; $this->view->form = $form; @@ -256,6 +255,7 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]); Application_Model_Preference::SetAutoTransition($values["auto_transition"]); Application_Model_Preference::SetAutoSwitch($values["auto_switch"]); + Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]); if (!Application_Model_Preference::GetMasterDjConnectionUrlOverride()) { $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_harbor_input_port"]."/".$values["master_harbor_input_mount_point"]; diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index b76ef8c89..0244c983d 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -74,13 +74,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm $week_start_day->setValue(Application_Model_Preference::GetWeekStartDay()); $week_start_day->setDecorators(array('ViewHelper')); $this->addElement($week_start_day); - - $replay_gain = new Zend_Form_Element_Hidden("replayGainModifier"); - $replay_gain->setLabel(_("Replay Gain Modifier")) - ->setValue(Application_Model_Preference::getReplayGainModifier()) - ->setAttribs(array('style' => "border: 0; color: #f6931f; font-weight: bold;")) - ->setDecorators(array('ViewHelper')); - $this->addElement($replay_gain); } private function getTimezones() diff --git a/airtime_mvc/application/forms/StreamSetting.php b/airtime_mvc/application/forms/StreamSetting.php index 1663cf127..f092bed91 100644 --- a/airtime_mvc/application/forms/StreamSetting.php +++ b/airtime_mvc/application/forms/StreamSetting.php @@ -58,6 +58,13 @@ class Application_Form_StreamSetting extends Zend_Form $stream_format->setValue(Application_Model_Preference::GetStreamLabelFormat()); $stream_format->setDecorators(array('ViewHelper')); $this->addElement($stream_format); + + $replay_gain = new Zend_Form_Element_Hidden("replayGainModifier"); + $replay_gain->setLabel(_("Replay Gain Modifier")) + ->setValue(Application_Model_Preference::getReplayGainModifier()) + ->setAttribs(array('style' => "border: 0; color: #f6931f; font-weight: bold;")) + ->setDecorators(array('ViewHelper')); + $this->addElement($replay_gain); } public function isValid($data) diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml index 993f3da9d..ff562a0c1 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml @@ -108,23 +108,5 @@ -
- - - element->getElement('replayGainModifier')->getValue() ?> - -
-
- element->getElement('replayGainModifier') ?> - element->getElement('replayGainModifier')->hasErrors()) : ?> - - -
-
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index 60e4988e9..b6a0253e2 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -63,6 +63,24 @@ +
+ + + form->getElement('replayGainModifier')->getValue() ?> + +
+
+ form->getElement('replayGainModifier') ?> + form->getElement('replayGainModifier')->hasErrors()) : ?> + + +
+
form->getSubform('live_stream_subform'); ?> diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js index 62562e833..fe5635faf 100644 --- a/airtime_mvc/public/js/airtime/preferences/preferences.js +++ b/airtime_mvc/public/js/airtime/preferences/preferences.js @@ -80,20 +80,6 @@ function setMsAuthenticationFieldsReadonly(ele) { } } -function setSliderForReplayGain(){ - $( "#slider-range-max" ).slider({ - range: "max", - min: 0, - max: 10, - value: $("#rg_modifier_value").html(), - slide: function( event, ui ) { - $( "#replayGainModifier" ).val( ui.value ); - $("#rg_modifier_value").html(ui.value); - } - }); - $( "#replayGainModifier" ).val( $( "#slider-range-max" ).slider( "value" ) ); -} - $(document).ready(function() { $('.collapsible-header').live('click',function() { @@ -111,7 +97,6 @@ $(document).ready(function() { $('#content').empty().append(json.html); setTimeout(removeSuccessMsg, 5000); showErrorSections(); - setSliderForReplayGain(); }); }); @@ -121,6 +106,4 @@ $(document).ready(function() { setSystemFromEmailReadonly(); setConfigureMailServerListener(); setEnableSystemEmailsListener(); - - setSliderForReplayGain(); }); diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 5c1734772..b69eb48f9 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -386,12 +386,28 @@ function setupEventListeners() { var json = $.parseJSON(data); $('#content').empty().append(json.html); setupEventListeners(); + setSliderForReplayGain(); }); } }); } +function setSliderForReplayGain(){ + $( "#slider-range-max" ).slider({ + range: "max", + min: -10, + max: 10, + value: $("#rg_modifier_value").html(), + slide: function( event, ui ) { + $( "#replayGainModifier" ).val( ui.value ); + $("#rg_modifier_value").html(ui.value); + } + }); + $( "#replayGainModifier" ).val( $( "#slider-range-max" ).slider( "value" ) ); +} + $(document).ready(function() { setupEventListeners(); + setSliderForReplayGain(); });