mirror of
https://github.com/owntone/owntone-server.git
synced 2025-04-07 05:10:36 -04:00
scanner driver updates
This commit is contained in:
parent
9c48844586
commit
b94686a5af
@ -29,6 +29,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include "daapd.h"
|
||||||
#include "err.h"
|
#include "err.h"
|
||||||
#include "mp3-scanner.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_flacinfo(char *filename, MP3FILE *pmp3);
|
||||||
extern int scan_get_wavinfo(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_aacinfo(char *filename, MP3FILE *pmp3);
|
||||||
|
extern int scan_get_mp3info(char *filename, MP3FILE *pmp3);
|
||||||
|
extern int scan_get_urlinfo(char *filename, MP3FILE *pmp3);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Typedefs
|
* Typedefs
|
||||||
@ -61,10 +64,14 @@ SCANNERLIST scanner_list[] = {
|
|||||||
{ "m4p",scan_get_aacinfo },
|
{ "m4p",scan_get_aacinfo },
|
||||||
{ "mp4",scan_get_aacinfo },
|
{ "mp4",scan_get_aacinfo },
|
||||||
{ "wav",scan_get_wavinfo },
|
{ "wav",scan_get_wavinfo },
|
||||||
|
{ "url",scan_get_urlinfo },
|
||||||
|
{ "mp3",scan_get_mp3info },
|
||||||
{ NULL, NULL }
|
{ NULL, NULL }
|
||||||
};
|
};
|
||||||
char *av0;
|
char *av0;
|
||||||
|
|
||||||
|
CONFIG config;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* dump a mp3 file
|
* dump a mp3 file
|
||||||
@ -123,6 +130,9 @@ int main(int argc, char *argv[]) {
|
|||||||
int option;
|
int option;
|
||||||
char *ext;
|
char *ext;
|
||||||
|
|
||||||
|
config.scan_type=0;
|
||||||
|
config.latin1_tags=0;
|
||||||
|
|
||||||
memset((void*)&mp3,0x00,sizeof(MP3FILE));
|
memset((void*)&mp3,0x00,sizeof(MP3FILE));
|
||||||
|
|
||||||
if(strchr(argv[0],'/')) {
|
if(strchr(argv[0],'/')) {
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
CC=gcc
|
CC=gcc
|
||||||
CFLAGS := $(CFLAGS) -g -I/sw/include -DHAVE_CONFIG_H -I. -I..
|
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
|
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)
|
$(TARGET): $(OBJECTS)
|
||||||
$(CC) -o $(TARGET) $(LDFLAGS) $(OBJECTS)
|
$(CC) -o $(TARGET) $(LDFLAGS) $(OBJECTS)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user