diff options
| author | phintuka <phintuka> | 2008-10-28 10:37:03 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2008-10-28 10:37:03 +0000 |
| commit | 0d8aab2bd9b1b873042e84de08734d6926df7b61 (patch) | |
| tree | f4ec6f9c2a189f1881df83843af61267167b117c /tools | |
| parent | 5f176ad057871366d508a06a6f5b75ed759d4172 (diff) | |
| download | xineliboutput-0d8aab2bd9b1b873042e84de08734d6926df7b61.tar.gz xineliboutput-0d8aab2bd9b1b873042e84de08734d6926df7b61.tar.bz2 | |
Build system upgrade:
HAVE_EXTRACTOR_H -> HAVE_LIBEXTRACTOR
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/metainfo_menu.c | 6 | ||||
| -rw-r--r-- | tools/playlist.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/metainfo_menu.c b/tools/metainfo_menu.c index 746da1fe..b08f8323 100644 --- a/tools/metainfo_menu.c +++ b/tools/metainfo_menu.c @@ -4,11 +4,11 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: metainfo_menu.c,v 1.4 2008-05-22 10:44:23 phintuka Exp $ + * $Id: metainfo_menu.c,v 1.5 2008-10-28 10:37:03 phintuka Exp $ * */ -#ifdef HAVE_EXTRACTOR_H +#ifdef HAVE_LIBEXTRACTOR # include <extractor.h> #endif @@ -42,7 +42,7 @@ void cMetainfoMenu::Display(void) char metadata[4096]; metadata[0] = 0; -#ifdef HAVE_EXTRACTOR_H +#ifdef HAVE_LIBEXTRACTOR EXTRACTOR_ExtractorList * plugins; EXTRACTOR_KeywordList * md_list; plugins = EXTRACTOR_loadDefaultLibraries(); diff --git a/tools/playlist.c b/tools/playlist.c index 1e2d4b80..8f38a8b5 100644 --- a/tools/playlist.c +++ b/tools/playlist.c @@ -4,18 +4,18 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: playlist.c,v 1.18 2008-07-14 07:57:24 phintuka Exp $ + * $Id: playlist.c,v 1.19 2008-10-28 10:37:02 phintuka Exp $ * */ #include <stdlib.h> -#ifdef HAVE_EXTRACTOR_H +#ifdef HAVE_LIBEXTRACTOR # include <extractor.h> // libextractor 0.5.20 (2008-03-20) adds support for track numbers # if EXTRACTOR_VERSION < 0x00052000 # warning libextractor version too old (0.5.20 required for track numbers) -# undef HAVE_EXTRACTOR_H +# undef HAVE_LIBEXTRACTOR # endif #endif @@ -107,7 +107,7 @@ int cPlaylistItem::Compare(const cListObject &ListObject) const // cID3Scanner // -#ifndef HAVE_EXTRACTOR_H +#ifndef HAVE_LIBEXTRACTOR static const char *shell_escape(char *buf, int buflen, const cString& src, char ch) { const char *pt = *src; @@ -161,7 +161,7 @@ class cID3Scanner : public cThread if(xc.IsAudioFile(Item->Filename)) { LOGDBG("Scanning metainfo for file %s", *Item->Filename); -#ifdef HAVE_EXTRACTOR_H +#ifdef HAVE_LIBEXTRACTOR EXTRACTOR_ExtractorList * plugins; EXTRACTOR_KeywordList * md_list; plugins = EXTRACTOR_loadDefaultLibraries(); |
