From 42164406703ee48de8e7e0db46d264176c4017a9 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 17 Aug 2012 16:51:23 -0400
Subject: [PATCH] CC-1665: Scheduled stream rebroadcasting and recording

-previewing streams have NaN:NaN:NaN as length
---
 airtime_mvc/application/controllers/AudiopreviewController.php  | 1 +
 .../application/views/scripts/audiopreview/audio-preview.phtml  | 2 +-
 airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js   | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index 320921444..736a39b87 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -66,6 +66,7 @@ class AudiopreviewController extends Zend_Controller_Action
         $this->view->audioFileID = $audioFileID;
         $this->view->audioFileArtist = $audioFileArtist;
         $this->view->audioFileTitle = $audioFileTitle;
+        $this->view->type = $type;
 
         $this->_helper->viewRenderer->setRender('audio-preview');
     }
diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index 9cc956a4e..3404cf6e1 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -42,7 +42,7 @@
                 </div>
                 <div class="jp-time-holder">
                     <div class="jp-current-time"></div>
-                    <div class="jp-duration"></div>
+<?php if ($this->type == "audioclip"): ?><div class="jp-duration"></div> <?php endif;?>
                 </div>
             </div>
             <div class="jp-volume-block">
diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
index ad697a05f..2964dbe63 100644
--- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
+++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
@@ -206,7 +206,6 @@ function playOne(uri, mime) {
 
     _playlist_jplayer.option("autoPlay", true);
     playlist[0] = media;
-    //_playlist_jplayer.setPlaylist(playlist); --if I use this the player will call _init on the setPlaylist and on the ready
     _playlist_jplayer._initPlaylist(playlist);
     _playlist_jplayer.play(0);