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

assume all streams are mp3's, we'll need to open the streams before calling
45f8d473 · Warren Dukes · 06422f72 · 45f8d473 · 45f8d473
Commit 45f8d473 authored May 18, 2004 by Warren Dukes
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

ls.c src/ls.c +1 -7

player.c src/player.c +2 -1

No files found.
--- 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
+                        return 1;
-			if(hasMp3Suffix(url)) return 1;
-#endif
-#ifdef HAVE_OGG
-			if(hasOggSuffix(url)) return 1;
-#endif
-			return 0;
 		}
 		urlPrefixes++;
 	}

--- 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