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:
Martin Konecny 2012-07-30 21:48:25 -04:00
commit ab85ab59d9
11 changed files with 223 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

20
airtime_mvc/application/models/Playlist.php
View file

@ -320,23 +320,6 @@ EOT;
}
}
/*private function buildStreamEntry($p_item, $pos)
{
$stream = CcWebstreamQuery::create()->findPK($p_item, $this->con);
if (isset($stream)) {
$entry = $this->plItem;
$entry["id"] = $stream->getDbId();
$entry["pos"] = $pos;
$entry["cliplength"] = $stream->getDbLength();
$entry["cueout"] = $stream->getDbLength();
return $entry;
} else {
throw new Exception("trying to add a stream that does not exist.");
}
}*/
/*
* @param array $p_items
* an array of audioclips to add to the playlist
@ -612,7 +595,7 @@ EOT;
return array("fadeIn" => $fadeIn, "fadeOut" => $fadeOut);
}
public function setPlaylistfades($fadein, $fadeout)
public function setfades($fadein, $fadeout)
{
if (isset($fadein)) {
Logging::log("Setting playlist fade in {$fadein}");
@ -872,4 +855,3 @@ EOT;
class PlaylistNotFoundException extends Exception {}
class PlaylistNoPermissionException extends Exception {}
class PlaylistOutDatedException extends Exception {}
class PlaylistDyanmicException extends Exception {}