From 45f8d47384934582f4e2e0ff5321b710ea9c34da Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Tue, 18 May 2004 04:35:26 +0000
Subject: 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
---
 src/ls.c     | 8 +-------
 src/player.c | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/ls.c b/src/ls.c
index 1b5c36015..f52bff969 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -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
-- 
cgit v1.2.3