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

CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)

Browse source 
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
This commit is contained in:
Daniel 2012-03-05 18:59:31 -05:00
parent a246f85a5b
commit a09b63b8d0
12 changed files with 49 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,9 @@ class ApiController extends Zend_Controller_Action
return;
}
$filename = $this->_getParam("file");
$name = $this->_getParam("name");
$filename = $this->_getParam("filename");
$file_id = substr($filename, 0, strpos($filename, "."));
if (ctype_alnum($file_id) && strlen($file_id) == 32)
{
@ -124,7 +126,6 @@ class ApiController extends Zend_Controller_Action
if ( $media != null && !PEAR::isError($media))
{
$filepath = $media->getFilePath();
if(is_file($filepath)){
$full_path = $media->getPropelOrm()->getDbFilepath();
$file_base_name = strrchr($full_path, '/');
@ -148,7 +149,6 @@ class ApiController extends Zend_Controller_Action
header("Content-Disposition: inline; filename=$file_base_name");
}
//ini_set('memory_limit', '512M');
$this->smartReadFile($filepath, $ext);
exit;
}else{
@ -197,7 +197,7 @@ class ApiController extends Zend_Controller_Action
}
}
}
if (isset($_SERVER['HTTP_RANGE']))
{
header('HTTP/1.1 206 Partial Content');
@ -215,7 +215,6 @@ class ApiController extends Zend_Controller_Action
{
header("Content-Range: bytes $begin-$end/$size");
}
header("Content-Transfer-Encoding: binary");
header("Last-Modified: $time");
@ -225,7 +224,8 @@ class ApiController extends Zend_Controller_Action
while (@ob_end_flush());
$cur = $begin;
fseek($fm, $begin, 0);
fseek($fm, $begin, 0);
while(!feof($fm) && $cur <= $end && (connection_status() == 0))
{
echo fread($fm, min(1024 * 16, ($end - $cur) + 1));

8
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -29,7 +29,7 @@ class PlaylistController extends Zend_Controller_Action
{
$pl = null;
if (isset($this->pl_sess->id)) {
if (isset($this->pl_sess->id)) {
$pl = new Application_Model_Playlist($this->pl_sess->id);
$modified = $this->_getParam('modified', null);
@ -112,7 +112,6 @@ class PlaylistController extends Zend_Controller_Action
$baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
$this->_helper->viewRenderer->setResponseSegment('spl');
@ -199,8 +198,7 @@ class PlaylistController extends Zend_Controller_Action
public function audioPreviewPlayerAction()
{
Logging::log("PlaylistControler::in the play action");
$name = $this->_getParam('name');
$fileName = $this->_getParam('filename');
$playlistIndex = $this->_getParam('index');
@ -219,6 +217,8 @@ class PlaylistController extends Zend_Controller_Action
} else {
$this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
}
$this->view->name = $name;
$this->view->fileName = $fileName;
$this->view->playlistIndex= $playlistIndex;
}

1
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -19,7 +19,6 @@ class ShowbuilderController extends Zend_Controller_Action
$this->_helper->layout->setLayout('builder');
$this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js'),'text/javascript');
$this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/preview.js'), 'text/javascript');
$this->_helper->actionStack('library', 'library');
$this->_helper->actionStack('builder', 'showbuilder');