X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmpd.c;h=ec929b7906a59a097d025f55b9dbc2cbb17b705b;hb=3293e076c500eef4ca11a72bfb6954412c341228;hp=56d72b485a3c4c2f3023d4788f5094442440aac0;hpb=c16e2a66fee72013c537e8c5e9083cefdea73c51;p=monky

diff --git a/src/mpd.c b/src/mpd.c
index 56d72b4..ec929b7 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
@@ -7,7 +9,8 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
+ *	(see AUTHORS)
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,226 +23,393 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id$
  */
 
 #include "conky.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "logging.h"
+#include "timed_thread.h"
+#include "timeinfo.h"
 #include "libmpdclient.h"
+#include "mpd.h"
+
+/* server connection data */
+static char mpd_host[128];
+static char mpd_password[128];
+static int mpd_port;
+
+/* this is >0 if the current password was set from MPD_HOST */
+static int mpd_environment_password = 0;
+
+/* global mpd information */
+static struct mpd_s mpd_info;
+
+/* number of users of the above struct */
+static int refcount = 0;
+
+void mpd_set_host(const char *host)
+{
+	snprintf(mpd_host, 128, "%s", host);
+
+	if (mpd_environment_password) {
+		/* for security, dont use environment password when user specifies host in config */
+		mpd_clear_password();
+	}
+}
+void mpd_set_password(const char *password, int from_environment)
+{
+	snprintf(mpd_password, 128, "%s", password);
+	mpd_environment_password = from_environment;
+}
+void mpd_clear_password(void)
+{
+	*mpd_password = '\0';
+	mpd_environment_password = 0;
+}
+int mpd_set_port(const char *port)
+{
+	int val;
+
+	val = strtol(port, 0, 0);
+	if (val < 1 || val > 0xffff)
+		return 1;
+	mpd_port = val;
+	return 0;
+}
+
+void init_mpd(void)
+{
+	if (!(refcount++))	/* first client */
+		memset(&mpd_info, 0, sizeof(mpd_info));
+}
+
+struct mpd_s *mpd_get_info(void)
+{
+	return &mpd_info;
+}
+
+static void clear_mpd(void)
+{
+#define xfree(x) if (x) free(x)
+	xfree(mpd_info.title);
+	xfree(mpd_info.artist);
+	xfree(mpd_info.album);
+	/* do not free() the const char *status! */
+	/* do not free() the const char *random! */
+	/* do not free() the const char *repeat! */
+	xfree(mpd_info.track);
+	xfree(mpd_info.name);
+	xfree(mpd_info.file);
+#undef xfree
+	memset(&mpd_info, 0, sizeof(struct mpd_s));
+}
+
+void free_mpd(void)
+{
+	if (!(--refcount))	/* last client */
+		clear_mpd();
+}
+
+static void *update_mpd_thread(void *) __attribute__((noreturn));
+
+int update_mpd(void)
+{
+	int interval;
+	static timed_thread *thread = NULL;
+
+	if (thread)
+		return 0;
+
+	interval = info.music_player_interval * 1000000;
+	thread = timed_thread_create(&update_mpd_thread, &thread, interval);
+	if (!thread) {
+		NORM_ERR("Failed to create MPD timed thread");
+		return 0;
+	}
+	timed_thread_register(thread, &thread);
+	if (timed_thread_run(thread))
+		NORM_ERR("Failed to run MPD timed thread");
+	return 0;
+}
+
+/* stringMAXdup dups at most text_buffer_size bytes */
+#define strmdup(x) strndup(x, text_buffer_size - 1)
+
+static void *update_mpd_thread(void *arg)
+{
+	static mpd_Connection *conn = NULL;
+	mpd_Status *status;
+	mpd_InfoEntity *entity;
+	timed_thread *me = *(timed_thread **)arg;
+	const char *emptystr = "";
 
-timed_thread *mpd_timed_thread = NULL;
-
-void clear_mpd_stats(struct information *current_info)
-{
-	if (current_info->mpd.artist == NULL)
-		current_info->mpd.artist = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.album == NULL)
-		current_info->mpd.album = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.title == NULL)
-		current_info->mpd.title = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.random == NULL)
-		current_info->mpd.random = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.repeat == NULL)
-		current_info->mpd.repeat = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.track == NULL)
-		current_info->mpd.track = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.status == NULL)
-		current_info->mpd.status = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.name == NULL)
-		current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
-	if (current_info->mpd.file == NULL)
-		current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
-
-	*current_info->mpd.name=0;
-	*current_info->mpd.file=0;
-	*current_info->mpd.artist=0;
-	*current_info->mpd.album=0;
-	*current_info->mpd.title=0;
-	*current_info->mpd.random=0;
-	*current_info->mpd.repeat=0;
-	*current_info->mpd.track=0;
-	*current_info->mpd.status=0;
-	current_info->mpd.bitrate = 0;
-	current_info->mpd.progress = 0;
-	current_info->mpd.elapsed = 0;
-	current_info->mpd.length = 0;
-}
-
-void *update_mpd(void)
-{
-	struct information *current_info = &info;
 	while (1) {
-		if (!current_info->conn) {
-			current_info->conn = mpd_newConnection(current_info->mpd.host, current_info->mpd.port, 10);
-		}
-		if (strlen(current_info->mpd.password) > 1) {
-			mpd_sendPasswordCommand(current_info->conn,
-					current_info->mpd.password);
-			mpd_finishCommand(current_info->conn);
+		if (!conn)
+			conn = mpd_newConnection(mpd_host, mpd_port, 10);
+
+		if (*mpd_password) {
+			mpd_sendPasswordCommand(conn, mpd_password);
+			mpd_finishCommand(conn);
 		}
 
-		if (current_info->conn->error || current_info->conn == NULL) {
-			//ERR("%MPD error: s\n", current_info->conn->errorStr);
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
+		timed_thread_lock(me);
 
-			strncpy(current_info->mpd.status, "MPD not responding",	TEXT_BUFFER_SIZE - 1);
-			if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
-			continue;
-		}
+		if (conn->error || conn == NULL) {
+			NORM_ERR("MPD error: %s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			clear_mpd();
 
-		timed_thread_lock(mpd_timed_thread);
-		mpd_Status *status;
-		mpd_InfoEntity *entity;
-		mpd_sendCommandListOkBegin(current_info->conn);
-		mpd_sendStatusCommand(current_info->conn);
-		mpd_sendCurrentSongCommand(current_info->conn);
-		mpd_sendCommandListEnd(current_info->conn);
-		if ((status = mpd_getStatus(current_info->conn)) == NULL) {
-			//ERR("MPD error: %s\n", current_info->conn->errorStr);
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
-
-			strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
-			timed_thread_unlock(mpd_timed_thread);
-			if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
+			mpd_info.status = "MPD not responding";
+			timed_thread_unlock(me);
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
 			continue;
 		}
 
-		current_info->mpd.volume = status->volume;
-		//if (status->error)
-		//printf("error: %s\n", status->error);
+		mpd_sendStatusCommand(conn);
+		if ((status = mpd_getStatus(conn)) == NULL) {
+			NORM_ERR("MPD error: %s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			clear_mpd();
 
-		if (status->state == MPD_STATUS_STATE_PLAY) {
-			strncpy(current_info->mpd.status, "Playing",
-					TEXT_BUFFER_SIZE - 1);
+			mpd_info.status = "MPD not responding";
+			timed_thread_unlock(me);
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
+			continue;
 		}
-		if (status->state == MPD_STATUS_STATE_STOP) {
-			strncpy(current_info->mpd.status, "Stopped",
-					TEXT_BUFFER_SIZE - 1);
+		mpd_finishCommand(conn);
+		if (conn->error) {
+			// fprintf(stderr, "%s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			timed_thread_unlock(me);
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
+			continue;
 		}
-		if (status->state == MPD_STATUS_STATE_PAUSE) {
-			strncpy(current_info->mpd.status, "Paused",
-					TEXT_BUFFER_SIZE - 1);
+
+		mpd_info.vol = status->volume;
+		if (status->random == 0) {
+			mpd_info.random = "Off";
+		} else if (status->random == 1) {
+			mpd_info.random = "On";
+		} else {
+			mpd_info.random = "";
 		}
-		if (status->state == MPD_STATUS_STATE_UNKNOWN) {
-			// current_info was already cleaned up by clear_mpd_stats()
+		if (status->repeat == 0) {
+			mpd_info.repeat = "Off";
+		} else if (status->repeat == 1) {
+			mpd_info.repeat = "On";
+		} else {
+			mpd_info.repeat = "";
 		}
+		/* if (status->error) {
+			printf("error: %s\n", status->error);
+		} */
+
+		switch (status->state) {
+			case MPD_STATUS_STATE_PLAY:
+				mpd_info.status = "Playing";
+				break;
+			case MPD_STATUS_STATE_STOP:
+				mpd_info.status = "Stopped";
+				break;
+			case MPD_STATUS_STATE_PAUSE:
+				mpd_info.status = "Paused";
+				break;
+			default:
+				mpd_info.status = "";
+				clear_mpd();
+				break;
+		}
+
 		if (status->state == MPD_STATUS_STATE_PLAY ||
-				status->state == MPD_STATUS_STATE_PAUSE) {
-			current_info->mpd.bitrate = status->bitRate;
-			current_info->mpd.progress =
-				(float) status->elapsedTime / status->totalTime;
-			current_info->mpd.elapsed = status->elapsedTime;
-			current_info->mpd.length = status->totalTime;
-			if (status->random == 0) {
-				strcpy(current_info->mpd.random, "Off");
-			} else if (status->random == 1) {
-				strcpy(current_info->mpd.random, "On");
-			} else {
-				*current_info->mpd.random=0;
-			}
-			if (status->repeat == 0) {
-				strcpy(current_info->mpd.repeat, "Off");
-			} else if (status->repeat == 1) {
-				strcpy(current_info->mpd.repeat, "On");
-			} else {
-				*current_info->mpd.repeat=0;
-			}
+		    status->state == MPD_STATUS_STATE_PAUSE) {
+			mpd_info.is_playing = 1;
+			mpd_info.bitrate = status->bitRate;
+			mpd_info.progress = (float) status->elapsedTime /
+				status->totalTime;
+			mpd_info.elapsed = status->elapsedTime;
+			mpd_info.length = status->totalTime;
+		} else {
+			mpd_info.progress = 0;
+			mpd_info.is_playing = 0;
+			mpd_info.elapsed = 0;
 		}
 
-		if (current_info->conn->error) {
-			//fprintf(stderr, "%s\n", current_info->conn->errorStr);
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
-			timed_thread_unlock(mpd_timed_thread);
-			if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
+		if (conn->error) {
+			// fprintf(stderr, "%s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			timed_thread_unlock(me);
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
 			continue;
 		}
 
-		mpd_nextListOkCommand(current_info->conn);
-
-		while ((entity = mpd_getNextInfoEntity(current_info->conn))) {
+		mpd_sendCurrentSongCommand(conn);
+		while ((entity = mpd_getNextInfoEntity(conn))) {
 			mpd_Song *song = entity->info.song;
+
 			if (entity->type != MPD_INFO_ENTITY_TYPE_SONG) {
 				mpd_freeInfoEntity(entity);
 				continue;
 			}
-
-			if (song->artist) {
-				strncpy(current_info->mpd.artist, song->artist,
-						TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.artist=0;
-			}
-			if (song->album) {
-				strncpy(current_info->mpd.album, song->album,
-						TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.album=0;
-			}
-			if (song->title) {
-				strncpy(current_info->mpd.title, song->title,
-						TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.title=0;
-			}
-			if (song->track) {
-				strncpy(current_info->mpd.track, song->track,
-						TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.track=0;
-			}
-			if (song->name) {
-				strncpy(current_info->mpd.name, song->name,
-						TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.name=0;
-			}
-			if (song->file) {
-				strncpy(current_info->mpd.file,
-						song->file, TEXT_BUFFER_SIZE - 1);
-			} else {
-				*current_info->mpd.file=0;
-			}
+#define SONGSET(x) {                            \
+	free(mpd_info.x);                       \
+	if(song->x)                             \
+		mpd_info.x = strmdup(song->x);  \
+	else                                    \
+		mpd_info.x = strmdup(emptystr); \
+}
+			SONGSET(artist);
+			SONGSET(album);
+			SONGSET(title);
+			SONGSET(track);
+			SONGSET(name);
+			SONGSET(file);
+#undef SONGSET
 			if (entity != NULL) {
 				mpd_freeInfoEntity(entity);
 				entity = NULL;
 			}
 		}
-		if (entity != NULL) {
-			mpd_freeInfoEntity(entity);
-			entity = NULL;
-		}
-
-		timed_thread_unlock(mpd_timed_thread);
-		if (current_info->conn->error) {
-			//fprintf(stderr, "%s\n", current_info->conn->errorStr);
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
-			if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
+		mpd_finishCommand(conn);
+		if (conn->error) {
+			// fprintf(stderr, "%s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			timed_thread_unlock(me);
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
 			continue;
 		}
 
-		mpd_finishCommand(current_info->conn);
-		if (current_info->conn->error) {
-			//fprintf(stderr, "%s\n", current_info->conn->errorStr);
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
-			if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
+		timed_thread_unlock(me);
+		if (conn->error) {
+			// fprintf(stderr, "%s\n", conn->errorStr);
+			mpd_closeConnection(conn);
+			conn = 0;
+			if (timed_thread_test(me, 0)) {
+				timed_thread_exit(me);
+			}
 			continue;
 		}
+
 		mpd_freeStatus(status);
-/*		if (current_info->conn) {
-			mpd_closeConnection(current_info->conn);
-			current_info->conn = 0;
-		}*/
-		if (timed_thread_test(mpd_timed_thread)) timed_thread_exit(mpd_timed_thread);
+		/* if (conn) {
+			mpd_closeConnection(conn);
+			conn = 0;
+		} */
+		if (timed_thread_test(me, 0)) {
+			timed_thread_exit(me);
+		}
 		continue;
 	}
-	return 0;
+	/* never reached */
 }
+
+static inline void format_media_player_time(char *buf, const int size,
+		int seconds)
+{
+	int days, hours, minutes;
+
+	if (times_in_seconds()) {
+		snprintf(buf, size, "%d", seconds);
+		return;
+	}
+
+	days = seconds / (24 * 60 * 60);
+	seconds %= (24 * 60 * 60);
+	hours = seconds / (60 * 60);
+	seconds %= (60 * 60);
+	minutes = seconds / 60;
+	seconds %= 60;
+
+	if (days > 0) {
+		snprintf(buf, size, "%i days %i:%02i:%02i", days,
+				hours, minutes, seconds);
+	} else if (hours > 0) {
+		snprintf(buf, size, "%i:%02i:%02i", hours, minutes,
+				seconds);
+	} else {
+		snprintf(buf, size, "%i:%02i", minutes, seconds);
+	}
+}
+
+void print_mpd_elapsed(struct text_object *obj, char *p, int p_max_size)
+{
+	(void)obj;
+	format_media_player_time(p, p_max_size, mpd_get_info()->elapsed);
+}
+
+void print_mpd_length(struct text_object *obj, char *p, int p_max_size)
+{
+	(void)obj;
+	format_media_player_time(p, p_max_size, mpd_get_info()->length);
+}
+
+void print_mpd_percent(struct text_object *obj, char *p, int p_max_size)
+{
+	(void)obj;
+	percent_print(p, p_max_size, (int)(mpd_get_info()->progress * 100));
+}
+
+void print_mpd_bar(struct text_object *obj, char *p, int p_max_size)
+{
+	new_bar(obj, p, p_max_size, (int) (mpd_get_info()->progress * 255.0f));
+}
+
+void print_mpd_smart(struct text_object *obj, char *p, int p_max_size)
+{
+	struct mpd_s *mpd = mpd_get_info();
+	int len = obj->data.i;
+	if (len == 0 || len > p_max_size)
+		len = p_max_size;
+
+	memset(p, 0, p_max_size);
+	if (mpd->artist && *mpd->artist &&
+			mpd->title && *mpd->title) {
+		snprintf(p, len, "%s - %s", mpd->artist,
+				mpd->title);
+	} else if (mpd->title && *mpd->title) {
+		snprintf(p, len, "%s", mpd->title);
+	} else if (mpd->artist && *mpd->artist) {
+		snprintf(p, len, "%s", mpd->artist);
+	} else if (mpd->file && *mpd->file) {
+		snprintf(p, len, "%s", mpd->file);
+	} else {
+		*p = 0;
+	}
+}
+
+#define MPD_PRINT_GENERATOR(name, fmt) \
+void print_mpd_##name(struct text_object *obj, char *p, int p_max_size) \
+{ \
+	if (obj->data.i && obj->data.i < p_max_size) \
+		p_max_size = obj->data.i; \
+	snprintf(p, p_max_size, fmt, mpd_get_info()->name); \
+}
+
+MPD_PRINT_GENERATOR(title, "%s")
+MPD_PRINT_GENERATOR(artist, "%s")
+MPD_PRINT_GENERATOR(album, "%s")
+MPD_PRINT_GENERATOR(random, "%s")
+MPD_PRINT_GENERATOR(repeat, "%s")
+MPD_PRINT_GENERATOR(track, "%s")
+MPD_PRINT_GENERATOR(name, "%s")
+MPD_PRINT_GENERATOR(file, "%s")
+MPD_PRINT_GENERATOR(vol, "%d")
+MPD_PRINT_GENERATOR(bitrate, "%d")
+MPD_PRINT_GENERATOR(status, "%s")
+
+#undef MPD_PRINT_GENERATOR