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

This commit is contained in:
Rudi Grinberg 2012-09-18 12:48:55 -04:00
commit 90d3494576
3 changed files with 5 additions and 47 deletions

View file

@ -39,7 +39,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
public function getLastModified($p_type)
{
return "modified";
return $this->webstream->getDbMtime();
}
public function getDefaultLength()
@ -215,15 +215,16 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
return true;
}
// TODO : properly implement this interface
// TODO : Fix this interface
public function setMetadata($key, $val)
{
throw new Exception("setMetadata is not imeplemented by WebStream yet");
//This function should not be defined in the interface.
throw new Exception("Not implemented.");
}
public function setName($name)
{
throw new Exception("setName is not imeplemented by WebStream yet");
$this->webstream->setDbName($name);
}
public function setLastPlayed($timestamp)
@ -243,8 +244,6 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
//TODO: What if invalid url?
$content = curl_exec($ch);
Logging::debug($content);
// close cURL resource, and free up system resources
curl_close($ch);