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

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

Browse source
This commit is contained in:
James 2011-08-03 14:42:55 -04:00
commit 29ccd99332
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View file

@ -28,6 +28,7 @@ define('MDATA_KEY_YEAR', 'year');
define('MDATA_KEY_BPM', 'bpm'); define('MDATA_KEY_BPM', 'bpm');
define('MDATA_KEY_TRACKNUMBER', 'track_number'); define('MDATA_KEY_TRACKNUMBER', 'track_number');
define('MDATA_KEY_CONDUCTOR', 'conductor'); define('MDATA_KEY_CONDUCTOR', 'conductor');
define('MDATA_KEY_LANGUAGE', 'language');
define('UI_MDATA_VALUE_FORMAT_FILE', 'File'); define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream'); define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');

15
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -101,34 +101,41 @@ class Application_Form_EditAudioMD extends Zend_Form
'filters' => array('StringTrim') 'filters' => array('StringTrim')
)); ));
// Add mood field // Add bmp field
$this->addElement('text', 'bpm', array( $this->addElement('text', 'bpm', array(
'label' => 'BPM:', 'label' => 'BPM:',
'class' => 'input_text', 'class' => 'input_text',
'filters' => array('StringTrim') 'filters' => array('StringTrim')
)); ));
// Add mood field // Add copyright field
$this->addElement('text', 'copyright', array( $this->addElement('text', 'copyright', array(
'label' => 'Copyright:', 'label' => 'Copyright:',
'class' => 'input_text', 'class' => 'input_text',
'filters' => array('StringTrim') 'filters' => array('StringTrim')
)); ));
// Add mood field // Add isrc number field
$this->addElement('text', 'isrc_number', array( $this->addElement('text', 'isrc_number', array(
'label' => 'ISRC Number:', 'label' => 'ISRC Number:',
'class' => 'input_text', 'class' => 'input_text',
'filters' => array('StringTrim') 'filters' => array('StringTrim')
)); ));
// Add mood field // Add website field
$this->addElement('text', 'info_url', array( $this->addElement('text', 'info_url', array(
'label' => 'Website:', 'label' => 'Website:',
'class' => 'input_text', 'class' => 'input_text',
'filters' => array('StringTrim') 'filters' => array('StringTrim')
)); ));
// Add language field
$this->addElement('text', 'language', array(
'label' => 'Language:',
'class' => 'input_text',
'filters' => array('StringTrim')
));
// Add the submit button // Add the submit button
$this->addElement('submit', 'submit', array( $this->addElement('submit', 'submit', array(
'ignore' => true, 'ignore' => true,

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

@ -40,7 +40,8 @@ class StoredFile {
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"mime" => "DbMime", "mime" => "DbMime",
"md5" => "DbMd5", "md5" => "DbMd5",
"ftype" => "DbFtype" "ftype" => "DbFtype",
"language" => "DbLanguage"
); );
public function __construct() public function __construct()
@ -819,7 +820,7 @@ class StoredFile {
$r = @copy($audio_file, $audio_stor);*/ $r = @copy($audio_file, $audio_stor);*/
} }
public static function copyFileToStor($p_targetDir, $fileName){ public static function copyFileToStor($p_targetDir, $fileName){
$audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName; $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
@ -834,7 +835,7 @@ class StoredFile {
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
} }
} }
$storDir = MusicDir::getStorDir(); $storDir = MusicDir::getStorDir();
$stor = $storDir->getDirectory(); $stor = $storDir->getDirectory();