Mercurial > audlegacy-plugins
changeset 634:65606ed19c76 trunk
[svn] - make use of integrated libid3tag
| author | yaz |
|---|---|
| date | Sun, 11 Feb 2007 05:39:56 -0800 |
| parents | 0341583ad50c |
| children | 4b022820566b |
| files | ChangeLog configure.ac src/madplug/Makefile src/madplug/fileinfo.c src/tta/Makefile |
| diffstat | 5 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Feb 11 02:44:18 2007 -0800 +++ b/ChangeLog Sun Feb 11 05:39:56 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-11 10:44:18 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1352] + - filter out .ogg extension + + trunk/src/madplug/plugin.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + 2007-02-11 09:46:36 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1350] - remove some fuzzies
--- a/configure.ac Sun Feb 11 02:44:18 2007 -0800 +++ b/configure.ac Sun Feb 11 05:39:56 2007 -0800 @@ -307,8 +307,9 @@ ) if test "$enable_mp3" = "yes"; then - PKG_CHECK_MODULES(MAD, [mad id3tag], + PKG_CHECK_MODULES(MAD, [mad], [INPUT_PLUGINS="$INPUT_PLUGINS madplug"]) +fi # XXX rtsp support # PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0], # [LIBNMS_SRC=rtsp.c @@ -317,7 +318,7 @@ # AC_SUBST(LIBNMS_CFLAGS) # AC_SUBST(LIBNMS_LIBS) # AC_SUBST(LIBNMS_SRC) -fi +# fi dnl *** Rocklight @@ -1108,16 +1109,6 @@ ) if test "$enable_tta" = "yes"; then - AC_CHECK_HEADERS([id3tag.h], [enable_tta=yes], [enable_tta=no]) - if test "$enable_tta" = "yes"; then - AC_CHECK_LIB([id3tag], [id3_file_open], [enable_tta=yes], [enable_tta=no]) - fi -else - AC_MSG_RESULT([*** TrueAudio plugin disabled per user request ***]) - enable_tta=no -fi - -if test "$enable_tta" = "yes"; then INPUT_PLUGINS="$INPUT_PLUGINS tta" fi
--- a/src/madplug/Makefile Sun Feb 11 02:44:18 2007 -0800 +++ b/src/madplug/Makefile Sun Feb 11 05:39:56 2007 -0800 @@ -19,6 +19,6 @@ CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(MAD_CFLAGS) -I../../intl -I../.. -LIBADD = $(MAD_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +LIBADD = -L$(libdir) -lid3tag $(MAD_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) include ../../mk/objective.mk
--- a/src/madplug/fileinfo.c Sun Feb 11 02:44:18 2007 -0800 +++ b/src/madplug/fileinfo.c Sun Feb 11 05:39:56 2007 -0800 @@ -591,7 +591,7 @@ char *utf_filename; #ifdef DEBUG - g_message("f: audmad_get_file_info: %s\n", filename); + g_message("f: audmad_get_file_info: %s", filename); #endif input_init(&info, filename);
--- a/src/tta/Makefile Sun Feb 11 02:44:18 2007 -0800 +++ b/src/tta/Makefile Sun Feb 11 05:39:56 2007 -0800 @@ -11,6 +11,6 @@ CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -LIBADD = -lid3tag $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +LIBADD = -L$(libdir) -lid3tag $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) include ../../mk/objective.mk