"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tagutils/tagutils.c" between
minidlna-1.2.1.tar.gz and minidlna-1.3.0.tar.gz

About: ReadyMedia (formerly known as MiniDLNA) is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.

tagutils.c  (minidlna-1.2.1):tagutils.c  (minidlna-1.3.0)
skipping to change at line 113 skipping to change at line 113
*/ */
#include "tagutils-mp3.h" #include "tagutils-mp3.h"
#include "tagutils-aac.h" #include "tagutils-aac.h"
#ifdef HAVE_VORBISFILE #ifdef HAVE_VORBISFILE
#include "tagutils-ogg.h" #include "tagutils-ogg.h"
#endif #endif
#include "tagutils-flc.h" #include "tagutils-flc.h"
#include "tagutils-asf.h" #include "tagutils-asf.h"
#include "tagutils-wav.h" #include "tagutils-wav.h"
#include "tagutils-pcm.h" #include "tagutils-pcm.h"
#include "tagutils-dsf.h"
#include "tagutils-dff.h"
static int _get_tags(char *file, struct song_metadata *psong); static int _get_tags(char *file, struct song_metadata *psong);
static int _get_fileinfo(char *file, struct song_metadata *psong); static int _get_fileinfo(char *file, struct song_metadata *psong);
/* /*
* Typedefs * Typedefs
*/ */
typedef struct { typedef struct {
char* type; char* type;
int (*get_tags)(char* file, struct song_metadata* psong); int (*get_tags)(char* file, struct song_metadata* psong);
int (*get_fileinfo)(char* file, struct song_metadata* psong); int (*get_fileinfo)(char* file, struct song_metadata* psong);
} taghandler; } taghandler;
static taghandler taghandlers[] = { static taghandler taghandlers[] = {
{ "aac", _get_aactags, _get_aacfileinfo { "aac", _get_aactags, _get_aacfileinfo },
}, { "mp3", _get_mp3tags, _get_mp3fileinfo },
{ "mp3", _get_mp3tags, _get_mp3fileinfo { "flc", _get_flctags, _get_flcfileinfo },
},
{ "flc", _get_flctags, _get_flcfileinfo
},
#ifdef HAVE_VORBISFILE #ifdef HAVE_VORBISFILE
{ "ogg", 0, _get_oggfileinfo }, { "ogg", NULL, _get_oggfileinfo },
#endif #endif
{ "asf", 0, _get_asffileinfo { "asf", NULL, _get_asffileinfo },
}, { "wav", _get_wavtags, _get_wavfileinfo },
{ "wav", _get_wavtags, _get_wavfileinfo { "pcm", NULL, _get_pcmfileinfo },
}, { "dsf", _get_dsftags, _get_dsffileinfo },
{ "pcm", 0, _get_pcmfileinfo { "dff", NULL, _get_dfffileinfo },
}, { NULL, NULL, NULL }
{ NULL, 0 }
}; };
//****************************************************************************** *** //****************************************************************************** ***
#include "tagutils-misc.c" #include "tagutils-misc.c"
#include "tagutils-mp3.c" #include "tagutils-mp3.c"
#include "tagutils-aac.c" #include "tagutils-aac.c"
#ifdef HAVE_VORBISFILE #ifdef HAVE_VORBISFILE
#include "tagutils-ogg.c" #include "tagutils-ogg.c"
#endif #endif
#include "tagutils-flc.c" #include "tagutils-flc.c"
#include "tagutils-asf.c" #include "tagutils-asf.c"
#include "tagutils-wav.c" #include "tagutils-wav.c"
#include "tagutils-pcm.c" #include "tagutils-pcm.c"
#include "tagutils-plist.c" #include "tagutils-plist.c"
#include "tagutils-dsf.c"
#include "tagutils-dff.c"
//****************************************************************************** *** //****************************************************************************** ***
// freetags() // freetags()
#define MAYBEFREE(a) { if((a)) free((a)); }; #define MAYBEFREE(a) { if((a)) free((a)); };
void void
freetags(struct song_metadata *psong) freetags(struct song_metadata *psong)
{ {
int role; int role;
MAYBEFREE(psong->path); MAYBEFREE(psong->path);
 End of changes. 5 change blocks. 
14 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)