This commit is contained in:
martin 2011-03-04 12:07:22 -05:00
parent afaea87319
commit d22ab329d8
7 changed files with 49 additions and 15 deletions

View file

@ -128,9 +128,8 @@ class ApiController extends Zend_Controller_Action
if (Schedule::ValidPypoTimeFormat($from) && Schedule::ValidPypoTimeFormat($to)) {
$result = Schedule::ExportRangeAsJson($from, $to);
$result['stream_metadata'] = array();
$result['stream_metadata']['format'] = "2";
$result['stream_metadata']['station_name'] = "z103";
$result['stream_metadata']['show_name'] = "dj danny D";
$result['stream_metadata']['format'] = Application_Model_Preference::GetStreamLabelFormat();
$result['stream_metadata']['station_name'] = Application_Model_Preference::GetStationName();
echo json_encode($result);
}
}

View file

@ -29,6 +29,7 @@ class PreferenceController extends Zend_Controller_Action
$values = $form->getValues();
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);
Application_Model_Preference::SetStreamLabelFormat($values["streamFormat"]);
$this->view->statusMsg = "Preferences Updated.";
}