summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheTroll <trolldev@gmail.com>2010-02-24 23:11:52 +0100
committerTheTroll <trolldev@gmail.com>2010-02-24 23:11:52 +0100
commit8b5cae4e61249e671cca45cd1d37ee56d8dc543c (patch)
treedb7a3f6eecc6d407e751564f5018326c8d726d01
parent3d72b276b17a920a3f319afd2aec44d7bdf7a40e (diff)
downloadistreamdev-8b5cae4e61249e671cca45cd1d37ee56d8dc543c.tar.gz
istreamdev-8b5cae4e61249e671cca45cd1d37ee56d8dc543c.tar.bz2
Support wav and aac
Fixed dirs containing &
-rwxr-xr-xincludes/inc_audio.php4
-rwxr-xr-xincludes/inc_files.php2
-rw-r--r--playlist/dummy.txt0
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/inc_audio.php b/includes/inc_audio.php
index 458689f..85d3d64 100755
--- a/includes/inc_audio.php
+++ b/includes/inc_audio.php
@@ -36,8 +36,8 @@ if ($medianame_array[0])
// Alphabetical sorting
sort($medianame_array);
- exec('rm playlist/*.mp3');
- exec('ln -s ' .addcslashes(quotemeta($mediapath .$subdir), " ") .'*.mp3 playlist');
+ exec('rm playlist/*');
+ exec('ln -s ' .addcslashes(quotemeta($mediapath .$subdir), " &") .'* playlist');
$count = count($medianame_array);
diff --git a/includes/inc_files.php b/includes/inc_files.php
index 7a6f5a8..0a48aeb 100755
--- a/includes/inc_files.php
+++ b/includes/inc_files.php
@@ -1,6 +1,6 @@
<?php
-$audiotypes='mp3 aac';
+$audiotypes='mp3 aac wav';
function mediagetinfostream($stream = "")
{
diff --git a/playlist/dummy.txt b/playlist/dummy.txt
deleted file mode 100644
index e69de29..0000000
--- a/playlist/dummy.txt
+++ /dev/null