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

intro playlist scaffolding in place but needs refinement to get working

This commit is contained in:
Robbt 2019-01-20 19:20:13 -05:00
parent ae9f95c758
commit f9a5da2ba3
5 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/common/AutoPlaylistManager.php
View File

@ -33,12 +33,18 @@ class AutoPlaylistManager {
// call the addPlaylist to show function and don't check for user permission to avoid call to non-existant user object
$sid = $si->getShowId();
$playlistrepeat = new Application_Model_Show($sid);
$introplaylistid = Application_Model_Preference::GetIntroPlaylist();
Logging::info("intro");
Logging::info($introplaylistid);
Logging::info($playlistid);
Logging::info("outro");
$outroplaylistid = Application_Model_Preference::GetOutroPlaylist();
Logging::info($outroplaylistid);
if ($playlistrepeat->getAutoPlaylistRepeat()) {
$full = false;
while(!$full) {
$si = new Application_Model_ShowInstance($autoplaylist->getDbId());
$si->addPlaylistToShow($playlistid, false);
$ps = $si->getPercentScheduled();
//Logging::info("The total percent scheduled is % $ps");
if ($ps > 100) {
@ -49,6 +55,12 @@ class AutoPlaylistManager {
}
else {
$si->addPlaylistToShow($playlistid, false);
if ($introplaylistid != null) {
$si->addPlaylistToShowStart($introplaylistid, false);
}
if ($outroplaylistid != null) {
$si->addPlaylistToShow($outroplaylistid, false);
}
}
$si->setAutoPlaylistBuilt(true);

2
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -47,6 +47,8 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetDefaultFadeOut($values["stationDefaultFadeOut"]);
Application_Model_Preference::SetPodcastAlbumOverride($values["podcastAlbumOverride"]);
Application_Model_Preference::SetPodcastAutoSmartblock($values["podcastAutoSmartblock"]);
Application_Model_Preference::SetIntroPlaylist($values["introPlaylistSelect"]);
Application_Model_Preference::SetOutroPlaylist($values["outroPlaylistSelect"]);
Application_Model_Preference::SetAllow3rdPartyApi($values["thirdPartyApi"]);
Application_Model_Preference::SetAllowedCorsUrls($values["allowedCorsUrls"]);
Application_Model_Preference::SetDefaultLocale($values["locale"]);

4
airtime_mvc/application/forms/GeneralPreferences.php
View File

@ -105,13 +105,13 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$introPlaylistSelect = new Zend_Form_Element_Select("introPlaylistSelect");
$introPlaylistSelect->setLabel(_("Intro Autoloading Playlist"));
$introPlaylistSelect->setMultiOptions(Application_Model_Library::getPlaylistNames(true));
$introPlaylistSelect->setValue(null);
$introPlaylistSelect->setValue(Application_Model_Preference::GetIntroPlaylist());
$this->addElement($introPlaylistSelect);
$outroPlaylistSelect = new Zend_Form_Element_Select("outroPlaylistSelect");
$outroPlaylistSelect->setLabel(_("Outro Autoloading Playlist"));
$outroPlaylistSelect->setMultiOptions(Application_Model_Library::getPlaylistNames(true));
$outroPlaylistSelect->setValue(null);
$outroPlaylistSelect->setValue(Application_Model_Preference::GetOutroPlaylist());
$this->addElement($outroPlaylistSelect);

20
airtime_mvc/application/models/Preference.php
View File

@ -387,6 +387,26 @@ class Application_Model_Preference
return $val === '1' ? true : false;
}
public static function GetIntroPlaylist()
{
return self::getValue("intro_playlist");
}
public static function GetOutroPlaylist()
{
return self::getValue("outro_playlist");
}
public static function SetIntroPlaylist($playlist)
{
self::setValue("intro_playlist", $playlist);
}
public static function SetOutroPlaylist($playlist)
{
self::setValue("outro_playlist", $playlist);
}
public static function SetPhone($phone)
{

17
airtime_mvc/application/models/ShowInstance.php
View File

@ -244,7 +244,22 @@ SQL;
);
}
/**
* Add a playlist as the first item of the current show.
*
* @param int $plId
* Playlist ID.
*/
public function addPlaylistToShowStart($pl_id, $checkUserPerm = true)
{
$ts = intval($this->_showInstance->getDbLastScheduled("U")) ? : 0;
$id = $this->_showInstance->getDbId();
$scheduler = new Application_Model_Scheduler($checkUserPerm);
$scheduler->scheduleAfter(
array(array("id" => 0, "instance" => $id, "timestamp" => $ts)),
array(array("id" => $pl_id, "type" => "playlist"))
);
}
/**