claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove id3 support from the plugins

Browse Source
This commit is contained in:
Josh Coalson
2004-09-28 00:23:57 +00:00
parent 47297ce8e7
commit e31d9eb05c
27 changed files with 23 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugin_xmms/Makefile.am
View File

@@ -25,9 +25,9 @@ EXTRA_DIST = \
noinst_HEADERS = \
charset.h \
configure.h \
wrap_id3.h
tag.h
CFLAGS = @CFLAGS@ @ID3LIB_CFLAGS@ @XMMS_CFLAGS@
CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins
@@ -40,13 +40,9 @@ LIBTOOL = $(top_builddir)/libtool-disable-static
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
plugin_sources = charset.c configure.c plugin.c wrap_id3.c fileinfo.c
plugin_sources = charset.c configure.c plugin.c tag.c fileinfo.c
if FLaC__HAS_ID3LIB
libxmms_flac_la_SOURCES = $(plugin_sources)
else
libxmms_flac_la_SOURCES = $(plugin_sources)
endif
# work around the bug in libtool where its relinking fails with a different DESTDIR
# for libtool bug info see:
@@ -64,6 +60,5 @@ libxmms_flac_la_LIBADD = \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-L$(top_builddir)/src/libFLAC/.libs \
@XMMS_LIBS@ \
@ID3LIB_LIBS@
@XMMS_LIBS@
libxmms_flac_la_LDFLAGS = -module -avoid-version

4
src/plugin_xmms/Makefile.lite
View File

@@ -24,14 +24,14 @@ topdir = ../..
LIB_NAME = libxmms-flac
INCLUDES = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I..
# refer to the static libs explicitly
LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a $(HOME)/local/lib/libid3.a -lstdc++ -lz
LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -lstdc++ -lz
SRCS_C = \
charset.c \
configure.c \
plugin.c \
fileinfo.c \
wrap_id3.c
tag.c
include $(topdir)/build/lib.mk

1
src/plugin_xmms/fileinfo.c
View File

@@ -19,6 +19,7 @@
*/
#include <stdlib.h>
#include <string.h> /* for strlen() */
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

2
src/plugin_xmms/plugin.c
View File

@@ -40,8 +40,8 @@
#include "share/grabbag.h"
#include "share/replaygain_synthesis.h"
#include "configure.h"
#include "wrap_id3.h"
#include "charset.h"
#include "tag.h"
#ifdef min
#undef min

3
src/plugin_xmms/wrap_id3.c → src/plugin_xmms/tag.c
View File

@@ -30,6 +30,7 @@
#include "FLAC/metadata.h"
#include "plugin_common/canonical_tag.h"
#include "plugin_common/vorbiscomment.h"
#include "charset.h"
#include "configure.h"
@@ -103,7 +104,7 @@ char *flac_format_song_title(char *filename)
FLAC_plugin__canonical_tag_init(&tag);
FLAC_plugin__canonical_tag_get_combined(filename, &tag, /*sep=*/0);
FLAC_plugin__vorbiscomment_get(filename, &tag, /*sep=*/0);
title = local__getfield(&tag, L"TITLE");
artist = local__getfield(&tag, L"ARTIST");

4
src/plugin_xmms/wrap_id3.h → src/plugin_xmms/tag.h
View File

@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __FLAC_ID3_H__
#define __FLAC_ID3_H__
#ifndef __FLAC__PLUGIN_XMMS__TAG_H__
#define __FLAC__PLUGIN_XMMS__TAG_H__
gchar *flac_format_song_title(gchar * filename);