summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-26 03:42:15 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-26 03:42:48 +0100
commit0b19af5e10ea83400e114c8b2d4252fb8d50cc33 (patch)
tree85c1caa0afa7d978901f71821c0fa556a0a9e8b2 /apps
parentfe0832746b8b084f36706e296896a3a7e56e98cb (diff)
downloadnextcloud-server-0b19af5e10ea83400e114c8b2d4252fb8d50cc33.tar.gz
nextcloud-server-0b19af5e10ea83400e114c8b2d4252fb8d50cc33.zip
application/ogg is music to
Diffstat (limited to 'apps')
-rw-r--r--apps/media/ajax/api.php5
-rw-r--r--apps/media/lib_scanner.php2
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){