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

#899 GreenBox::moveAudioClipInPlaylist moves playlists too now.

Browse source
This commit is contained in:
tomas 2005-04-29 17:13:16 +00:00
parent 45e55e8571
commit 0e06ab3d53
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
livesupport/modules/storageServer/var/MetaData.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $
Version : $Revision: 1.31 $
Version : $Revision: 1.32 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/MetaData.php,v $
------------------------------------------------------------------------------*/
@ -784,7 +784,7 @@ class MetaData{
'namespace' => $predns,
'localPart' => $predicate,
'attributes'=> $attrs,
'content' => ($object == 'NULL' ? $children : $object),
'content' => (is_null($object) ? $children : $object),
), FALSE);
}else{
$node = array_merge(
@ -815,8 +815,7 @@ class MetaData{
if(DEBUG) echo" getSubrows:\n";
$qh = $this->dbc->query($q = "
SELECT
id, predxml, predns, predicate, objns,
coalesce(object, 'NULL')as object
id, predxml, predns, predicate, objns, object
FROM {$this->mdataTable}
WHERE
subjns='_I' AND subject='$parid' AND

22
livesupport/modules/storageServer/var/Playlist.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $
Version : $Revision: 1.13 $
Version : $Revision: 1.14 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/Playlist.php,v $
------------------------------------------------------------------------------*/
@ -465,12 +465,20 @@ class Playlist extends StoredFile{
$fadeIn = NULL;
$fadeOut = NULL;
foreach($el['children'] as $j=>$af){
if($af['elementname'] == 'audioClip'){
$acGunid = $af['attrs']['id'];
}elseif($af['elementname'] == 'fadeInfo'){
$fadeIn = $af['attrs']['fadeIn'];
$fadeOut = $af['attrs']['fadeOut'];
}else{
switch($af['elementname']){
case"audioClip":
case"playlist":
$acGunid = $af['attrs']['id'];
break;
case"fadeInfo":
$fadeIn = $af['attrs']['fadeIn'];
$fadeOut = $af['attrs']['fadeOut'];
break;
default:
return PEAR::raiseError(
"Playlist::moveAudioClip: unknown element type".
" in playlistElement ({$af['elementname']})"
);
}
}
$acId = $this->gb->_idFromGunid($acGunid);