Mercurial > audlegacy-plugins
changeset 724:d91c6ab8e774 trunk
[svn] - libflac -> libaudflac to prevent collision in the sun studio linker
- remove some checks wrt vfs which are obsolete due to flac import
| author | nenolod |
|---|---|
| date | Sat, 24 Feb 2007 17:09:19 -0800 |
| parents | bd3cadcc9907 |
| children | a467a9e84295 |
| files | ChangeLog src/flac/Makefile src/flac/libflac/Makefile src/flac/plugin_common/tags.c src/flac/tag.c |
| diffstat | 5 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 24 16:36:25 2007 -0800 +++ b/ChangeLog Sat Feb 24 17:09:19 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-25 00:36:25 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1532] + - enforce $(PICFLAGS) + + trunk/src/flac/libflac/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-02-25 00:17:26 +0000 Jonathan Schleifer <js@h3c.de> revision [1530] * Delete flac112
--- a/src/flac/Makefile Sat Feb 24 16:36:25 2007 -0800 +++ b/src/flac/Makefile Sat Feb 24 17:09:19 2007 -0800 @@ -17,7 +17,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./libflac -L./plugin_common -lflac -logg -lplugin_common +LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./libflac -L./plugin_common -laudflac -logg -lplugin_common SOURCES = \ charset.c \
--- a/src/flac/libflac/Makefile Sat Feb 24 16:36:25 2007 -0800 +++ b/src/flac/libflac/Makefile Sat Feb 24 17:09:19 2007 -0800 @@ -1,7 +1,7 @@ include ../../../mk/rules.mk include ../../../mk/init.mk -OBJECTIVE_LIBS_NOINST = libflac.a +OBJECTIVE_LIBS_NOINST = libaudflac.a SOURCES = \ bitmath.c \ @@ -30,7 +30,7 @@ CFLAGS += $(PICFLAGS) -I. -IFLAC -libflac.a: ${OBJECTS} +libaudflac.a: ${OBJECTS} ${AR} cq $@ ${OBJECTS} include ../../../mk/objective.mk
--- a/src/flac/plugin_common/tags.c Sat Feb 24 16:36:25 2007 -0800 +++ b/src/flac/plugin_common/tags.c Sat Feb 24 17:09:19 2007 -0800 @@ -160,11 +160,6 @@ FLAC__bool FLAC_plugin__tags_get(const char *filename, FLAC__StreamMetadata **tags) { - /* NOTE vfs is not used here, so only try - to pick tags if you can do it with flac library stdio */ - if ( strncmp(filename,"/",1) ) - return false; - if(!FLAC__metadata_get_tags(filename, tags)) if(0 == (*tags = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT))) return false;
--- a/src/flac/tag.c Sat Feb 24 16:36:25 2007 -0800 +++ b/src/flac/tag.c Sat Feb 24 17:09:19 2007 -0800 @@ -93,11 +93,6 @@ char *title, *artist, *performer, *album, *date, *tracknumber, *genre, *description; gchar *filename_proxy; - /* NOTE vfs is not yet used here, so only try - to pick tags if you can do it with flac library stdio */ - if ( strncmp(filename,"/",1) ) - return NULL; - filename_proxy = g_strdup(filename); FLAC_plugin__tags_get(filename_proxy, &tags);