wardrobe: Removed internal last.fm scrobbling library

17 files changed, 1 insertions, 793 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11d3169..fa6fcde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ set (PACKAGE pianobar)
 project (${PACKAGE} C)
 
 add_subdirectory (libpiano)
-add_subdirectory (libwardrobe)
 add_subdirectory (libwaitress)
 add_subdirectory (libezxml)
 add_subdirectory (src)
diff --git a/contrib/config-example b/contrib/config-example
index e3742c0..b458e9f 100644
--- a/contrib/config-example
+++ b/contrib/config-example
@@ -6,11 +6,6 @@
 #user = your@user.name
 #password = password
 
-# last.fm scrobbling
-#lastfm_user = username
-#lastfm_password = password
-#lastfm_scrobble_percent = 50
-
 # Proxy (for those who are not living in the USA)
 #control_proxy = http://127.0.0.1:9090/
 
diff --git a/libwardrobe/AUTHORS b/libwardrobe/AUTHORS
deleted file mode 100644
index 09787cf..0000000
--- a/libwardrobe/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Main code:
-	Lars-Dominik Braun <PromyLOPh@lavabit.com>
diff --git a/libwardrobe/CMakeLists.txt b/libwardrobe/CMakeLists.txt
deleted file mode 100644
index 3cb92d7..0000000
--- a/libwardrobe/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required (VERSION 2.4)
-
-set (PACKAGE "libwardrobe")
-project (${PACKAGE} C)
-
-add_subdirectory (src)
diff --git a/libwardrobe/COPYING b/libwardrobe/COPYING
deleted file mode 100644
index db0c912..0000000
--- a/libwardrobe/COPYING
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2008-2010
-	Lars-Dominik Braun <PromyLOPh@lavabit.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-md5.c
-MD5 Message-Digest Algorithm: Copyright (c) 1991-1992 RSA Data Security, Inc.
diff --git a/libwardrobe/README b/libwardrobe/README
deleted file mode 100644
index ce03870..0000000
--- a/libwardrobe/README
+++ /dev/null
@@ -1,5 +0,0 @@
-libwardrobe
-===========
-
-libwardrobe handles track submissions to last.fm (scrobbling). It is part of
-the pianobar package.
diff --git a/libwardrobe/src/CMakeLists.txt b/libwardrobe/src/CMakeLists.txt
deleted file mode 100644
index 32fbe00..0000000
--- a/libwardrobe/src/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-set (CMAKE_C_FLAGS -Wall)
-
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-	${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src
-  ${CMAKE_CURRENT_BINARY_DIR} )
-
-add_library (wardrobe STATIC wardrobe.c md5.c)
-target_link_libraries (wardrobe waitress)
diff --git a/libwardrobe/src/config.h.in b/libwardrobe/src/config.h.in
deleted file mode 100644
index 60600a7..0000000
--- a/libwardrobe/src/config.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#define PACKAGE "${PACKAGE}"
diff --git a/libwardrobe/src/md5.c b/libwardrobe/src/md5.c
deleted file mode 100644
index b028451..0000000
--- a/libwardrobe/src/md5.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "md5.h"
-
-/* Constants for MD5Transform routine. */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-/* MD5 context. */
-typedef struct {
-	uint32_t state[4]; /* state (ABCD) */
-	uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */
-	unsigned char buffer[64]; /* input buffer */
-} MD5_CTX;
-
-static void MD5Init (MD5_CTX *);
-static void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
-static void MD5Final (unsigned char [16], MD5_CTX *);
-
-static void MD5Transform (uint32_t [4], unsigned char [64]);
-static void Encode (unsigned char *, uint32_t *, unsigned int);
-static void Decode (uint32_t *, unsigned char *, unsigned int);
-
-static unsigned char PADDING[64] = {
-  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* F, G, H and I are basic MD5 functions. */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits. */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-
-/*	MD5 initialization. Begins an MD5 operation, writing a new context.
- *	@param context
- */
-static void MD5Init (MD5_CTX *context) {
-	context->count[0] = context->count[1] = 0;
-	/* Load magic initialization constants. */
-	context->state[0] = 0x67452301;
-	context->state[1] = 0xefcdab89;
-	context->state[2] = 0x98badcfe;
-	context->state[3] = 0x10325476;
-}
-
-/*	MD5 block update operation. Continues an MD5 message-digest
- *	operation, processing another message block, and updating the
- *	context.
- *	@param context
- *	@param input block
- *	@param length of input block
- */
-static void MD5Update (MD5_CTX *context, unsigned char *input,
-		unsigned int inputLen) {
-	unsigned int i, index, partLen;
-
-	/* Compute number of bytes mod 64 */
-	index = (unsigned int)((context->count[0] >> 3) & 0x3F);
-
-	/* Update number of bits */
-	if ((context->count[0] += ((uint32_t) inputLen << 3)) <
-			((uint32_t)inputLen << 3)) {
-		context->count[1]++;
-	}
-	context->count[1] += ((uint32_t) inputLen >> 29);
-
-	partLen = 64 - index;
-
-	/* Transform as many times as possible. */
-	if (inputLen >= partLen) {
-		memcpy (&context->buffer[index], input, partLen);
-		MD5Transform (context->state, context->buffer);
-
-		for (i = partLen; i + 63 < inputLen; i += 64) {
-			MD5Transform (context->state, &input[i]);
-		}
-
-		index = 0;
-	} else {
-		i = 0;
-	}
-
-	/* Buffer remaining input */
-	memcpy (&context->buffer[index], &input[i], inputLen-i);
-}
-
-/*	MD5 finalization. Ends an MD5 message-digest operation, writing the
- *	the message digest and zeroizing the context.
- *	@param message digest
- *	@param context
- */
-static void MD5Final (unsigned char digest[16], MD5_CTX *context) {
-	unsigned char bits[8];
-	unsigned int index, padLen;
-
-	/* Save number of bits */
-	Encode (bits, context->count, 8);
-
-	/* Pad out to 56 mod 64. */
-	index = (unsigned int) ((context->count[0] >> 3) & 0x3f);
-	padLen = (index < 56) ? (56 - index) : (120 - index);
-	MD5Update (context, PADDING, padLen);
-
-	/* Append length (before padding) */
-	MD5Update (context, bits, 8);
-	/* Store state in digest */
-	Encode (digest, context->state, 16);
-
-	/* Zeroize sensitive information. */
-	memset (context, 0, sizeof (*context));
-}
-
-/* MD5 basic transformation. Transforms state based on block. */
-static void MD5Transform (uint32_t state[4],
-		unsigned char block[64]) {
-	uint32_t a = state[0], b = state[1], c = state[2],
-			d = state[3], x[16];
-
-	Decode (x, block, 64);
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-
-	state[0] += a;
-	state[1] += b;
-	state[2] += c;
-	state[3] += d;
-
-	/* Zeroize sensitive information. */
-	memset (x, 0, sizeof (x));
-}
-
-/*	Encodes input (UINT4) into output (unsigned char). Assumes len is
- *	a multiple of 4.
- */
-static void Encode (unsigned char *output, uint32_t *input,
-		unsigned int len) {
-	unsigned int i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4) {
-		output[j] = (unsigned char)(input[i] & 0xff);
-		output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
-		output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
-		output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
-	}
-}
-
-/*	Decodes input (unsigned char) into output (UINT4). Assumes len is
- *	a multiple of 4.
- */
-static void Decode (uint32_t *output, unsigned char *input,
-		unsigned int len) {
-	unsigned int i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4) {
-		output[i] = ((uint32_t)input[j]) |
-				(((uint32_t)input[j+1]) << 8) |
-				(((uint32_t)input[j+2]) << 16) |
-				(((uint32_t)input[j+3]) << 24);
-	}
-}
-
-char *WardrobeMd5Calc (char *string) {
-	MD5_CTX context;
-	unsigned char digest[16];
-	size_t i;
-	char *ret = calloc (WARDROBE_MD5_DIGEST_LEN + 1, sizeof (*ret));
-	
-	MD5Init (&context);
-	MD5Update (&context, (unsigned char *) string, strlen (string));
-	MD5Final (digest, &context);
-
-	for (i = 0; i < 16; i++) {
-		snprintf (ret+i*2, 2 + 1, "%02x", digest[i]);
-	}
-	return ret;
-}
-
diff --git a/libwardrobe/src/md5.h b/libwardrobe/src/md5.h
deleted file mode 100644
index acf24b6..0000000
--- a/libwardrobe/src/md5.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright (c) 2008-2010
-	Lars-Dominik Braun <PromyLOPh@lavabit.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#define WARDROBE_MD5_DIGEST_LEN 32
-
-char *WardrobeMd5Calc (char *string);
-
diff --git a/libwardrobe/src/wardrobe.c b/libwardrobe/src/wardrobe.c
deleted file mode 100644
index bcde316..0000000
--- a/libwardrobe/src/wardrobe.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-Copyright (c) 2008-2010
-	Lars-Dominik Braun <PromyLOPh@lavabit.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <waitress.h>
-
-#include "wardrobe.h"
-#include "md5.h"
-#include "config.h"
-
-#define WARDROBE_HTTP_SEND_SIZE 10*1024
-#define WARDROBE_URL_SIZE 1024
-
-/*	Initialize song structure
- *	@param wardrobe sond
- */
-inline void WardrobeSongInit (WardrobeSong_t *ws) {
-	memset (ws, 0, sizeof (*ws));
-}
-
-/*	initialize wardrobe handle (setup waitress, e.g.)
- *	@param wardrobe handle
- */
-inline void WardrobeInit (WardrobeHandle_t *wh) {
-	memset (wh, 0, sizeof (*wh));
-	WaitressInit (&wh->waith);
-}
-
-/*	free () replacement that does some checks and zeros memory
- *	@param pointer
- *	@param size or 0 to disable zeroing
- */
-void WardrobeFree (void *ptr, size_t size) {
-	if (ptr != NULL) {
-		if (size > 0) {
-			memset (ptr, 0, size);
-		}
-		free (ptr);
-	}
-}
-
-/*	cleanup song
- *	@param song
- */
-void WardrobeSongDestroy (WardrobeSong_t *ws) {
-	WardrobeFree (ws->artist, 0);
-	WardrobeFree (ws->title, 0);
-	WardrobeFree (ws->album, 0);
-	memset (ws, 0, sizeof (*ws));
-}
-
-/*	cleanup wardrobe handle
- *	@param initialized wardrobe handle
- */
-void WardrobeDestroy (WardrobeHandle_t *wh) {
-	WardrobeFree (wh->user, 0);
-	WardrobeFree (wh->password, 0);
-	WaitressFree (&wh->waith);
-	memset (wh, 0, sizeof (*wh));
-}
-
-/*	get session id from last.fm; you don't have to call this manually
- *	@param wardrobe handle
- *	@return _OK or error
- */
-static WardrobeReturn_t WardrobeHandshake (WardrobeHandle_t *wh) {
-	/* md5 hash length + long integer max + NULL */
-	char url[WARDROBE_URL_SIZE], tmp[32+55+1], *tmpDigest, *pwDigest,
-			*ret, postUrl[1024];
-	WardrobeReturn_t fRet = WARDROBE_RET_ERR;
-	time_t currTStamp = time (NULL);
-
-	tmpDigest = WardrobeMd5Calc (wh->password);
-	snprintf (tmp, sizeof (tmp), "%s%li", tmpDigest, currTStamp);
-	pwDigest = WardrobeMd5Calc (tmp);
-	snprintf (url, sizeof (url), "/?hs=true&p=1.2&c=pia&v=1.0&u=%s&t=%li&a=%s",
-			wh->user, currTStamp, pwDigest);
-	
-	WaitressSetHPP (&wh->waith, "post.audioscrobbler.com", "80", url);
-	wh->waith.method = WAITRESS_METHOD_GET;
-	wh->waith.postData = NULL;
-	wh->waith.extraHeaders = NULL;
-	if (WaitressFetchBuf (&wh->waith, &ret) != WAITRESS_RET_OK) {
-		return WARDROBE_RET_CONNECT_ERR;
-	}
-
-	/* parse answer */
-	if (memcmp (ret, "OK", 2) == 0) {
-		char *newlines[5];
-		size_t i;
-		newlines[0] = ret;
-		/* split string */
-		for (i = 1; i < sizeof (newlines) / sizeof (*newlines); i++) {
-			newlines[i] = strchr (newlines[i-1]+1, '\n');
-		}
-		/* copy needed values (auth token and post url) */
-		if (newlines[2] - newlines[1]-1 < sizeof (wh->authToken)) {
-			memcpy (wh->authToken, newlines[1]+1, newlines[2] -
-					newlines[1]-1);
-		} else {
-			printf ("buffer overflow!\n");
-		}
-		if (newlines[4] - newlines[3]-1 < sizeof (postUrl)) {
-			memset (postUrl, 0, sizeof (postUrl));
-			memcpy (postUrl, newlines[3]+1, newlines[4] -
-					newlines[3]-1);
-			WaitressSplitUrl (postUrl, wh->postHost, sizeof (wh->postHost),
-					wh->postPort, sizeof (wh->postPort), wh->postPath,
-					sizeof (wh->postPath));
-		} else {
-			printf ("buffer overflow!\n");
-		}
-		fRet = WARDROBE_RET_OK;
-	} else if (memcmp (ret, "BADAUTH", 7) == 0) {
-		fRet = WARDROBE_RET_BADAUTH;
-	} else if (memcmp (ret, "BADTIME", 7) == 0) {
-		fRet = WARDROBE_RET_BADTIME;
-	} else if (memcmp (ret, "BANNED", 6) == 0) {
-		fRet = WARDROBE_RET_CLIENT_BANNED;
-	}
-
-	WardrobeFree (tmpDigest, WARDROBE_MD5_DIGEST_LEN);
-	WardrobeFree (pwDigest, WARDROBE_MD5_DIGEST_LEN);
-	WardrobeFree (ret, 0);
-
-	return fRet;
-}
-
-/*	_really_ submit song to last.fm
- *	@param wardrobe handle
- *	@param song
- *	@return _OK or error
- */
-static WardrobeReturn_t WardrobeSendSong (WardrobeHandle_t *wh,
-		const WardrobeSong_t *ws) {
-	char postContent[WARDROBE_HTTP_SEND_SIZE];
-	char *urlencArtist, *urlencTitle, *urlencAlbum, *ret;
-	WardrobeReturn_t fRet = WARDROBE_RET_ERR;
-
-	urlencArtist = WaitressUrlEncode (ws->artist);
-	urlencTitle = WaitressUrlEncode (ws->title);
-	urlencAlbum = WaitressUrlEncode (ws->album);
-
-	snprintf (postContent, sizeof (postContent), "s=%s&a[0]=%s&t[0]=%s&"
-			"i[0]=%li&o[0]=E&r[0]=&l[0]=%li&b[0]=%s&n[0]=&m[0]=",
-			wh->authToken, urlencArtist, urlencTitle, ws->started,
-			ws->length, urlencAlbum);
-
-	WaitressSetHPP (&wh->waith, wh->postHost, wh->postPort, wh->postPath);
-	wh->waith.method = WAITRESS_METHOD_POST;
-	wh->waith.postData = postContent;
-	wh->waith.extraHeaders = "Content-Type: application/x-www-form-urlencoded\r\n";
-	if (WaitressFetchBuf (&wh->waith, &ret) != WAITRESS_RET_OK) {
-		return WARDROBE_RET_CONNECT_ERR;
-	}
-
-	if (memcmp (ret, "OK", 2) == 0) {
-		fRet = WARDROBE_RET_OK;
-	} else if (memcmp (ret, "BADSESSION", 10) == 0) {
-		fRet = WARDROBE_RET_BADSESSION;
-	}
-
-	WardrobeFree (urlencArtist, 0);
-	WardrobeFree (urlencTitle, 0);
-	WardrobeFree (urlencAlbum, 0);
-	WardrobeFree (ret, 0);
-
-	return fRet;
-}
-
-/*	submit played track to last.fm
- *	@public yes
- *	@param wardrobe handle
- *	@param song data
- *	@return _OK or error
- */
-WardrobeReturn_t WardrobeSubmit (WardrobeHandle_t *wh,
-		const WardrobeSong_t *ws) {
-	size_t i;
-	WardrobeReturn_t fRet = WARDROBE_RET_ERR;
-
-	if (strlen (wh->authToken) <= 0 && (fRet = WardrobeHandshake (wh)) !=
-			WARDROBE_RET_OK) {
-		return fRet;
-	}
-	for (i = 0; i < 2; i++) {
-		fRet = WardrobeSendSong (wh, ws);
-		if (fRet == WARDROBE_RET_OK) {
-			return WARDROBE_RET_OK;
-		} else if (fRet == WARDROBE_RET_BADSESSION &&
-				(fRet = WardrobeHandshake (wh)) != WARDROBE_RET_OK) {
-			return fRet;
-		}
-	}
-	return fRet;
-}
-
-/*	error string
- *	@param error int
- *	@return human readable error string or NULL on error
- */
-const char *WardrobeErrorToString (WardrobeReturn_t ret) {
-	switch (ret) {
-		case WARDROBE_RET_ERR:
-			return "Unknown error.";
-			break;
-
-		case WARDROBE_RET_OK:
-			return "Everything's fine :)";
-			break;
-
-		case WARDROBE_RET_CLIENT_BANNED:
-			return "Client banned. Try to update your software.";
-			break;
-			
-		case WARDROBE_RET_BADAUTH:
-			return "Wrong username or password.";
-			break;
-		
-		case WARDROBE_RET_BADTIME:
-			return "System time wrong. Check your system time and "
-					"correct it.";
-			break;
-		
-		case WARDROBE_RET_BADSESSION:
-			return "Bad session. Try to login again.";
-			break;
-
-		case WARDROBE_RET_CONNECT_ERR:
-			return "Connection failed.";
-			break;
-
-		default:
-			return "Unknown Error.";
-			break;
-	}
-}
-
diff --git a/libwardrobe/src/wardrobe.h b/libwardrobe/src/wardrobe.h
deleted file mode 100644
index 999380c..0000000
--- a/libwardrobe/src/wardrobe.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2008-2010
-	Lars-Dominik Braun <PromyLOPh@lavabit.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <waitress.h>
-
-typedef struct {
-	char *user;
-	char *password;
-	char authToken[100];
-	char postHost[50];
-	char postPort[6];
-	char postPath[100];
-	WaitressHandle_t waith;
-} WardrobeHandle_t;
-
-typedef struct {
-	char *artist;
-	char *title;
-	char *album;
-	time_t started;
-	time_t length;
-} WardrobeSong_t;
-
-typedef enum {WARDROBE_RET_ERR, WARDROBE_RET_OK,
-		WARDROBE_RET_CLIENT_BANNED, WARDROBE_RET_BADAUTH,
-		WARDROBE_RET_BADTIME, WARDROBE_RET_BADSESSION,
-		WARDROBE_RET_CONNECT_ERR} WardrobeReturn_t;
-
-void WardrobeInit (WardrobeHandle_t *wh);
-void WardrobeSongInit (WardrobeSong_t *ws);
-void WardrobeSongDestroy (WardrobeSong_t *ws);
-void WardrobeDestroy (WardrobeHandle_t *wh);
-WardrobeReturn_t WardrobeSubmit (WardrobeHandle_t *wh,
-		const WardrobeSong_t *ws);
-const char *WardrobeErrorToString (WardrobeReturn_t ret);
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1de583..1357510 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,7 +59,6 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
 
 include_directories (
 	${pianobar_SOURCE_DIR}/libpiano/src
-	${pianobar_SOURCE_DIR}/libwardrobe/src
 	${pianobar_SOURCE_DIR}/libwaitress/src
 	${CMAKE_CURRENT_BINARY_DIR}
 	${FAAD_INCLUDE_DIRS} ${LIBAO_INCLUDE_DIRS}
@@ -67,7 +66,7 @@ include_directories (
 
 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 ${FAAD_LIBRARIES}
+target_link_libraries (pianobar piano waitress ${FAAD_LIBRARIES}
 	${LIBAO_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MAD_LIBRARIES} ${LIBM})
 
 install (TARGETS pianobar RUNTIME DESTINATION ${BIN_INSTALL_DIR})
diff --git a/src/main.c b/src/main.c
index d842179..b7f6235 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,10 +38,6 @@ THE SOFTWARE.
 #include <fcntl.h>
 /* tcset/getattr () */
 #include <termios.h>
-
-/* last.fm scrobbling library */
-#include <wardrobe.h>
-
 #include <pthread.h>
 
 /* pandora.com library */
@@ -61,12 +57,10 @@ int main (int argc, char **argv) {
 	static struct audioPlayer player;
 	BarSettings_t settings;
 	pthread_t playerThread;
-	WardrobeHandle_t wh;
 	/* playlist; first item is current song */
 	PianoSong_t *playlist = NULL;
 	PianoSong_t *songHistory = NULL;
 	PianoStation_t *curStation = NULL;
-	WardrobeSong_t scrobbleSong;
 	char doQuit = 0;
 	/* FIXME: max path length? */
 	char ctlPath[1024];
@@ -88,7 +82,6 @@ int main (int argc, char **argv) {
 	/* init some things */
 	ao_initialize ();
 	PianoInit (&ph);
-	WardrobeInit (&wh);
 	BarSettingsInit (&settings);
 	BarSettingsRead (&settings);
 
@@ -122,11 +115,6 @@ int main (int argc, char **argv) {
 		settings.password = strdup (passBuf);
 	}
 
-	if (settings.enableScrobbling) {
-		wh.user = strdup (settings.lastfmUser);
-		wh.password = strdup (settings.lastfmPassword);
-	}
-
 	/* setup control connection */
 	if (settings.controlProxy != NULL) {
 		char tmpPath[2];
@@ -171,24 +159,6 @@ int main (int argc, char **argv) {
 	while (!doQuit) {
 		/* song finished playing, clean up things/scrobble song */
 		if (player.mode == PLAYER_FINISHED_PLAYBACK) {
-			scrobbleSong.length = player.songDuration / BAR_PLAYER_MS_TO_S_FACTOR;
-			/* scrobble when >= nn% are played; use seconds, not
-			 * milliseconds */
-			if (scrobbleSong.length > 0 && settings.enableScrobbling &&
-					player.songPlayed / BAR_PLAYER_MS_TO_S_FACTOR * 100 /
-					scrobbleSong.length >= settings.lastfmScrobblePercent) {
-				WardrobeReturn_t wRet;
-
-				BarUiMsg (MSG_INFO, "Scrobbling song... ");
-				if ((wRet = WardrobeSubmit (&wh, &scrobbleSong)) ==
-						WARDROBE_RET_OK) {
-					BarUiMsg (MSG_NONE, "Ok.\n");
-				} else {
-					BarUiMsg (MSG_ERR, "Error: %s\n",
-							WardrobeErrorToString (wRet));
-				}
-			}
-			WardrobeSongDestroy (&scrobbleSong);
 			/* FIXME: pthread_join blocks everything if network connection
 			 * is hung up e.g. */
 			void *threadRet;
@@ -263,14 +233,6 @@ int main (int argc, char **argv) {
 					if (playlist->audioUrl == NULL) {
 						BarUiMsg (MSG_ERR, "Invalid song url.\n");
 					} else {
-						/* setup artist and song name for scrobbling (playlist
-						 * may be NULL later) */
-						WardrobeSongInit (&scrobbleSong);
-						scrobbleSong.artist = strdup (playlist->artist);
-						scrobbleSong.title = strdup (playlist->title);
-						scrobbleSong.album = strdup (playlist->album);
-						scrobbleSong.started = time (NULL);
-
 						/* setup player */
 						memset (&player, 0, sizeof (player));
 
@@ -359,7 +321,6 @@ int main (int argc, char **argv) {
 	PianoDestroy (&ph);
 	PianoDestroyPlaylist (songHistory);
 	PianoDestroyPlaylist (playlist);
-	WardrobeDestroy (&wh);
 	ao_shutdown();
 	BarSettingsDestroy (&settings);
 
diff --git a/src/pianobar.1 b/src/pianobar.1
index ffd6d1c..e7dbcfe 100644
--- a/src/pianobar.1
+++ b/src/pianobar.1
@@ -145,20 +145,6 @@ File that is executed when event occurs. See section
 Keep a history of the last n songs (5, by default). You can rate these songs.
 
 .TP
-.B lastfm_user = your_username
-If you want to send your played songs to last.fm set this to your last.fm
-username.
-
-.TP
-.B lastfm_password = plain_password
-A password is needed too if you want to scrobble your played song.
-
-.TP
-.B lastfm_scrobble_percent = 50-100
-When should a track be submitted to last.fm. Percent value. Don't append
-percent sign, do not set larger than 90 to ensure all songs are scrobbled.
-
-.TP
 .B password = plaintext_password
 Your pandora.com password. Plain-text.
 
diff --git a/src/settings.c b/src/settings.c
index 1136a3a..4ac2fea 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -74,8 +74,6 @@ void BarSettingsDestroy (BarSettings_t *settings) {
 	free (settings->controlProxy);
 	free (settings->username);
 	free (settings->password);
-	free (settings->lastfmUser);
-	free (settings->lastfmPassword);
 	free (settings->autostartStation);
 	free (settings->eventCmd);
 	memset (settings, 0, sizeof (*settings));
@@ -136,12 +134,6 @@ void BarSettingsRead (BarSettings_t *settings) {
 			settings->username = strdup (val);
 		} else if (strcmp ("password", key) == 0) {
 			settings->password = strdup (val);
-		} else if (strcmp ("lastfm_user", key) == 0) {
-			settings->lastfmUser = strdup (val);
-		} else if (strcmp ("lastfm_password", key) == 0) {
-			settings->lastfmPassword = strdup (val);
-		} else if (strcmp ("lastfm_scrobble_percent", key) == 0) {
-			settings->lastfmScrobblePercent = atoi (val);
 		} else if (memcmp ("act_", key, 4) == 0) {
 			/* keyboard shortcuts */
 			for (i = 0; i < BAR_KS_COUNT; i++) {
@@ -167,17 +159,5 @@ void BarSettingsRead (BarSettings_t *settings) {
 		}
 	}
 
-	/* some checks */
-	/* last.fm requests tracks to be played at least 50% */
-	if (settings->lastfmScrobblePercent < 50 ||
-			settings->lastfmScrobblePercent > 100) {
-		settings->lastfmScrobblePercent = 50;
-	}
-
-	/* only scrobble tracks if username and password are set */
-	if (settings->lastfmUser != NULL && settings->lastfmPassword != NULL) {
-		settings->enableScrobbling = 1;
-	}
-
 	fclose (configfd);
 }
diff --git a/src/settings.h b/src/settings.h
index 4ecc7b2..6185b93 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -66,10 +66,6 @@ typedef struct {
 	char *username;
 	char *password;
 	char *controlProxy; /* non-american listeners need this */
-	char *lastfmUser;
-	char *lastfmPassword;
-	unsigned char lastfmScrobblePercent;
-	char enableScrobbling;
 	char keys[BAR_KS_COUNT];
 	PianoAudioFormat_t audioFormat;
 	char *autostartStation;