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

Merge branch 'cc-3018-silence-detection' into devel

Browse source
This commit is contained in:
James 2013-01-03 14:08:21 -05:00
commit a1837366be
16 changed files with 239 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -929,7 +929,7 @@ class ApiController extends Zend_Controller_Action
$data_arr = json_decode($data);
if (!is_null($media_id)) {
if (isset($data_arr->title) &&
if (isset($data_arr->title) &&
strlen($data_arr->title) < 1024) {
$previous_metadata = CcWebstreamMetadataQuery::create()
@ -965,7 +965,7 @@ class ApiController extends Zend_Controller_Action
$streams = array("s1", "s2", "s3");
$stream_params = array();
foreach ($streams as $s) {
$stream_params[$s] =
$stream_params[$s] =
Application_Model_StreamSetting::getStreamDataNormalized($s);
}
$this->view->stream_params = $stream_params;