storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Free any music metadata memory we allocate.

Browse Source
This commit is contained in:
Justin Maggard 2009-01-30 18:42:59 +00:00
parent 7403cce50c
commit 53f764d020
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
metadata.c
View File

@ -41,7 +41,11 @@
#include "utils.h" #include "utils.h"
#include "sql.h" #include "sql.h"
#define FLAG_ARTIST 0x01 #define FLAG_TITLE 0x00000001
#define FLAG_ARTIST 0x00000002
#define FLAG_ALBUM 0x00000004
#define FLAG_GENRE 0x00000008
#define FLAG_COMMENT 0x00000010
/* Audio profile flags */ /* Audio profile flags */
#define MP3 0x00000001 #define MP3 0x00000001
@ -155,6 +159,7 @@ GetAudioMetadata(const char * path, char * name)
title = trim(title); title = trim(title);
if( index(title, '&') ) if( index(title, '&') )
{ {
free_flags |= FLAG_TITLE;
title = modifyString(strdup(title), "&", "&", 0); title = modifyString(strdup(title), "&", "&", 0);
} }
} }
@ -182,6 +187,7 @@ GetAudioMetadata(const char * path, char * name)
album = trim(album); album = trim(album);
if( index(album, '&') ) if( index(album, '&') )
{ {
free_flags |= FLAG_ALBUM;
album = modifyString(strdup(album), "&", "&", 0); album = modifyString(strdup(album), "&", "&", 0);
} }
} }
@ -195,6 +201,7 @@ GetAudioMetadata(const char * path, char * name)
genre = trim(genre); genre = trim(genre);
if( index(genre, '&') ) if( index(genre, '&') )
{ {
free_flags |= FLAG_GENRE;
genre = modifyString(strdup(genre), "&", "&", 0); genre = modifyString(strdup(genre), "&", "&", 0);
} }
} }
@ -208,6 +215,7 @@ GetAudioMetadata(const char * path, char * name)
comment = trim(comment); comment = trim(comment);
if( index(comment, '&') ) if( index(comment, '&') )
{ {
free_flags |= FLAG_COMMENT;
comment = modifyString(strdup(comment), "&", "&", 0); comment = modifyString(strdup(comment), "&", "&", 0);
} }
} }
@ -253,8 +261,16 @@ GetAudioMetadata(const char * path, char * name)
taglib_tag_free_strings(); taglib_tag_free_strings();
taglib_file_free(audio_file); taglib_file_free(audio_file);
if( free_flags & FLAG_TITLE )
free(title);
if( free_flags & FLAG_ARTIST ) if( free_flags & FLAG_ARTIST )
free(artist); free(artist);
if( free_flags & FLAG_ALBUM )
free(album);
if( free_flags & FLAG_GENRE )
free(genre);
if( free_flags & FLAG_COMMENT )
free(comment);
//DEBUG printf("SQL: %s\n", sql); //DEBUG printf("SQL: %s\n", sql);
if( sqlite3_exec(db, sql, 0, 0, &zErrMsg) != SQLITE_OK ) if( sqlite3_exec(db, sql, 0, 0, &zErrMsg) != SQLITE_OK )