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

Added public/private/static modifiers to functions. Changing various function names to be more obvious and consistent. Get rid of unneeded data copying ( = = someFunction()).

Browse source
This commit is contained in:
paul 2006-11-23 07:01:08 +00:00
parent 37657536be
commit ec562b0165
1 changed files with 87 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

147
campcaster/src/modules/storageServer/var/Playlist.php
View file

@ -28,7 +28,7 @@ class Playlist extends StoredFile {
* @return Playlist * @return Playlist
* instance of Playlist object * instance of Playlist object
*/ */
function &recallByGunid(&$gb, $gunid, $className='Playlist') public static function &recallByGunid(&$gb, $gunid, $className='Playlist')
{ {
return parent::recallByGunid($gb, $gunid, $className); return parent::recallByGunid($gb, $gunid, $className);
} }
@ -47,7 +47,7 @@ class Playlist extends StoredFile {
* @return Playlist * @return Playlist
* instance of Playlist object * instance of Playlist object
*/ */
function &recallByToken(&$gb, $token, $className='Playlist') public static function &recallByToken(&$gb, $token, $className='Playlist')
{ {
return parent::recallByToken($gb, $token, $className); return parent::recallByToken($gb, $token, $className);
} }
@ -75,7 +75,7 @@ class Playlist extends StoredFile {
* @return Playlist * @return Playlist
* instance of Playlist object * instance of Playlist object
*/ */
function &insert(&$gb, $oid, $fname, private static function &insert(&$gb, $oid, $fname,
$mediaFileLP='', $metadata='', $mdataLoc='file', $mediaFileLP='', $metadata='', $mdataLoc='file',
$plid=NULL, $ftype=NULL) $plid=NULL, $ftype=NULL)
{ {
@ -97,7 +97,7 @@ class Playlist extends StoredFile {
* local object id of parent folder * local object id of parent folder
* @return instance of Playlist object * @return instance of Playlist object
*/ */
function &create(&$gb, $plid, $fname=NULL, $parid=NULL) public function &create(&$gb, $plid, $fname=NULL, $parid=NULL)
{ {
$tmpFname = uniqid(''); $tmpFname = uniqid('');
$oid = $this->addObj($tmpFname , 'playlist', $parid); $oid = $this->addObj($tmpFname , 'playlist', $parid);
@ -145,7 +145,7 @@ class Playlist extends StoredFile {
* @return boolean * @return boolean
* previous state or error object * previous state or error object
*/ */
function lock(&$gb, $subjid=NULL, $val=TRUE) public function lock(&$gb, $subjid=NULL, $val=TRUE)
{ {
if ($val && $gb->isEdited($this->gunid) !== FALSE) { if ($val && $gb->isEdited($this->gunid) !== FALSE) {
return PEAR::raiseError( return PEAR::raiseError(
@ -165,7 +165,7 @@ class Playlist extends StoredFile {
* @return boolean * @return boolean
* previous state or error object * previous state or error object
*/ */
function unLock(&$gb) public function unlock(&$gb)
{ {
$r = $this->recalculateTimes(); $r = $this->recalculateTimes();
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
@ -186,10 +186,10 @@ class Playlist extends StoredFile {
* @return mixed * @return mixed
* true or error object * true or error object
*/ */
function setAuxMetadata() private function setAuxMetadata()
{ {
// get info about playlist // get info about playlist
$plInfo = $this->getPlInfo(); $plInfo = $this->getPlaylistInfo();
if (PEAR::isError($plInfo)) { if (PEAR::isError($plInfo)) {
return $plInfo; return $plInfo;
} }
@ -209,7 +209,7 @@ class Playlist extends StoredFile {
/** /**
* Get audioClip legth and title * Get audioClip length and title
* *
* @param int $acId * @param int $acId
* local id of audioClip inserted to playlist * local id of audioClip inserted to playlist
@ -221,7 +221,7 @@ class Playlist extends StoredFile {
* <li>elType string - audioClip | playlist</li> * <li>elType string - audioClip | playlist</li>
* </ul> * </ul>
*/ */
function getAcInfo($acId) private function getAudioClipInfo($acId)
{ {
$ac = StoredFile::recall($this->gb, $acId); $ac = StoredFile::recall($this->gb, $acId);
if (PEAR::isError($ac)) { if (PEAR::isError($ac)) {
@ -243,8 +243,9 @@ class Playlist extends StoredFile {
} }
if (isset($r[0]['value'])) { if (isset($r[0]['value'])) {
$acTit = $r[0]['value']; $acTit = $r[0]['value'];
} else {
$acTit = $acGunid;
} }
else $acTit = $acGunid;
$elType = $this->gb->getObjType($acId); $elType = $this->gb->getObjType($acId);
$trTbl = array('audioclip'=>'audioClip', 'webstream'=>'audioClip', $trTbl = array('audioclip'=>'audioClip', 'webstream'=>'audioClip',
'playlist'=>'playlist'); 'playlist'=>'playlist');
@ -266,7 +267,7 @@ class Playlist extends StoredFile {
* <li>metaParid int - metadata record id of metadata container</li> * <li>metaParid int - metadata record id of metadata container</li>
* </ul> * </ul>
*/ */
function getPlInfo() private function getPlaylistInfo()
{ {
$parid = $this->getContainer('playlist'); $parid = $this->getContainer('playlist');
if (PEAR::isError($parid)) { if (PEAR::isError($parid)) {
@ -315,7 +316,7 @@ class Playlist extends StoredFile {
* @return int * @return int
* metadata record id of container * metadata record id of container
*/ */
function getContainer($containerName, $parid=NULL, $insertIfNone=FALSE) private function getContainer($containerName, $parid=NULL, $insertIfNone=FALSE)
{ {
$r = $this->md->getMetadataEl($containerName, $parid); $r = $this->md->getMetadataEl($containerName, $parid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
@ -367,7 +368,7 @@ class Playlist extends StoredFile {
* <li>fadeOutId int - record id</li> * <li>fadeOutId int - record id</li>
* </ul> * </ul>
*/ */
function insertPlaylistElement($parid, $offset, $acGunid, $acLen, $acTit, private function insertPlaylistElement($parid, $offset, $acGunid, $acLen, $acTit,
$fadeIn=NULL, $fadeOut=NULL, $plElGunid=NULL, $elType='audioClip') $fadeIn=NULL, $fadeOut=NULL, $plElGunid=NULL, $elType='audioClip')
{ {
// insert playlistElement // insert playlistElement
@ -451,7 +452,7 @@ class Playlist extends StoredFile {
* @return int * @return int
* metadata record id * metadata record id
*/ */
function _getMidOrInsert($category, $parid, $value=NULL, $predxml='T') private function _getMidOrInsert($category, $parid, $value=NULL, $predxml='T')
{ {
$arr = $this->md->getMetadataEl($category, $parid); $arr = $this->md->getMetadataEl($category, $parid);
if (PEAR::isError($arr)) { if (PEAR::isError($arr)) {
@ -487,7 +488,7 @@ class Playlist extends StoredFile {
* 'A' | 'T' (attribute or tag) * 'A' | 'T' (attribute or tag)
* @return boolean * @return boolean
*/ */
function _setValueOrInsert($mid, $value, $parid, $category, $predxml='T') private function _setValueOrInsert($mid, $value, $parid, $category, $predxml='T')
{ {
if (is_null($mid)) { if (is_null($mid)) {
$r = $this->md->insertMetadataEl( $r = $this->md->insertMetadataEl(
@ -513,7 +514,7 @@ class Playlist extends StoredFile {
* metadata container record id * metadata container record id
* @return boolean * @return boolean
*/ */
function setPlaylistLength($newPlLen, $parid, $metaParid) private function setPlaylistLength($newPlLen, $parid, $metaParid)
{ {
$mid = $this->_getMidOrInsert('playlength', $parid, $newPlLen, 'A'); $mid = $this->_getMidOrInsert('playlength', $parid, $newPlLen, 'A');
if (PEAR::isError($mid)) { if (PEAR::isError($mid)) {
@ -553,12 +554,12 @@ class Playlist extends StoredFile {
* @return string * @return string
* generated playlistElement gunid * generated playlistElement gunid
*/ */
function addAudioClip($acId, $fadeIn=NULL, $fadeOut=NULL, $plElGunid=NULL, public function addAudioClip($acId, $fadeIn=NULL, $fadeOut=NULL, $plElGunid=NULL,
$length=NULL) $length=NULL)
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
// get information about audioClip // get information about audioClip
$acInfo = $this->getAcInfo($acId); $acInfo = $this->getAudioClipInfo($acId);
if (PEAR::isError($acInfo)) { if (PEAR::isError($acInfo)) {
return $acInfo; return $acInfo;
} }
@ -567,7 +568,7 @@ class Playlist extends StoredFile {
$acLen = $length; $acLen = $length;
} }
// get information about playlist and containers // get information about playlist and containers
$plInfo = $this->getPlInfo(); $plInfo = $this->getPlaylistInfo();
if (PEAR::isError($plInfo)) { if (PEAR::isError($plInfo)) {
return $plInfo; return $plInfo;
} }
@ -581,18 +582,7 @@ class Playlist extends StoredFile {
if (PEAR::isError($plElInfo)) { if (PEAR::isError($plElInfo)) {
return $plElInfo; return $plElInfo;
} }
extract($plElInfo); // 'plElId', 'plElGunid', 'fadeInId', 'fadeOutId' return $plElInfo['plElGunid'];
/* commented - maybe useless (C++ part doesn't do it)
// set access to audio clip:
$r = $this->bsAccess(NULL, '', $acGunid, 'access');
if(PEAR::isError($r)){ return $r; }
$acToken = $r['token'];
// insert token attribute:
$r = $this->md->insertMetadataEl($acId, 'accessToken', $acToken, 'A');
if(PEAR::isError($r)){ return $r; }
*/
return $plElGunid;
} }
@ -603,11 +593,11 @@ class Playlist extends StoredFile {
* global id of deleted playlistElement * global id of deleted playlistElement
* @return boolean * @return boolean
*/ */
function delAudioClip($plElGunid) public function delAudioClip($plElGunid)
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
// get information about playlist and containers // get information about playlist and containers
$plInfo = $this->getPlInfo(); $plInfo = $this->getPlaylistInfo();
if (PEAR::isError($plInfo)) { if (PEAR::isError($plInfo)) {
return $plInfo; return $plInfo;
} }
@ -636,21 +626,11 @@ class Playlist extends StoredFile {
return $acLenArr; return $acLenArr;
} }
$acLen = $acLenArr[0]['value']; $acLen = $acLenArr[0]['value'];
/*
$acTokArr = $this->md->getMetadataEl('accessToken', $storedAcMid);
if(PEAR::isError($acTokArr)){ return $acTokArr; }
$acToken = $acTokArr[0]['value'];
*/
// remove playlist element: // remove playlist element:
$r = $this->md->setMetadataEl($el['mid'], NULL); $r = $this->md->setMetadataEl($el['mid'], NULL);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
} }
/*
// release audioClip:
$r = $this->bsRelease($acToken, 'access');
if(PEAR::isError($r)){ return $r; }
*/
$found = TRUE; $found = TRUE;
} }
} }
@ -675,11 +655,11 @@ class Playlist extends StoredFile {
* new value in ss.ssssss or extent format * new value in ss.ssssss or extent format
* @return boolean * @return boolean
*/ */
function changeFadeInfo($plElGunid, $fadeIn, $fadeOut) public function changeFadeInfo($plElGunid, $fadeIn, $fadeOut)
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
// get information about playlist and containers // get information about playlist and containers
$plInfo = $this->getPlInfo(); $plInfo = $this->getPlaylistInfo();
if (PEAR::isError($plInfo)) { if (PEAR::isError($plInfo)) {
return $plInfo; return $plInfo;
} }
@ -742,7 +722,7 @@ class Playlist extends StoredFile {
* new position in playlist * new position in playlist
* @return mixed * @return mixed
*/ */
function moveAudioClip($plElGunid, $newPos) public function moveAudioClip($plElGunid, $newPos)
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
$arr = $this->md->genPhpArray(); $arr = $this->md->genPhpArray();
@ -816,11 +796,11 @@ class Playlist extends StoredFile {
* *
* @return boolean * @return boolean
*/ */
function recalculateTimes() public function recalculateTimes()
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
// get information about playlist and containers // get information about playlist and containers
$plInfo = $this->getPlInfo(); $plInfo = $this->getPlaylistInfo();
if (PEAR::isError($plInfo)) { if (PEAR::isError($plInfo)) {
return $plInfo; return $plInfo;
} }
@ -887,7 +867,7 @@ class Playlist extends StoredFile {
$fadeIn = '00:00:00.000000'; $fadeIn = '00:00:00.000000';
$fadeOut = '00:00:00.000000'; $fadeOut = '00:00:00.000000';
} }
$fadeInS = $this->_plTimeToSecs($fadeIn); $fadeInS = Playlist::playlistTimeToSeconds($fadeIn);
if (!is_null($lastLenS)) { if (!is_null($lastLenS)) {
if ($lastLenS < $fadeInS) { if ($lastLenS < $fadeInS) {
return PEAR::raiseError( return PEAR::raiseError(
@ -901,13 +881,12 @@ class Playlist extends StoredFile {
if ($len > 0) { if ($len > 0) {
$len = $len - $fadeInS; $len = $len - $fadeInS;
} }
$newOffset = $this->_secsToPlTime($len); $newOffset = Playlist::secondsToPlaylistTime($len);
$r = $this->_setValueOrInsert($offsetId, $newOffset, $elId, 'relativeOffset'); $r = $this->_setValueOrInsert($offsetId, $newOffset, $elId, 'relativeOffset');
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
} }
// $fadeInS = $this->_plTimeToSecs($fadeIn); $acLenS = Playlist::playlistTimeToSeconds($acLen);
$acLenS = $this->_plTimeToSecs($acLen);
$len = $len + $acLenS; $len = $len + $acLenS;
if (!is_null($prevFiMid)) { if (!is_null($prevFiMid)) {
$foMid = $this->_getMidOrInsert('fadeOut', $prevFiMid, $fadeIn, 'A'); $foMid = $this->_getMidOrInsert('fadeOut', $prevFiMid, $fadeIn, 'A');
@ -923,7 +902,7 @@ class Playlist extends StoredFile {
$prevFiMid = $fiMid; $prevFiMid = $fiMid;
$lastLenS = $acLenS; $lastLenS = $acLenS;
} }
$newPlLen = $this->_secsToPlTime($len); $newPlLen = Playlist::secondsToPlaylistTime($len);
$r = $this->setPlaylistLength($newPlLen, $parid, $metaParid); $r = $this->setPlaylistLength($newPlLen, $parid, $metaParid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
@ -947,9 +926,9 @@ class Playlist extends StoredFile {
* <li>duration string, total playlength of clip </li> * <li>duration string, total playlength of clip </li>
* </ul> * </ul>
*/ */
function displayPlaylistClipAtOffset($offset, $distance=0) public function displayPlaylistClipAtOffset($offset, $distance=0)
{ {
$offsetS = $this->_plTimeToSecs($offset); $offsetS = Playlist::playlistTimeToSeconds($offset);
$plGunid = $this->gunid; $plGunid = $this->gunid;
$arr = $this->md->genPhpArray(); $arr = $this->md->genPhpArray();
if (PEAR::isError($arr)) { if (PEAR::isError($arr)) {
@ -986,7 +965,7 @@ class Playlist extends StoredFile {
if ($dd > 0) { if ($dd > 0) {
$offsetLoc = "00:00:00.000000"; $offsetLoc = "00:00:00.000000";
} else { } else {
$offsetLoc = $this->_secsToPlTime($offsetS - $elOffsetS); $offsetLoc = Playlist::secondsToPlaylistTime($offsetS - $elOffsetS);
} }
$distanceLoc = $distance - $dd; $distanceLoc = $distance - $dd;
$res2 = $pl->displayPlaylistClipAtOffset($offsetLoc, $distanceLoc); $res2 = $pl->displayPlaylistClipAtOffset($offsetLoc, $distanceLoc);
@ -1006,9 +985,9 @@ class Playlist extends StoredFile {
} }
$remainS = $acLenS - $playedS; $remainS = $acLenS - $playedS;
$res = array('gunid'=>$acGunid, $res = array('gunid'=>$acGunid,
'elapsed' => $this->_secsToPlTime($playedS), 'elapsed' => Playlist::secondsToPlaylistTime($playedS),
'remaining' => $this->_secsToPlTime($remainS), 'remaining' => Playlist::secondsToPlaylistTime($remainS),
'duration' => $this->_secsToPlTime($acLenS), 'duration' => Playlist::secondsToPlaylistTime($acLenS),
); );
return $res; return $res;
} }
@ -1030,7 +1009,7 @@ class Playlist extends StoredFile {
* gunid - global id * gunid - global id
* type - playlist | audioClip * type - playlist | audioClip
*/ */
function export() public function export()
{ {
$plGunid = $this->gunid; $plGunid = $this->gunid;
$arr = $this->md->genPhpArray(); $arr = $this->md->genPhpArray();
@ -1083,7 +1062,7 @@ class Playlist extends StoredFile {
* @return int * @return int
* seconds * seconds
*/ */
function _plTimeToSecs($plt) public static function playlistTimeToSeconds($plt)
{ {
$arr = split(':', $plt); $arr = split(':', $plt);
if (isset($arr[2])) { if (isset($arr[2])) {
@ -1104,7 +1083,7 @@ class Playlist extends StoredFile {
* @return string * @return string
* time in playlist time format (HH:mm:ss.dddddd) * time in playlist time format (HH:mm:ss.dddddd)
*/ */
function _secsToPlTime($s0) public static function secondsToPlaylistTime($s0)
{ {
$m = intval($s0 / 60); $m = intval($s0 / 60);
$r0 = $s0 - $m*60; $r0 = $s0 - $m*60;
@ -1112,7 +1091,6 @@ class Playlist extends StoredFile {
$m = $m % 60; $m = $m % 60;
$s = intval($r0); $s = intval($r0);
$r = $r0 - $s; $r = $r0 - $s;
// $res = sprintf("%02d:%02d:%09.6f", $h, $m, $r);
$res = sprintf("%02d:%02d:%02d", $h, $m, $s); $res = sprintf("%02d:%02d:%02d", $h, $m, $s);
$res .= str_replace('0.', '.', number_format($r, 6, '.', '')); $res .= str_replace('0.', '.', number_format($r, 6, '.', ''));
return $res; return $res;
@ -1122,10 +1100,12 @@ class Playlist extends StoredFile {
/** /**
* Cyclic-recursion checking * Cyclic-recursion checking
* *
* @param string $insGunid, gunid of playlist beeing inserted * @param string $insGunid
* @return boolean - true if recursion is detected * gunid of playlist being inserted
* @return boolean
* true if recursion is detected
*/ */
function _cyclicRecursion($insGunid) public function cyclicRecursion($insGunid)
{ {
if ($this->gunid == $insGunid) { if ($this->gunid == $insGunid) {
return TRUE; return TRUE;
@ -1151,7 +1131,7 @@ class Playlist extends StoredFile {
continue; continue;
} }
$nextGunid = $elCh['attrs']['id']; $nextGunid = $elCh['attrs']['id'];
$res = $this->_cyclicRecursion($nextGunid); $res = $this->cyclicRecursion($nextGunid);
if ($res) { if ($res) {
return TRUE; return TRUE;
} }
@ -1175,22 +1155,25 @@ class PlaylistElement {
private $pl = NULL; private $pl = NULL;
private $plEl = NULL; private $plEl = NULL;
function PlaylistElement(&$pl, $plEl) public function PlaylistElement(&$pl, $plEl)
{ {
$this->pl = $pl; $this->pl = $pl;
$this->plEl = $plEl; $this->plEl = $plEl;
} }
function analyze() public function analyze()
{ {
$plInfo = array( $plInfo = array(
'acLen' => '00:00:00.000000', 'acLenS' => 0, 'acLen' => '00:00:00.000000',
'fadeIn' => '00:00:00.000000', 'fadeInS' => 0, 'acLenS' => 0,
'fadeOut' => '00:00:00.000000', 'fadeOutS' => 0, 'fadeIn' => '00:00:00.000000',
'fadeInS' => 0,
'fadeOut' => '00:00:00.000000',
'fadeOutS' => 0,
); );
$plInfo['elOffset'] = $pom = $this->plEl['attrs']['relativeOffset']; $plInfo['elOffset'] = $this->plEl['attrs']['relativeOffset'];
$plInfo['elOffsetS'] = $this->pl->_plTimeToSecs($pom); $plInfo['elOffsetS'] = Playlist::playlistTimeToSeconds($plInfo['elOffset']);
// cycle over tags inside playlistElement // cycle over tags inside playlistElement
foreach ($this->plEl['children'] as $j => $acFi) { foreach ($this->plEl['children'] as $j => $acFi) {
switch ($acFi['elementname']) { switch ($acFi['elementname']) {
@ -1204,15 +1187,15 @@ class PlaylistElement {
switch ($acFi['elementname']) { switch ($acFi['elementname']) {
case "playlist": case "playlist":
case "audioClip": case "audioClip":
$plInfo['acLen'] = $pom = $acFi['attrs']['playlength']; $plInfo['acLen'] = $acFi['attrs']['playlength'];
$plInfo['acLenS'] = $this->pl->_plTimeToSecs($pom); $plInfo['acLenS'] = Playlist::playlistTimeToSeconds($plInfo['acLen']);
$plInfo['acGunid'] = $pom = $acFi['attrs']['id']; $plInfo['acGunid'] = $acFi['attrs']['id'];
break; break;
case "fadeInfo": case "fadeInfo":
$plInfo['fadeIn'] = $pom = $acFi['attrs']['fadeIn']; $plInfo['fadeIn'] = $acFi['attrs']['fadeIn'];
$plInfo['fadeInS'] = $this->pl->_plTimeToSecs($pom); $plInfo['fadeInS'] = Playlist::playlistTimeToSeconds($plInfo['fadeIn']);
$plInfo['fadeOut'] = $pom = $acFi['attrs']['fadeOut']; $plInfo['fadeOut'] = $acFi['attrs']['fadeOut'];
$plInfo['fadeOutS'] = $this->pl->_plTimeToSecs($pom); $plInfo['fadeOutS'] = Playlist::playlistTimeToSeconds($plInfo['fadeOut']);
break; break;
} }
} }