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 
- Merged with devel, removed js from StoredFile.php
This commit is contained in:
Daniel 2012-03-02 17:55:17 -05:00
parent 51f004933b
commit a246f85a5b
6 changed files with 570 additions and 1151 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/controllers/LibraryController.php
View file

@ -68,7 +68,7 @@ class LibraryController extends Zend_Controller_Action
public function contextMenuAction()
{
global $CC_CONFIG;
global $CC_CONFIG;
$id = $this->_getParam('id');
$type = $this->_getParam('type');
@ -88,15 +88,17 @@ class LibraryController extends Zend_Controller_Action
if (isset($this->pl_sess->id) && $screen == "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "copy");
}
//Open a jPlayer window and play the audio clip.
$menu["play"] = array("name"=> "Play", "icon" => "big_play");
$menu["edit"] = array("name"=> "Edit Metadata", "icon" => "edit", "url" => "/library/edit-file-md/id/{$id}");
if ($user->isAdmin()) {
if ($user->isAdmin()) {
$menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/library/delete");
}
$url = $file->getRelativeFileUrl($baseUrl).'/download/true';
$menu["download"] = array("name" => "Download", "url" => $url);
$url = $file->getRelativeFileUrl($baseUrl).'/download/true';
$menu["download"] = array("name" => "Download", "url" => $url);
if (Application_Model_Preference::GetUploadToSoundcloudOption()) {

6
airtime_mvc/application/models/StoredFile.php
View file

@ -660,10 +660,8 @@ Logging::log("getting media! - 2");
//access to zend view methods to access url helpers is needed.
if($type == "au" && isset( $audioResults )) {
$audioFile = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION);
$row['image'] = '<a href="javascript:void(0);" class="big_play"
onclick="open_audio_preview(\''.$audioFile.'\', \'spl_'.$row['id'].'\');">
<span class="ui-icon ui-icon-play"></span></a>';
$row['audioFile'] = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION);
$row['image'] = '<span class="ui-icon ui-icon-play"></span>';
}
else {