From b94686a5af4d4dc315de9f7908802e17cd1644fb Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Wed, 1 Jun 2005 14:54:07 +0000
Subject: [PATCH] scanner driver updates

---
 src/scanner-driver.c | 10 ++++++++++
 src/scanner.mk       |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/scanner-driver.c b/src/scanner-driver.c
index 4e169c68..6530c68c 100644
--- a/src/scanner-driver.c
+++ b/src/scanner-driver.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "daapd.h"
 #include "err.h"
 #include "mp3-scanner.h"
 
@@ -40,6 +41,8 @@ extern int scan_get_ogginfo(char *filename, MP3FILE *pmp3);
 extern int scan_get_flacinfo(char *filename, MP3FILE *pmp3);
 extern int scan_get_wavinfo(char *filename, MP3FILE *pmp3);
 extern int scan_get_aacinfo(char *filename, MP3FILE *pmp3);
+extern int scan_get_mp3info(char *filename, MP3FILE *pmp3);
+extern int scan_get_urlinfo(char *filename, MP3FILE *pmp3);
 
 /* 
  * Typedefs
@@ -61,10 +64,14 @@ SCANNERLIST scanner_list[] = {
     { "m4p",scan_get_aacinfo },
     { "mp4",scan_get_aacinfo },
     { "wav",scan_get_wavinfo },
+    { "url",scan_get_urlinfo },
+    { "mp3",scan_get_mp3info },
     { NULL, NULL }
 };
 char *av0;
 
+CONFIG config;
+
 
 /**
  * dump a mp3 file
@@ -123,6 +130,9 @@ int main(int argc, char *argv[]) {
     int option;
     char *ext;
     
+    config.scan_type=0;
+    config.latin1_tags=0;
+
     memset((void*)&mp3,0x00,sizeof(MP3FILE));
 
     if(strchr(argv[0],'/')) {
diff --git a/src/scanner.mk b/src/scanner.mk
index f43c2ad9..cba1c95a 100644
--- a/src/scanner.mk
+++ b/src/scanner.mk
@@ -1,8 +1,8 @@
 CC=gcc
 CFLAGS := $(CFLAGS) -g -I/sw/include -DHAVE_CONFIG_H -I. -I..
-LDFLAGS := $(LDFLAGS) -L/sw/lib -logg -lvorbisfile -lFLAC -lvorbis -bind_at_load
+LDFLAGS := $(LDFLAGS) -L/sw/lib -lid3tag -logg -lvorbisfile -lFLAC -lvorbis -bind_at_load
 TARGET = scanner
-OBJECTS=scanner-driver.o restart.o err.o scan-wma.o scan-aac.o scan-wav.o scan-flac.o scan-ogg.o
+OBJECTS=scanner-driver.o restart.o err.o scan-wma.o scan-aac.o scan-wav.o scan-flac.o scan-ogg.o scan-mp3.o scan-url.o
 
 $(TARGET):	$(OBJECTS)
 	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJECTS)