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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Rudi Grinberg 2012-09-14 17:01:45 -04:00
parent 81dadb7f85 4ea3d86121
commit 67483f8bb2
5 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/Bootstrap.php
View File

@ -13,6 +13,11 @@ require_once "Database.php";
require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
date_default_timezone_set('UTC');
require_once (APPLICATION_PATH."/logging/Logging.php");
Logging::setLogPath('/var/log/airtime/zendphp.log');
date_default_timezone_set(Application_Model_Preference::GetTimezone()); date_default_timezone_set(Application_Model_Preference::GetTimezone());
global $CC_CONFIG; global $CC_CONFIG;

31
airtime_mvc/application/controllers/AudiopreviewController.php
View File

@ -197,16 +197,20 @@ class AudiopreviewController extends Zend_Controller_Action
$elementMap['type'] = $track['type']; $elementMap['type'] = $track['type'];
if ($track['type'] == 0) { if ($track['type'] == 0) {
$fileExtension = pathinfo($track['path'], PATHINFO_EXTENSION); $mime = $track['mime'];
//type is file //type is file
//TODO: use MIME type for this if (strtolower($mime) === 'audio/mp3') {
if (strtolower($fileExtension) === 'mp3') {
$elementMap['element_mp3'] = $track['item_id']; $elementMap['element_mp3'] = $track['item_id'];
} elseif (strtolower($fileExtension) === 'ogg') { } elseif (strtolower($mime) === 'audio/ogg') {
$elementMap['element_oga'] = $track['item_id']; $elementMap['element_oga'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/mp4') {
$elementMap['element_m4a'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/wav') {
$elementMap['element_wav'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/x-flac') {
$elementMap['element_flac'] = $track['item_id'];
} else { } else {
//the media was neither mp3 or ogg throw new Exception("Unknown file type: $mime");
throw new Exception("Unknown file type");
} }
$elementMap['uri'] = "/api/get-media/file/".$track['item_id']; $elementMap['uri'] = "/api/get-media/file/".$track['item_id'];
@ -278,14 +282,19 @@ class AudiopreviewController extends Zend_Controller_Action
$elementMap['type'] = $track['type']; $elementMap['type'] = $track['type'];
if ($track['type'] == 0) { if ($track['type'] == 0) {
$fileExtension = pathinfo($track['filepath'], PATHINFO_EXTENSION); $mime = $track['mime'];
if (strtolower($fileExtension) === 'mp3') { if (strtolower($mime) === 'audio/mp3') {
$elementMap['element_mp3'] = $track['item_id']; $elementMap['element_mp3'] = $track['item_id'];
} elseif (strtolower($fileExtension) === 'ogg') { } elseif (strtolower($mime) === 'audio/ogg') {
$elementMap['element_oga'] = $track['item_id']; $elementMap['element_oga'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/mp4') {
$elementMap['element_m4a'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/wav') {
$elementMap['element_wav'] = $track['item_id'];
} elseif (strtolower($mime) === 'audio/x-flac') {
$elementMap['element_flac'] = $track['item_id'];
} else { } else {
//the media was neither mp3 or ogg throw new Exception("Unknown file type: $mime");
throw new Exception("Unknown file type");
} }
$elementMap['uri'] = "/api/get-media/file/".$track['item_id']; $elementMap['uri'] = "/api/get-media/file/".$track['item_id'];

5
airtime_mvc/application/models/Preference.php
View File

@ -93,10 +93,9 @@ class Application_Model_Preference
} }
$result = $con->query($sql)->fetchColumn(0); $result = $con->query($sql)->fetchColumn(0);
//$result = Application_Common_Database::prepareAndExecute($sql, $paramMap, 'column'); //$result = Application_Common_Database::prepareAndExecute($sql, $paramMap, 'column');
if ($result == 0) if ($result == 0) {
return ""; return "";
else { } else {
$sql = "SELECT valstr FROM cc_pref" $sql = "SELECT valstr FROM cc_pref"
." WHERE keystr = '$key'"; ." WHERE keystr = '$key'";
/*." WHERE keystr = :key"; /*." WHERE keystr = :key";

1
airtime_mvc/public/index.php
View File

@ -51,7 +51,6 @@ $application = new Zend_Application(
APPLICATION_PATH . '/configs/application.ini' APPLICATION_PATH . '/configs/application.ini'
); );
date_default_timezone_set('UTC');
require_once (APPLICATION_PATH."/logging/Logging.php"); require_once (APPLICATION_PATH."/logging/Logging.php");
Logging::setLogPath('/var/log/airtime/zendphp.log'); Logging::setLogPath('/var/log/airtime/zendphp.log');

12
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
View File

@ -136,7 +136,17 @@ function buildplaylist(p_url, p_playIndex) {
artist: data[index]['element_artist'], artist: data[index]['element_artist'],
oga:data[index]['uri'] oga:data[index]['uri']
}; };
} } else if (data[index]['element_m4a'] != undefined) {
media = {title: data[index]['element_title'],
artist: data[index]['element_artist'],
m4a:data[index]['uri']
};
} else if (data[index]['element_wav'] != undefined) {
media = {title: data[index]['element_title'],
artist: data[index]['element_artist'],
wav:data[index]['uri']
};
}
} else if (data[index]['type'] == 1) { } else if (data[index]['type'] == 1) {
media = {title: data[index]['element_title'], media = {title: data[index]['element_title'],
artist: data[index]['element_artist'], artist: data[index]['element_artist'],