diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-03-04 23:19:57 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-03-04 23:19:57 +0000 |
| commit | e2d2baece9230967d8f1d5fdb5259515c2fb03c7 (patch) | |
| tree | 0e0e0470e22eb21a60cf694cbaad199aadc5e242 /src/libid3tag | |
| parent | 7be523c015a18ffcfbdd9511e225609729b25a0c (diff) | |
| download | mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.tar.gz mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.tar.xz mpd-e2d2baece9230967d8f1d5fdb5259515c2fb03c7.zip | |
update to 0.15.1 of libmad and libid3tag
git-svn-id: https://svn.musicpd.org/mpd/trunk@196 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/libid3tag')
47 files changed, 135 insertions, 113 deletions
diff --git a/src/libid3tag/CHANGES b/src/libid3tag/CHANGES index 4fcc0cd58..f2bfaff65 100644 --- a/src/libid3tag/CHANGES +++ b/src/libid3tag/CHANGES @@ -1,11 +1,19 @@ libid3tag - ID3 tag manipulation library - Copyright (C) 2000-2003 Underbit Technologies, Inc. + Copyright (C) 2000-2004 Underbit Technologies, Inc. - $Id: CHANGES,v 1.1 2003/08/14 03:57:13 shank Exp $ + $Id: CHANGES,v 1.11 2004/02/17 02:04:10 rob Exp $ =============================================================================== +Version 0.15.1 (beta) + + * Updated to autoconf 2.59, automake 1.8.2, libtool 1.5.2. + + * Fixed a potential problem in file.c when writing empty ID3v2 tags. + + * Added new id3_field_gettextencoding() API routine. + Version 0.15.0 (beta) * Updated to autoconf 2.57, automake 1.7.5, libtool 1.4.3. diff --git a/src/libid3tag/COPYRIGHT b/src/libid3tag/COPYRIGHT index c492f8d7a..072f7e247 100644 --- a/src/libid3tag/COPYRIGHT +++ b/src/libid3tag/COPYRIGHT @@ -1,6 +1,6 @@ libid3tag - ID3 tag manipulation library - Copyright (C) 2000-2003 Underbit Technologies, Inc. + Copyright (C) 2000-2004 Underbit Technologies, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/libid3tag/CREDITS b/src/libid3tag/CREDITS index 888e71f9e..755047547 100644 --- a/src/libid3tag/CREDITS +++ b/src/libid3tag/CREDITS @@ -1,8 +1,8 @@ libid3tag - ID3 tag manipulation library - Copyright (C) 2000-2003 Underbit Technologies, Inc. + Copyright (C) 2000-2004 Underbit Technologies, Inc. - $Id: CREDITS,v 1.1 2003/08/14 03:57:13 shank Exp $ + $Id: CREDITS,v 1.2 2004/01/23 09:41:32 rob Exp $ =============================================================================== diff --git a/src/libid3tag/Makefile.am b/src/libid3tag/Makefile.am index 9c22d0845..0b93cab01 100644 --- a/src/libid3tag/Makefile.am +++ b/src/libid3tag/Makefile.am @@ -1,6 +1,6 @@ ## ## libid3tag - ID3 tag manipulation library -## Copyright (C) 2000-2003 Underbit Technologies, Inc. +## Copyright (C) 2000-2004 Underbit Technologies, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## -## $Id: Makefile.am,v 1.1 2003/08/14 03:57:13 shank Exp $ +## $Id: Makefile.am,v 1.26 2004/02/17 02:11:28 rob Exp $ ## ## Process this file with automake to produce Makefile.in @@ -63,9 +63,9 @@ noinst_HEADERS = id3tag.h ## 6. If any interfaces have been removed since the last public release, ## then set AGE to 0. -version_current = 2 +version_current = 3 version_revision = 0 -version_age = 2 +version_age = 3 version_info = $(version_current):$(version_revision):$(version_age) diff --git a/src/libid3tag/README b/src/libid3tag/README index 217232d44..c918d4348 100644 --- a/src/libid3tag/README +++ b/src/libid3tag/README @@ -1,8 +1,8 @@ libid3tag - ID3 tag manipulation library - Copyright (C) 2000-2003 Underbit Technologies, Inc. + Copyright (C) 2000-2004 Underbit Technologies, Inc. - $Id: README,v 1.1 2003/08/14 03:57:13 shank Exp $ + $Id: README,v 1.5 2004/01/23 09:41:32 rob Exp $ =============================================================================== diff --git a/src/libid3tag/TODO b/src/libid3tag/TODO index 36faa7724..6fdc4065e 100644 --- a/src/libid3tag/TODO +++ b/src/libid3tag/TODO @@ -1,8 +1,8 @@ libid3tag - ID3 tag manipulation library - Copyright (C) 2000-2003 Underbit Technologies, Inc. + Copyright (C) 2000-2004 Underbit Technologies, Inc. - $Id: TODO,v 1.1 2003/08/14 03:57:13 shank Exp $ + $Id: TODO,v 1.2 2004/01/23 09:41:32 rob Exp $ =============================================================================== diff --git a/src/libid3tag/VERSION b/src/libid3tag/VERSION index 936f63572..574a7327f 100644 --- a/src/libid3tag/VERSION +++ b/src/libid3tag/VERSION @@ -1,6 +1,6 @@ -0.15.0b +0.15.1b configure.ac:24 -id3tag.h:334-337 -msvc++/config.h:57 +id3tag.h:338-341 +msvc++/config.h:59,65,71 Makefile.am:63-65 diff --git a/src/libid3tag/compat.gperf b/src/libid3tag/compat.gperf index 17eaac162..4e24613c5 100644 --- a/src/libid3tag/compat.gperf +++ b/src/libid3tag/compat.gperf @@ -1,7 +1,7 @@ %{ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: compat.gperf,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: compat.gperf,v 1.11 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/compat.h b/src/libid3tag/compat.h index 5d980eea4..8af71ecc2 100644 --- a/src/libid3tag/compat.h +++ b/src/libid3tag/compat.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: compat.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: compat.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_COMPAT_H diff --git a/src/libid3tag/config.h.in b/src/libid3tag/config.h.in index ba35b4be9..b4f0f8997 100644 --- a/src/libid3tag/config.h.in +++ b/src/libid3tag/config.h.in @@ -72,8 +72,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ #undef inline -#endif diff --git a/src/libid3tag/configure.ac b/src/libid3tag/configure.ac index 9923cd362..a0b0feeb1 100644 --- a/src/libid3tag/configure.ac +++ b/src/libid3tag/configure.ac @@ -1,7 +1,7 @@ dnl -*- m4 -*- dnl dnl libid3tag - ID3 tag manipulation library -dnl Copyright (C) 2000-2003 Underbit Technologies, Inc. +dnl Copyright (C) 2000-2004 Underbit Technologies, Inc. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -17,11 +17,11 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -AC_REVISION([$Id: configure.ac,v 1.1 2003/08/14 03:57:13 shank Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.12 2004/01/23 23:22:46 rob Exp $])dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([ID3 Tag], [0.15.0b], [support@underbit.com], [libid3tag]) +AC_INIT([ID3 Tag], [0.15.1b], [support@underbit.com], [libid3tag]) AC_PREREQ(2.53) AC_CONFIG_SRCDIR([id3tag.h]) diff --git a/src/libid3tag/crc.c b/src/libid3tag/crc.c index 76e78ea45..742a5d8f4 100644 --- a/src/libid3tag/crc.c +++ b/src/libid3tag/crc.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: crc.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: crc.c,v 1.11 2004/02/17 02:04:10 rob Exp $ */ # ifdef HAVE_CONFIG_H @@ -104,10 +104,10 @@ unsigned long const crc_table[256] = { }; /* - * NAME: crc->calculate() - * DESCRIPTION: compute CRC-32 value (ISO 3309) + * NAME: crc->compute() + * DESCRIPTION: calculate CRC-32 value (ISO 3309) */ -unsigned long id3_crc_calculate(id3_byte_t const *data, id3_length_t length) +unsigned long id3_crc_compute(id3_byte_t const *data, id3_length_t length) { register unsigned long crc; diff --git a/src/libid3tag/crc.h b/src/libid3tag/crc.h index 6ff639053..89a5a3953 100644 --- a/src/libid3tag/crc.h +++ b/src/libid3tag/crc.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: crc.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: crc.h,v 1.8 2004/02/17 02:04:10 rob Exp $ */ # ifndef LIBID3TAG_CRC_H @@ -24,6 +24,6 @@ # include "id3tag.h" -unsigned long id3_crc_calculate(id3_byte_t const *, id3_length_t); +unsigned long id3_crc_compute(id3_byte_t const *, id3_length_t); # endif diff --git a/src/libid3tag/debug.c b/src/libid3tag/debug.c index 78b11bba3..d91a2c56e 100644 --- a/src/libid3tag/debug.c +++ b/src/libid3tag/debug.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: debug.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: debug.c,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/debug.h b/src/libid3tag/debug.h index dc5b4997c..a9b4ce064 100644 --- a/src/libid3tag/debug.h +++ b/src/libid3tag/debug.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: debug.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: debug.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_DEBUG_H @@ -25,8 +25,7 @@ # include <stdlib.h> void *id3_debug_malloc(size_t, char const *, unsigned int); -void *id3_debug_calloc(size_t, size_t, - char const *file, unsigned int line); +void *id3_debug_calloc(size_t, size_t, char const *, unsigned int); void *id3_debug_realloc(void *, size_t, char const *, unsigned int); void id3_debug_free(void *, char const *, unsigned int); diff --git a/src/libid3tag/field.c b/src/libid3tag/field.c index a7b413edb..f2ecc0fd4 100644 --- a/src/libid3tag/field.c +++ b/src/libid3tag/field.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: field.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: field.c,v 1.16 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H @@ -750,6 +750,21 @@ signed long id3_field_getint(union id3_field const *field) } /* + * NAME: field->gettextencoding() + * DESCRIPTION: return the value of a text encoding field + */ +enum id3_field_textencoding +id3_field_gettextencoding(union id3_field const *field) +{ + assert(field); + + if (field->type != ID3_FIELD_TYPE_TEXTENCODING) + return -1; + + return field->number.value; +} + +/* * NAME: field->getlatin1() * DESCRIPTION: return the value of a latin1 field */ diff --git a/src/libid3tag/field.h b/src/libid3tag/field.h index a3da578f7..2cf42b90a 100644 --- a/src/libid3tag/field.h +++ b/src/libid3tag/field.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: field.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: field.h,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_FIELD_H diff --git a/src/libid3tag/file.c b/src/libid3tag/file.c index 02150c06b..9d7319a76 100644 --- a/src/libid3tag/file.c +++ b/src/libid3tag/file.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: file.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: file.c,v 1.21 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H @@ -522,7 +522,7 @@ int v1_write(struct id3_file *file, if (fseek(file->iofile, (file->flags & ID3_FILE_FLAG_ID3V1) ? -128 : 0, SEEK_END) == -1 || (location = ftell(file->iofile)) == -1 || - fwrite(data, 128, 1, file->iofile) == 0 || + fwrite(data, 128, 1, file->iofile) != 1 || fflush(file->iofile) == EOF) return -1; @@ -577,13 +577,14 @@ int v2_write(struct id3_file *file, { assert(!data || length > 0); - if (((file->ntags == 1 && !(file->flags & ID3_FILE_FLAG_ID3V1)) || + if (data && + ((file->ntags == 1 && !(file->flags & ID3_FILE_FLAG_ID3V1)) || (file->ntags == 2 && (file->flags & ID3_FILE_FLAG_ID3V1))) && file->tags[0].length == length) { /* easy special case: rewrite existing tag in-place */ if (fseek(file->iofile, file->tags[0].location, SEEK_SET) == -1 || - fwrite(data, length, 1, file->iofile) == 0 || + fwrite(data, length, 1, file->iofile) != 1 || fflush(file->iofile) == EOF) return -1; diff --git a/src/libid3tag/file.h b/src/libid3tag/file.h index da67af241..032b189f8 100644 --- a/src/libid3tag/file.h +++ b/src/libid3tag/file.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: file.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: file.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_FILE_H diff --git a/src/libid3tag/frame.c b/src/libid3tag/frame.c index aafd54e27..1c680d9e9 100644 --- a/src/libid3tag/frame.c +++ b/src/libid3tag/frame.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: frame.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: frame.c,v 1.15 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/frame.h b/src/libid3tag/frame.h index dfa9bb927..05c6b04b0 100644 --- a/src/libid3tag/frame.h +++ b/src/libid3tag/frame.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: frame.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: frame.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_FRAME_H diff --git a/src/libid3tag/frametype.gperf b/src/libid3tag/frametype.gperf index 5158f77b9..1c8ff2ea3 100644 --- a/src/libid3tag/frametype.gperf +++ b/src/libid3tag/frametype.gperf @@ -1,7 +1,7 @@ %{ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: frametype.gperf,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: frametype.gperf,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/frametype.h b/src/libid3tag/frametype.h index 9ace41468..dd064b245 100644 --- a/src/libid3tag/frametype.h +++ b/src/libid3tag/frametype.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: frametype.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: frametype.h,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_FRAMETYPE_H diff --git a/src/libid3tag/genre.c b/src/libid3tag/genre.c index dda381a03..32fccb197 100644 --- a/src/libid3tag/genre.c +++ b/src/libid3tag/genre.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: genre.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: genre.c,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/genre.dat.in b/src/libid3tag/genre.dat.in index 9a7ad9c4e..872de4097 100644 --- a/src/libid3tag/genre.dat.in +++ b/src/libid3tag/genre.dat.in @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: genre.dat.in,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: genre.dat.in,v 1.7 2004/01/23 09:41:32 rob Exp $ */ /* diff --git a/src/libid3tag/genre.dat.sed b/src/libid3tag/genre.dat.sed index c65740334..b8be6c5e0 100644 --- a/src/libid3tag/genre.dat.sed +++ b/src/libid3tag/genre.dat.sed @@ -1,6 +1,6 @@ # # libid3tag - ID3 tag manipulation library -# Copyright (C) 2000-2003 Underbit Technologies, Inc. +# Copyright (C) 2000-2004 Underbit Technologies, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# $Id: genre.dat.sed,v 1.1 2003/08/14 03:57:13 shank Exp $ +# $Id: genre.dat.sed,v 1.10 2004/01/23 09:41:32 rob Exp $ # 1i\ diff --git a/src/libid3tag/genre.h b/src/libid3tag/genre.h index bd4b906e7..56d538ae8 100644 --- a/src/libid3tag/genre.h +++ b/src/libid3tag/genre.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: genre.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: genre.h,v 1.6 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_GENRE_H diff --git a/src/libid3tag/global.h b/src/libid3tag/global.h index 86924b112..377a5e6f6 100644 --- a/src/libid3tag/global.h +++ b/src/libid3tag/global.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: global.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: global.h,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_GLOBAL_H diff --git a/src/libid3tag/id3tag.h b/src/libid3tag/id3tag.h index a862eaeb1..4f4c6819a 100644 --- a/src/libid3tag/id3tag.h +++ b/src/libid3tag/id3tag.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ * If you would like to negotiate alternate licensing terms, you may do * so by contacting: Underbit Technologies, Inc. <info@underbit.com> * - * $Id: id3tag.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: id3tag.h,v 1.17 2004/01/23 23:22:46 rob Exp $ */ # ifndef LIBID3TAG_ID3TAG_H @@ -300,6 +300,7 @@ int id3_field_setbinarydata(union id3_field *, id3_byte_t const *, id3_length_t); signed long id3_field_getint(union id3_field const *); +enum id3_field_textencoding id3_field_gettextencoding(union id3_field const *); id3_latin1_t const *id3_field_getlatin1(union id3_field const *); id3_latin1_t const *id3_field_getfulllatin1(union id3_field const *); id3_ucs4_t const *id3_field_getstring(union id3_field const *); @@ -336,7 +337,7 @@ id3_ucs4_t *id3_utf8_ucs4duplicate(id3_utf8_t const *); # define ID3_VERSION_MAJOR 0 # define ID3_VERSION_MINOR 15 -# define ID3_VERSION_PATCH 0 +# define ID3_VERSION_PATCH 1 # define ID3_VERSION_EXTRA " (beta)" # define ID3_VERSION_STRINGIZE(str) #str @@ -347,7 +348,7 @@ id3_ucs4_t *id3_utf8_ucs4duplicate(id3_utf8_t const *); ID3_VERSION_STRING(ID3_VERSION_PATCH) \ ID3_VERSION_EXTRA -# define ID3_PUBLISHYEAR "2000-2003" +# define ID3_PUBLISHYEAR "2000-2004" # define ID3_AUTHOR "Underbit Technologies, Inc." # define ID3_EMAIL "info@underbit.com" diff --git a/src/libid3tag/latin1.c b/src/libid3tag/latin1.c index 12ecb9ed7..67b8199bc 100644 --- a/src/libid3tag/latin1.c +++ b/src/libid3tag/latin1.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: latin1.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: latin1.c,v 1.10 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/latin1.h b/src/libid3tag/latin1.h index 287dd6722..3604bbf0f 100644 --- a/src/libid3tag/latin1.h +++ b/src/libid3tag/latin1.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: latin1.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: latin1.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_LATIN1_H diff --git a/src/libid3tag/parse.c b/src/libid3tag/parse.c index f3ddad865..86a3f219b 100644 --- a/src/libid3tag/parse.c +++ b/src/libid3tag/parse.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: parse.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: parse.c,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/parse.h b/src/libid3tag/parse.h index 20f79ad3d..5dfa23f31 100644 --- a/src/libid3tag/parse.h +++ b/src/libid3tag/parse.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: parse.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: parse.h,v 1.6 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_PARSE_H diff --git a/src/libid3tag/render.c b/src/libid3tag/render.c index 29b8e8acc..668a487bf 100644 --- a/src/libid3tag/render.c +++ b/src/libid3tag/render.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: render.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: render.c,v 1.11 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/render.h b/src/libid3tag/render.h index 5fa8c17da..702605dd5 100644 --- a/src/libid3tag/render.h +++ b/src/libid3tag/render.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: render.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: render.h,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_RENDER_H diff --git a/src/libid3tag/tag.c b/src/libid3tag/tag.c index 4c9ad1929..be4e8e777 100644 --- a/src/libid3tag/tag.c +++ b/src/libid3tag/tag.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: tag.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: tag.c,v 1.20 2004/02/17 02:04:10 rob Exp $ */ # ifdef HAVE_CONFIG_H @@ -506,7 +506,7 @@ struct id3_tag *v2_parse(id3_byte_t const *ptr) crc = id3_parse_uint(&ehptr, 4); - if (crc != id3_crc_calculate(ptr, end - ptr)) + if (crc != id3_crc_compute(ptr, end - ptr)) goto fail; tag->extendedflags |= ID3_TAG_EXTENDEDFLAG_CRCDATAPRESENT; @@ -579,7 +579,7 @@ struct id3_tag *v2_parse(id3_byte_t const *ptr) crc = id3_parse_syncsafe(&ehptr, 5); ehptr += bytes - 5; - if (crc != id3_crc_calculate(ptr, end - ptr)) + if (crc != id3_crc_compute(ptr, end - ptr)) goto fail; } @@ -895,7 +895,7 @@ id3_length_t id3_tag_render(struct id3_tag const *tag, id3_byte_t *buffer) if (crc_ptr) { id3_render_syncsafe(&crc_ptr, - id3_crc_calculate(frames_ptr, *ptr - frames_ptr), 5); + id3_crc_compute(frames_ptr, *ptr - frames_ptr), 5); } /* footer */ diff --git a/src/libid3tag/tag.h b/src/libid3tag/tag.h index ebc90960f..2ce84d7cf 100644 --- a/src/libid3tag/tag.h +++ b/src/libid3tag/tag.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: tag.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: tag.h,v 1.10 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_TAG_H diff --git a/src/libid3tag/ucs4.c b/src/libid3tag/ucs4.c index 7062e993a..15dace869 100644 --- a/src/libid3tag/ucs4.c +++ b/src/libid3tag/ucs4.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ucs4.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: ucs4.c,v 1.13 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/ucs4.h b/src/libid3tag/ucs4.h index e1106dd1e..bfb325d5e 100644 --- a/src/libid3tag/ucs4.h +++ b/src/libid3tag/ucs4.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: ucs4.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: ucs4.h,v 1.11 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_UCS4_H diff --git a/src/libid3tag/utf16.c b/src/libid3tag/utf16.c index 8b8f47934..70ee9d5a8 100644 --- a/src/libid3tag/utf16.c +++ b/src/libid3tag/utf16.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: utf16.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: utf16.c,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/utf16.h b/src/libid3tag/utf16.h index 6159d2bbc..b7be49c3b 100644 --- a/src/libid3tag/utf16.h +++ b/src/libid3tag/utf16.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: utf16.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: utf16.h,v 1.8 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_UTF16_H diff --git a/src/libid3tag/utf8.c b/src/libid3tag/utf8.c index 76b08719b..4d8649a32 100644 --- a/src/libid3tag/utf8.c +++ b/src/libid3tag/utf8.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: utf8.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: utf8.c,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/utf8.h b/src/libid3tag/utf8.h index 98f1445a7..572bb2ab2 100644 --- a/src/libid3tag/utf8.h +++ b/src/libid3tag/utf8.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: utf8.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: utf8.h,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_UTF8_H diff --git a/src/libid3tag/util.c b/src/libid3tag/util.c index a7ecc25f3..61ccccf6c 100644 --- a/src/libid3tag/util.c +++ b/src/libid3tag/util.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: util.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: util.c,v 1.9 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/util.h b/src/libid3tag/util.h index 12eb99390..4b895d237 100644 --- a/src/libid3tag/util.h +++ b/src/libid3tag/util.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: util.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: util.h,v 1.6 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_UTIL_H diff --git a/src/libid3tag/version.c b/src/libid3tag/version.c index 7dfd97cce..d54b80aca 100644 --- a/src/libid3tag/version.c +++ b/src/libid3tag/version.c @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: version.c,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: version.c,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifdef HAVE_CONFIG_H diff --git a/src/libid3tag/version.h b/src/libid3tag/version.h index e68a486a8..5eaa11f3c 100644 --- a/src/libid3tag/version.h +++ b/src/libid3tag/version.h @@ -1,6 +1,6 @@ /* * libid3tag - ID3 tag manipulation library - * Copyright (C) 2000-2003 Underbit Technologies, Inc. + * Copyright (C) 2000-2004 Underbit Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: version.h,v 1.1 2003/08/14 03:57:13 shank Exp $ + * $Id: version.h,v 1.7 2004/01/23 09:41:32 rob Exp $ */ # ifndef LIBID3TAG_VERSION_H |