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

Get rid of unneeded data copying ( = = someFunction()). Changing various function names to be more obvious and consistent.

This commit is contained in:
paul 2006-11-23 07:10:35 +00:00
parent 6a39d99bfd
commit ec3485fe52
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
campcaster/src/modules/storageServer/var/M3uPlaylist.php
View File

@ -85,14 +85,14 @@ class M3uPlaylist {
"M3uPlaylist::import: file doesn't exist ($aPath/$rPath)" "M3uPlaylist::import: file doesn't exist ($aPath/$rPath)"
); );
} }
$arr = $r = M3uPlaylist::parse($path); $arr = M3uPlaylist::parse($path);
if (PEAR::isError($r)) { if (PEAR::isError($arr)) {
return $r; return $arr;
} }
require_once("Playlist.php"); require_once("Playlist.php");
$pl = $r =& Playlist::create($gb, $plid, "imported_M3U", $parid); $pl =& Playlist::create($gb, $plid, "imported_M3U", $parid);
if (PEAR::isError($r)) { if (PEAR::isError($pl)) {
return $r; return $pl;
} }
$r = $pl->lock($gb, $subjid); $r = $pl->lock($gb, $subjid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
@ -102,12 +102,12 @@ class M3uPlaylist {
list($md, $uri) = preg_split("|\n|", $it); list($md, $uri) = preg_split("|\n|", $it);
list($length, $title) = preg_split("|, *|", $md); list($length, $title) = preg_split("|, *|", $md);
// $gunid = StoredFile::_createGunid(); // $gunid = StoredFile::_createGunid();
$gunid = ( isset($gunids[basename($uri)]) ? $gunids[basename($uri)] : NULL); $gunid = ( isset($gunids[basename($uri)]) ? $gunids[basename($uri)] : NULL);
$acId = $r = $gb->idFromGunid($gunid); $acId = $gb->idFromGunid($gunid);
if (PEAR::isError($r)) { if (PEAR::isError($acId)) {
return $r; return $acId;
} }
$length = Playlist::_secsToPlTime($length); $length = Playlist::secondsToPlaylistTime($length);
$offset = '???'; $offset = '???';
if (preg_match("|\.([a-zA-Z0-9]+)$|", $uri, $va)) { if (preg_match("|\.([a-zA-Z0-9]+)$|", $uri, $va)) {
switch (strtolower($ext = $va[1])) { switch (strtolower($ext = $va[1])) {
@ -115,9 +115,9 @@ class M3uPlaylist {
case "xml": case "xml":
case "smil": case "smil":
case "m3u": case "m3u":
$acId = $r = $gb->bsImportPlaylistRaw($parid, $gunid, $acId = $gb->bsImportPlaylistRaw($parid, $gunid,
$aPath, $uri, $ext, $gunids, $subjid); $aPath, $uri, $ext, $gunids, $subjid);
if (PEAR::isError($r)) { if (PEAR::isError($acId)) {
break; break;
} }
//no break! //no break!
@ -133,7 +133,7 @@ class M3uPlaylist {
} }
} }
} }
$r = $pl->unLock($gb); $r = $pl->unlock($gb);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
} }
@ -151,9 +151,9 @@ class M3uPlaylist {
*/ */
function convert2lspl(&$gb, $data) function convert2lspl(&$gb, $data)
{ {
$arr = $r = M3uPlaylist::parse($data); $arr = M3uPlaylist::parse($data);
if (PEAR::isError($r)) { if (PEAR::isError($arr)) {
return $r; return $arr;
} }
$ind = ''; $ind = '';
$ind2 = $ind.INDCH; $ind2 = $ind.INDCH;
@ -162,9 +162,9 @@ class M3uPlaylist {
foreach ($arr as $i => $it) { foreach ($arr as $i => $it) {
list($md, $uri) = preg_split("|\n|", $it); list($md, $uri) = preg_split("|\n|", $it);
list($length, $title) = preg_split("|, *|", $md); list($length, $title) = preg_split("|, *|", $md);
$gunid = StoredFile::_createGunid(); $gunid = StoredFile::_createGunid();
$gunid2 = StoredFile::_createGunid(); $gunid2 = StoredFile::_createGunid();
$length = Playlist::_secsToPlTime($length); $length = Playlist::secondsToPlaylistTime($length);
$offset = '???'; $offset = '???';
$uri_h = preg_replace("|--|", "&#2d;&#2d;", htmlspecialchars("$uri")); $uri_h = preg_replace("|--|", "&#2d;&#2d;", htmlspecialchars("$uri"));
if (preg_match("|\.([a-zA-Z0-9]+)$|", $uri, $va)) { if (preg_match("|\.([a-zA-Z0-9]+)$|", $uri, $va)) {
@ -221,10 +221,9 @@ class M3uPlaylistBodyElement {
$tree->children[1]->name $tree->children[1]->name
)); ));
} }
$res = $r = $res = M3uPlaylistParElement::convert2lspl($tree->children[0], $ind2);
M3uPlaylistParElement::convert2lspl($tree->children[0], $ind2); if (PEAR::isError($res)) {
if (PEAR::isError($r)) { return $res;
return $r;
} }
$gunid = StoredFile::_createGunid(); $gunid = StoredFile::_createGunid();
$playlength = '???'; // *** $playlength = '???'; // ***
@ -308,16 +307,16 @@ class M3uPlaylistAudioElement {
} }
} }
if ($fadeIn > 0 || $fadeOut > 0) { if ($fadeIn > 0 || $fadeOut > 0) {
$fadeIn = Playlist::_secsToPlTime($fadeIn); $fadeIn = Playlist::secondsToPlaylistTime($fadeIn);
$fadeOut = Playlist::_secsToPlTime($fadeOut); $fadeOut = Playlist::secondsToPlaylistTime($fadeOut);
$fInfo = "$ind2<fadeInfo fadeIn=\"$fadeIn\" fadeOut=\"$fadeOut\"/>\n"; $fInfo = "$ind2<fadeInfo fadeIn=\"$fadeIn\" fadeOut=\"$fadeOut\"/>\n";
} else { } else {
$fInfo = ''; $fInfo = '';
} }
$plElGunid = StoredFile::_createGunid(); $plElGunid = StoredFile::_createGunid();
$aGunid = StoredFile::_createGunid(); $aGunid = StoredFile::_createGunid();
$title = basename($tree->attrs['src']->val); $title = basename($tree->attrs['src']->val);
$offset = Playlist::_secsToPlTime($tree->attrs['begin']->val); $offset = Playlist::secondsToPlaylistTime($tree->attrs['begin']->val);
$playlength = '???'; # *** $playlength = '???'; # ***
$res = "$ind<playlistElement id=\"$plElGunid\" relativeOffset=\"$offset\">\n". $res = "$ind<playlistElement id=\"$plElGunid\" relativeOffset=\"$offset\">\n".
"$ind2<audioClip id=\"$aGunid\" playlength=\"$playlength\" title=\"$title\"/>\n". "$ind2<audioClip id=\"$aGunid\" playlength=\"$playlength\" title=\"$title\"/>\n".