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

Merge pull request #121 from radiorabe/feature/restore-recording-feature-part-2

Browse source 
Fix recording through ecasound
This commit is contained in:
Robb 2017-03-26 00:19:49 -04:00 • committed by GitHub
commit e73a2941fd
5 changed files with 55 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/configs/conf.php
View file

@ -73,10 +73,6 @@ class Config {
$CC_CONFIG['apiKey'] = array($values['general']['api_key']);
if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development"){
$CC_CONFIG['apiKey'][] = "";
}
$CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
$CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];

19
airtime_mvc/application/controllers/ApiController.php
View file

@ -642,25 +642,6 @@ class ApiController extends Zend_Controller_Action
}
}
public function uploadFileAction()
{
Logging::error("FIXME: Change the show recorder to use the File Upload API and remove this function."); // Albert - April 3, 2014
/**
$upload_dir = ini_get("upload_tmp_dir");
$tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
$tempFileName = basename($tempFilePath);
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
$result = Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName, $tempFileName);
if (!is_null($result)) {
$this->_helper->json->sendJson(
array("jsonrpc" => "2.0", "error" => array("code" => $result['code'], "message" => $result['message']))
);
}
**/
}
public function uploadRecordedAction()
{
$show_instance_id = $this->_getParam('showinstanceid');