From b8452928da9b456111ce6476a8eb112cd12292f9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 24 Feb 2012 18:24:24 -0500 Subject: [PATCH] CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) - updated player ui so it matches demo code - can play any song from the library or playlist builder, but not very usable --- .../controllers/PlaylistController.php | 32 +- airtime_mvc/application/models/StoredFile.php | 5 +- .../playlist/audio-preview-player.phtml | 33 + .../js/jplayer/skin/jplayer.blue.monday.css | 624 +++++++++++++++++- 4 files changed, 677 insertions(+), 17 deletions(-) create mode 100644 airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index a0911f636..b68a280ff 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -15,7 +15,7 @@ class PlaylistController extends Zend_Controller_Action ->addActionContext('new', 'json') ->addActionContext('edit', 'json') ->addActionContext('delete', 'json') - ->addActionContext('play', 'json') + ->addActionContext('play', 'json') ->addActionContext('set-playlist-fades', 'json') ->addActionContext('get-playlist-fades', 'json') ->addActionContext('set-playlist-name', 'json') @@ -112,10 +112,10 @@ 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/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'), 'text/javascript'); - $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview.js?'.filemtime($baseDir.'/js/airtime/library/preview.js'), 'text/javascript'); + $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); - $this->_helper->viewRenderer->setResponseSegment('spl'); + $this->_helper->viewRenderer->setResponseSegment('spl'); try { if (isset($this->pl_sess->id)) { @@ -199,18 +199,20 @@ class PlaylistController extends Zend_Controller_Action public function audioPreviewPlayerAction() { - Logging::log("PlaylistControler::in the play action"); - - $fileName = $this->_getParam('elementFilename'); - $playlistIndex = $this->_getParam('elemIndexString'); - - $request = $this->getRequest(); + Logging::log("PlaylistControler::in the play action"); + + $fileName = $this->_getParam('filename'); + $playlistIndex = $this->_getParam('index'); + + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); - - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'),'text/javascript'); + + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview_jplayer.js?'.filemtime($baseDir.'/js/airtime/library/preview_jplayer.js'),'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.filemtime($baseDir.'/js/jplayer/jquery.jplayer.min.js'),'text/javascript'); + //$this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.inspector.js?'.filemtime($baseDir.'/js/jplayer/jquery.jplayer.inspector.js'),'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.blue.monday.css')); - $this->_helper->layout->setLayout('bare'); + $this->_helper->layout->setLayout('audioPlayer'); $logo = Application_Model_Preference::GetStationLogo(); if($logo){ @@ -218,8 +220,8 @@ class PlaylistController extends Zend_Controller_Action } else { $this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png"; } - $this->view->fileName = $fileName; - $this->view->playlistIndex= $playlistIndex; + $this->view->fileName = $fileName; + $this->view->playlistIndex= $playlistIndex; } public function addItemsAction() diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 83a0bf068..fe9515ed2 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -395,6 +395,7 @@ class Application_Model_StoredFile { } private function constructGetFileUrl($p_serverName, $p_serverPort){ +Logging::log("getting media! - 2"); return "http://$p_serverName:$p_serverPort/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } @@ -404,6 +405,7 @@ class Application_Model_StoredFile { */ public function getRelativeFileUrl($baseUrl) { + Logging::log("getting media!"); return $baseUrl."/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } @@ -656,7 +658,8 @@ class Application_Model_StoredFile { if($type == "au") { $audioFile = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION); - $row['image'] = ''; + $row['image'] = ''; + } else { $row['image'] = ''; diff --git a/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml new file mode 100644 index 000000000..ab33c2eca --- /dev/null +++ b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml @@ -0,0 +1,33 @@ +
+ fileName" ?> + +