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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
This commit is contained in:
naomiaro 2011-01-06 01:05:34 -05:00
commit d9e8e1641a
76 changed files with 238 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/models/StoredFile.php
View file

@ -312,14 +312,14 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
/**
* StoredFile class
*
* Campcaster file storage support class.<br>
* Airtime file storage support class.<br>
* Represents one virtual file in storage. Virtual file has up to two parts:
* <ul>
* <li>metadata in database - represented by MetaData class</li>
* <li>binary media data in real file</li>
* </ul>
*
* @package Campcaster
* @package Airtime
* @subpackage StorageServer
* @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt