diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-05-18 04:35:26 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-05-18 04:35:26 +0000 |
| commit | 45f8d47384934582f4e2e0ff5321b710ea9c34da (patch) | |
| tree | 2c734d6985b8b1a8713d0dd4455655617bb392c2 | |
| parent | 06422f729b8f6937d33d7c6c9156f4f3a5fdc731 (diff) | |
| download | mpd-45f8d47384934582f4e2e0ff5321b710ea9c34da.tar.gz mpd-45f8d47384934582f4e2e0ff5321b710ea9c34da.tar.xz mpd-45f8d47384934582f4e2e0ff5321b710ea9c34da.zip | |
assume all streams are mp3's, we'll need to open the streams before calling
the decoder routines to fetch the mime-type!
git-svn-id: https://svn.musicpd.org/mpd/trunk@1054 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/ls.c | 8 | ||||
| -rw-r--r-- | src/player.c | 3 |
2 files changed, 3 insertions, 8 deletions
@@ -51,13 +51,7 @@ int isRemoteUrl(char * url) { while(*urlPrefixes) { if(strncmp(*urlPrefixes,url,strlen(*urlPrefixes)) == 0) { -#ifdef HAVE_MAD - if(hasMp3Suffix(url)) return 1; -#endif -#ifdef HAVE_OGG - if(hasOggSuffix(url)) return 1; -#endif - return 0; + return 1; } urlPrefixes++; } diff --git a/src/player.c b/src/player.c index a764dd28a..7f28670bf 100644 --- a/src/player.c +++ b/src/player.c @@ -161,7 +161,8 @@ int playerInit() { } int playerGetDecodeType(char * utf8file) { - if(!isRemoteUrl(utf8file) && !isFile(utf8file,NULL)) return -1; + if(isRemoteUrl(utf8file)) return DECODE_TYPE_MP3; + if(!isFile(utf8file,NULL)) return -1; #ifdef HAVE_MAD if(hasMp3Suffix(utf8file)) return DECODE_TYPE_MP3; #endif |