Fixed webstream previewing
This commit is contained in:
parent
7d534d1cda
commit
3885abbdb8
|
@ -47,10 +47,15 @@ class AudiopreviewController extends Zend_Controller_Action
|
||||||
$media = Application_Model_StoredFile::RecallById($audioFileID);
|
$media = Application_Model_StoredFile::RecallById($audioFileID);
|
||||||
$uri = $baseUrl."api/get-media/file/".$audioFileID;
|
$uri = $baseUrl."api/get-media/file/".$audioFileID;
|
||||||
$mime = $media->getPropelOrm()->getDbMime();
|
$mime = $media->getPropelOrm()->getDbMime();
|
||||||
|
$this->view->audioFileArtist = htmlspecialchars($media->getPropelOrm()->getDbArtistName());
|
||||||
|
$this->view->audioFileTitle = htmlspecialchars($media->getPropelOrm()->getDbTrackTitle());
|
||||||
|
|
||||||
} elseif ($type == "stream") {
|
} elseif ($type == "stream") {
|
||||||
$webstream = CcWebstreamQuery::create()->findPk($audioFileID);
|
$webstream = CcWebstreamQuery::create()->findPk($audioFileID);
|
||||||
$uri = $webstream->getDbUrl();
|
$uri = $webstream->getDbUrl();
|
||||||
$mime = $webstream->getDbMime();
|
$mime = $webstream->getDbMime();
|
||||||
|
$this->view->audioFileTitle = htmlspecialchars($webstream->getDbName());
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
throw new Exception("Unknown type for audio preview!.Type=$type");
|
throw new Exception("Unknown type for audio preview!.Type=$type");
|
||||||
}
|
}
|
||||||
|
@ -59,8 +64,6 @@ class AudiopreviewController extends Zend_Controller_Action
|
||||||
$this->view->mime = $mime;
|
$this->view->mime = $mime;
|
||||||
$this->view->audioFileID = $audioFileID;
|
$this->view->audioFileID = $audioFileID;
|
||||||
|
|
||||||
$this->view->audioFileArtist = htmlspecialchars($media->getPropelOrm()->getDbArtistName());
|
|
||||||
$this->view->audioFileTitle = htmlspecialchars($media->getPropelOrm()->getDbTrackTitle());
|
|
||||||
$this->view->type = $type;
|
$this->view->type = $type;
|
||||||
|
|
||||||
$this->_helper->viewRenderer->setRender('audio-preview');
|
$this->_helper->viewRenderer->setRender('audio-preview');
|
||||||
|
|
Loading…
Reference in New Issue