Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
martin 2011-03-22 01:29:38 -04:00
commit 730df4c345
3 changed files with 70 additions and 34 deletions

View file

@ -173,7 +173,12 @@ class PluploadController extends Zend_Controller_Action
$soundcloud->uploadTrack($file->getRealFilePath(), $file->getName());
}
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().' }');
$show_instance = $this->_getParam('show_instance');
$show = new ShowInstance($show_instance);
$show->setRecordedFile($file->getId());
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().'}');
}
public function pluploadAction()