"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tagutils/tagutils.c" between
minidlna-1.1.5.tar.gz and minidlna-1.2.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.1.5):tagutils.c  (minidlna-1.2.0)
skipping to change at line 24 skipping to change at line 24
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* This file is derived from mt-daapd project */ /* This file is derived from mt-daapd project */
#include "config.h"
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <id3tag.h> #include <id3tag.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifdef HAVE_VORBISFILE
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
#endif
#include <FLAC/metadata.h> #include <FLAC/metadata.h>
#include "config.h"
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
#include <iconv.h> #include <iconv.h>
#endif #endif
#include <sqlite3.h> #include <sqlite3.h>
#include "tagutils.h" #include "tagutils.h"
#include "../metadata.h" #include "../metadata.h"
#include "../utils.h" #include "../utils.h"
#include "../log.h" #include "../log.h"
struct id3header { struct id3header {
skipping to change at line 104 skipping to change at line 106
"Unknown" "Unknown"
}; };
#define WINAMP_GENRE_UNKNOWN ((sizeof(winamp_genre) / sizeof(winamp_genre[0])) - 1) #define WINAMP_GENRE_UNKNOWN ((sizeof(winamp_genre) / sizeof(winamp_genre[0])) - 1)
/* /*
* Prototype * Prototype
*/ */
#include "tagutils-mp3.h" #include "tagutils-mp3.h"
#include "tagutils-aac.h" #include "tagutils-aac.h"
#ifdef HAVE_VORBISFILE
#include "tagutils-ogg.h" #include "tagutils-ogg.h"
#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"
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
skipping to change at line 127 skipping to change at line 131
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
{ "ogg", 0, _get_oggfileinfo }, { "ogg", 0, _get_oggfileinfo },
#endif
{ "asf", 0, _get_asffileinfo }, { "asf", 0, _get_asffileinfo },
{ "wav", _get_wavtags, _get_wavfileinfo }, { "wav", _get_wavtags, _get_wavfileinfo },
{ "pcm", 0, _get_pcmfileinfo }, { "pcm", 0, _get_pcmfileinfo },
{ NULL, 0 } { 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
#include "tagutils-ogg.c" #include "tagutils-ogg.c"
#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"
//****************************************************************************** *** //****************************************************************************** ***
// freetags() // freetags()
#define MAYBEFREE(a) { if((a)) free((a)); }; #define MAYBEFREE(a) { if((a)) free((a)); };
void void
 End of changes. 10 change blocks. 
1 lines changed or deleted 9 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS