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

CC-84: Smart Playlists

Browse source 
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
This commit is contained in:
denise 2012-08-02 11:52:11 -04:00
parent 3b5a3e6713
commit 997b5c31c3
3 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
airtime_mvc/application/models/Block.php
View file

@ -266,7 +266,7 @@ EOT;
if ($modifier == "minutes") {
$timestamp = "00:".$value.":00";
} else if ($modifier == "hours") {
$timestamp = $value."00:00";
$timestamp = $value.":00:00.0";
}
$formatter = new LengthFormatter($timestamp);
$length = "~".$formatter->format();
@ -388,9 +388,14 @@ EOT;
foreach ($p_items as $ac) {
Logging::log("Adding audio file {$ac}");
$res = $this->insertBlockElement($this->buildEntry($ac, $pos));
$pos = $pos + 1;
if (is_array($ac) && $ac[1] == 'audioclip') {
$res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));
$pos = $pos + 1;
} elseif (!is_array($ac)) {
$res = $this->insertBlockElement($this->buildEntry($ac, $pos));
$pos = $pos + 1;
}
}
//reset the positions of the remaining items.