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

merge conflict cleanup

Browse source
This commit is contained in:
Martin Konecny 2013-01-18 17:48:13 -05:00
parent 909e290bd3
commit c0ca6b381f
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -241,9 +241,6 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md); Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md);
} }
Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]);
Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]);
Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']); Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);
// store stream update timestamp // store stream update timestamp