diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
| commit | d4d09b06f80462394983fe04d291a0345dd57280 (patch) | |
| tree | e4452055533c7ec7bb6fa49ac7f6b5c93ba8c4f7 /apps/media | |
| parent | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (diff) | |
| parent | 3d0d47957e65a72e17d33a924c9c4efcd5088ed2 (diff) | |
| download | nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.tar.gz nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.zip | |
merge master into encryption
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/ajax/api.php | 5 | ||||
| -rw-r--r-- | apps/media/lib_scanner.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index bb4502690b5..9d9c14deb17 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -120,7 +120,10 @@ if($arguments['action']){ OC_Filesystem::readfile($arguments['path']); exit; case 'find_music': - OC_JSON::encodedPrint(OC_FileCache::searchByMime('audio')); + $music=OC_FileCache::searchByMime('audio'); + $ogg=OC_FileCache::searchByMime('application','ogg'); + $music=array_merge($music,$ogg); + OC_JSON::encodedPrint($music); exit; } } diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index ea594ee8e3c..39658b27ba9 100644 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -38,6 +38,8 @@ class OC_MEDIA_SCANNER{ */ public static function scanCollection($eventSource=null){ $music=OC_FileCache::searchByMime('audio'); + $ogg=OC_FileCache::searchByMime('application','ogg'); + $music=array_merge($music,$ogg); $eventSource->send('count',count($music)); $songs=0; foreach($music as $file){ |