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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-14 16:38:33 -04:00
parent 8ffaaaef25 b61abe2474
commit ee98c8fba5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/controllers/LibraryController.php
View File

@ -90,9 +90,9 @@ class LibraryController extends Zend_Controller_Action
protected function playlistNotFound($p_type) protected function playlistNotFound($p_type)
{ {
$this->view->error = "{$p_type} not found"; $this->view->error = "$p_type not found";
Logging::info("{$p_type} not found"); Logging::info("$p_type not found");
Application_Model_Library::changePlaylist(null, $p_type); Application_Model_Library::changePlaylist(null, $p_type);
$this->createFullResponse(null); $this->createFullResponse(null);
} }

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

@ -109,7 +109,7 @@ class UserController extends Zend_Controller_Action
# TODO : remove this. we only use default for now not to break the UI. # TODO : remove this. we only use default for now not to break the UI.
if (!$files_action) { # set default action if (!$files_action) { # set default action
$files_action = "reassign_to"; $files_action = "reassign_to";
$valid_actions = $delId = 1;
} }
# only delete when valid action is selected for the owned files # only delete when valid action is selected for the owned files

8
airtime_mvc/application/models/Webstream.php
View File

@ -78,11 +78,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
$username = $subjs->getDbLogin(); $username = $subjs->getDbLogin();
return array( return array(
"name" => $this->webstream->getDbName(), "name" => $this->webstream->getDbName(),
"length" => $this->webstream->getDbLength(), "length" => $this->webstream->getDbLength(),
"description" => $this->webstream->getDbDescription(), "description" => $this->webstream->getDbDescription(),
"login"=> $username, "login" => $username,
"url" => $this->webstream->getDbUrl(), "url" => $this->webstream->getDbUrl(),
); );
} }

2
python_apps/media-monitor2/media/monitor/metadata.py
View File

@ -51,7 +51,7 @@ class FakeMutagen(dict):
FakeInfo = namedtuple('FakeInfo','length bitrate') FakeInfo = namedtuple('FakeInfo','length bitrate')
def __init__(self,path): def __init__(self,path):
self.path = path self.path = path
self.mime = [] self.mime = ['audio/wav']
self.info = FakeMutagen.FakeInfo(0.0, '') self.info = FakeMutagen.FakeInfo(0.0, '')
dict.__init__(self) dict.__init__(self)
def set_length(self,l): def set_length(self,l):