diff options
| author | Alib <aliboba@free.fr> | 2010-03-16 01:28:39 +0100 |
|---|---|---|
| committer | Alib <aliboba@free.fr> | 2010-03-16 01:28:39 +0100 |
| commit | d1f8c381b7aabba27d261274548fa5b51e3dcc94 (patch) | |
| tree | bca5abf41bbda01dce58872dd79a1bf41e589c9e /bin | |
| parent | 438912c0c4a4075a5cd74cf9689451c9df4bbe34 (diff) | |
| download | istreamdev-d1f8c381b7aabba27d261274548fa5b51e3dcc94.tar.gz istreamdev-d1f8c381b7aabba27d261274548fa5b51e3dcc94.tar.bz2 | |
audio stream in progress
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/backend.php | 9 | ||||
| -rw-r--r-- | bin/textfiles/browseAudio.txt | 21 | ||||
| -rw-r--r-- | bin/textfiles/browseFolder-aud.txt | 36 | ||||
| -rw-r--r-- | bin/textfiles/getGlobals.txt | 2 | ||||
| -rw-r--r-- | bin/textfiles/streamAudio.txt | 2 |
5 files changed, 46 insertions, 24 deletions
diff --git a/bin/backend.php b/bin/backend.php index 54e0058..b2c41b3 100644 --- a/bin/backend.php +++ b/bin/backend.php @@ -105,9 +105,16 @@ switch ($action) if ( $path == "/video/" ) { $tree = file_get_contents("textfiles/browseFolder-rec.txt"); } - else { + else if ( $path == "/mnt/media/Videos/" ) { $tree = file_get_contents("textfiles/browseFolder-vid.txt"); } + else if ( $path == "/mnt/media/Music/" ) { + $tree = file_get_contents("textfiles/browseFolder-aud.txt"); + } + else + { + $tree = file_get_contents("textfiles/browseFolder-rec.txt"); + } print $tree; break; diff --git a/bin/textfiles/browseAudio.txt b/bin/textfiles/browseAudio.txt deleted file mode 100644 index 2f91c4f..0000000 --- a/bin/textfiles/browseAudio.txt +++ /dev/null @@ -1,21 +0,0 @@ -{ - "list": - [ - { - "type": "folder", - "name": "album1", - "path": "/mnt/music/album1" - }, - { - "type": "folder", - "name": "album2", - "path": "/mnt/music/album2" - }, - { - "type": "audio", - "name": "audiofile.mp3", - "length": "3.30", - "path": "/mnt/music/audiofile.mp3" - } - ] -} diff --git a/bin/textfiles/browseFolder-aud.txt b/bin/textfiles/browseFolder-aud.txt new file mode 100644 index 0000000..e2e71be --- /dev/null +++ b/bin/textfiles/browseFolder-aud.txt @@ -0,0 +1,36 @@ +{ + "list": + [ + { + "type": "folder", + "name": "album1", + "path": "/mnt/music/album1" + }, + { + "type": "folder", + "name": "album2", + "path": "/mnt/music/album2" + }, + { + "type": "audio", + "name": "audiofile.mp3", + "number": "1", + "length": "3.30", + "path": "/mnt/music/audiofile.mp3" + }, + { + "type": "audio", + "name": "audiofile2.mp3", + "number": "2", + "length": "2.27", + "path": "/mnt/music/audiofile2.mp3" + }, + { + "type": "audio", + "name": "audiofile3.mp3", + "number": "3", + "length": "4.03", + "path": "/mnt/music/audiofile3.mp3" + } + ] +} diff --git a/bin/textfiles/getGlobals.txt b/bin/textfiles/getGlobals.txt index 87a9994..d4795e4 100644 --- a/bin/textfiles/getGlobals.txt +++ b/bin/textfiles/getGlobals.txt @@ -1,6 +1,6 @@ { "streamdev_server": "http://127.0.0.1:3000", "rec_path": "/video/", - "video_path": "/mnt/media/Video/", + "video_path": "/mnt/media/Videos/", "audio_path": "/mnt/media/Music/" } diff --git a/bin/textfiles/streamAudio.txt b/bin/textfiles/streamAudio.txt index 28cca73..a90d122 100644 --- a/bin/textfiles/streamAudio.txt +++ b/bin/textfiles/streamAudio.txt @@ -1,5 +1,5 @@ { - playlist: + track: [ { "file": "/istreamdev/playlist/track1.mp3" |