From a34feb431bb9a8bef76fc1e069c73ded48b1f4cc Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sat, 11 Jul 2009 15:13:02 +0200
Subject: piano: Switched to ezxml

Removes libxml2 bloat and (hopefully) most of the buggy/ugly xml code.
---
 src/CMakeLists.txt | 7 ++-----
 src/main.c         | 5 -----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a776d7..eb14a3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,6 @@ set (ENABLE_FAAD 0)
 option (USE_FAAD "Use libfaad for aac decoding (if available)" on)
 option (USE_MAD "Use libmad for mp3 decoding (if available)" on)
 
-find_package (LibXml2 REQUIRED)
 find_package (LibAo REQUIRED)
 
 # find threading implementation
@@ -55,15 +54,13 @@ include_directories (
 	${pianobar_SOURCE_DIR}/libpiano/src
 	${pianobar_SOURCE_DIR}/libwardrobe/src
 	${pianobar_SOURCE_DIR}/libwaitress/src
-	${LIBXML2_INCLUDE_DIR}
 	${FAAD_INCLUDE_DIRS} ${LIBAO_INCLUDE_DIRS}
 	${MAD_INCLUDE_DIRS})
 
 add_executable (pianobar main.c terminal.c settings.c player.c ui.c ui_act.c
 	ui_readline.c)
-target_link_libraries (pianobar piano wardrobe waitress
-	${LIBXML2_LIBRARIES} ${FAAD_LIBRARY} ${LIBAO_LIBRARY}
-	${CMAKE_THREAD_LIBS_INIT} ${MAD_LIBRARIES} ${LIBM})
+target_link_libraries (pianobar piano wardrobe waitress ${FAAD_LIBRARY}
+	${LIBAO_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MAD_LIBRARIES} ${LIBM})
 
 install (TARGETS pianobar RUNTIME DESTINATION bin)
 install (FILES pianobar.1 DESTINATION share/man/man1)
diff --git a/src/main.c b/src/main.c
index e9d0152..3617110 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,9 +39,6 @@ THE SOFTWARE.
 /* last.fm scrobbling library */
 #include <wardrobe.h>
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 #include <pthread.h>
 
 /* pandora.com library */
@@ -85,7 +82,6 @@ int main (int argc, char **argv) {
 
 	BarTermSetEcho (0);
 	/* init some things */
-	xmlInitParser ();
 	ao_initialize ();
 	PianoInit (&ph);
 	WardrobeInit (&wh);
@@ -310,7 +306,6 @@ int main (int argc, char **argv) {
 	PianoDestroy (&ph);
 	WardrobeDestroy (&wh);
 	ao_shutdown();
-	xmlCleanupParser ();
 	BarSettingsDestroy (&settings);
 
 	/* restore terminal attributes, zsh doesn't need this, bash does... */
-- 
cgit v1.2.3