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

CC-3246: Hardware audio output cannot be switched off 

- fixed
This commit is contained in:
James 2012-01-13 16:56:02 -05:00
parent a24310e690
commit c82394b7a0
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -194,7 +194,7 @@ class PreferenceController extends Zend_Controller_Action
} }
} }
if($form->isValid($post_data)){ if($form->isValid($post_data)){
if(Application_Model_Preference::GetPlanLevel() == 'disabled'){// && $form->isValid($post_data['output_sound_device'])){ if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
$values['output_sound_device'] = $form->getValue('output_sound_device'); $values['output_sound_device'] = $form->getValue('output_sound_device');
} }

12
airtime_mvc/application/forms/StreamSetting.php
View File

@ -68,9 +68,15 @@ class Application_Form_StreamSetting extends Zend_Form
} }
public function isValid($data){ public function isValid($data){
if($data['output_sound_device']){ if(isset($data['output_sound_device'])){
$this->populate(array("output_sound_device"=>$data['output_sound_device'], "icecast_vorbis_metadata"=>$data['icecast_vorbis_metadata'], $d = array();
"output_sound_device_type"=>$data['output_sound_device_type'], "streamFormat"=>$data['streamFormat'])); $d["output_sound_device"] = $data['output_sound_device'];
$d["icecast_vorbis_metadata"] = $data['icecast_vorbis_metadata'];
if(isset($data['output_sound_device_type'])){
$d["output_sound_device_type"] = $data['output_sound_device_type'];
}
$d["streamFormat"] = $data['streamFormat'];
$this->populate($d);
} }
return true; return true;
} }

6
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -125,6 +125,12 @@ $(document).ready(function() {
rebuildStreamURL($(this)) rebuildStreamURL($(this))
}) })
if(!$("#output_sound_device").is(':checked')){
$("select[id=output_sound_device_type]").attr('disabled', 'disabled')
}else{
$("select[id=output_sound_device_type]").removeAttr('disabled')
}
$("#output_sound_device").change(function(){ $("#output_sound_device").change(function(){
if($(this).is(':checked')){ if($(this).is(':checked')){
$("select[id=output_sound_device_type]").removeAttr('disabled') $("select[id=output_sound_device_type]").removeAttr('disabled')