X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;ds=inline;f=src%2Fxmms2.c;h=94f13f93b8475cad92cc09c73b5f5d7466566595;hb=3293e076c500eef4ca11a72bfb6954412c341228;hp=d50de779766269b542d74a8744e711d11449d5fc;hpb=49aee8707add6138542eb798868d8b28caaa2a92;p=monky

diff --git a/src/xmms2.c b/src/xmms2.c
index d50de77..94f13f9 100644
--- a/src/xmms2.c
+++ b/src/xmms2.c
@@ -1,4 +1,7 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- 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
  *
@@ -6,7 +9,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -26,8 +29,6 @@
 
 #include "conky.h"
 
-xmms_socket_t xmms2_fd;
-fd_set xmms2_fdset;
 xmmsc_connection_t *xmms2_conn;
 
 #define CONN_INIT	0
@@ -86,14 +87,14 @@ static void xmms_alloc(struct information *ptr)
 void connection_lost(void *p)
 {
 	struct information *ptr = p;
-	 ptr->xmms2.conn_state = CONN_NO;
+	ptr->xmms2.conn_state = CONN_NO;
 
-	 fprintf(stderr,"XMMS2 connection failed. %s\n", xmmsc_get_last_error(xmms2_conn));
+	fprintf(stderr,"XMMS2 connection failed. %s\n", xmmsc_get_last_error(xmms2_conn));
 
-	 xmms_alloc(ptr);
-	 strncpy(ptr->xmms2.status, "Disocnnected", text_buffer_size - 1);
-	 ptr->xmms2.playlist[0] = '\0';
-	 ptr->xmms2.id = 0;
+	xmms_alloc(ptr);
+	strncpy(ptr->xmms2.status, "Disocnnected", text_buffer_size - 1);
+	ptr->xmms2.playlist[0] = '\0';
+	ptr->xmms2.id = 0;
 }
 
 
@@ -112,7 +113,7 @@ int handle_curent_id(xmmsv_t *value, void *p)
 	if (xmmsv_get_error(value, &errbuf)) {
 		fprintf(stderr,"XMMS2 server error. %s\n", errbuf);
 		return TRUE;
-		}
+	}
 
 	if (xmmsv_get_int(value, &current_id) && current_id > 0) {
 
@@ -137,10 +138,10 @@ int handle_curent_id(xmmsv_t *value, void *p)
 
 		if (xmmsv_dict_get(infos, "title", &dict_entry) && xmmsv_get_string(dict_entry, &charval)) 
 			strncpy(ptr->xmms2.title, charval, text_buffer_size - 1);
-	
+
 		if (xmmsv_dict_get(infos, "album", &dict_entry) && xmmsv_get_string(dict_entry, &charval)) 
 			strncpy(ptr->xmms2.album, charval, text_buffer_size - 1);
-		
+
 		if (xmmsv_dict_get(infos, "genre", &dict_entry) && xmmsv_get_string(dict_entry, &charval))
 			strncpy(ptr->xmms2.genre, charval, text_buffer_size - 1);
 
@@ -152,7 +153,7 @@ int handle_curent_id(xmmsv_t *value, void *p)
 
 		if (xmmsv_dict_get(infos, "date", &dict_entry) && xmmsv_get_string(dict_entry, &charval))
 			strncpy(ptr->xmms2.date, charval, text_buffer_size - 1);
-		
+
 
 
 		if (xmmsv_dict_get(infos, "tracknr", &dict_entry) && xmmsv_get_int(dict_entry, &intval))
@@ -213,24 +214,25 @@ int handle_playback_state_change(xmmsv_t *value, void *p)
 	}
 
 	if (xmmsv_get_int(value, &pb_state)) {
-	switch (pb_state) {
-		case XMMS_PLAYBACK_STATUS_PLAY:
-			strncpy(ptr->xmms2.status, "Playing", text_buffer_size - 1);
-			break;
-		case XMMS_PLAYBACK_STATUS_PAUSE:
-			strncpy(ptr->xmms2.status, "Paused", text_buffer_size - 1);
-			break;
-		case XMMS_PLAYBACK_STATUS_STOP:
-			strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1);
-			break;
-		default:
-			strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1);
-	}
+		switch (pb_state) {
+			case XMMS_PLAYBACK_STATUS_PLAY:
+				strncpy(ptr->xmms2.status, "Playing", text_buffer_size - 1);
+				break;
+			case XMMS_PLAYBACK_STATUS_PAUSE:
+				strncpy(ptr->xmms2.status, "Paused", text_buffer_size - 1);
+				break;
+			case XMMS_PLAYBACK_STATUS_STOP:
+				strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1);
+ 				ptr->xmms2.elapsed = ptr->xmms2.progress = 0;
+				break;
+			default:
+				strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1);
+		}
 	}
 	return TRUE;
 }
 
-int handle_playlist_loaded(xmmsv_t *value, void *p) 
+int handle_playlist_loaded(xmmsv_t *value, void *p)
 {
 	struct information *ptr = p;
 	const char *c, *errbuf;
@@ -251,7 +253,7 @@ int handle_playlist_loaded(xmmsv_t *value, void *p)
 	return TRUE;
 }
 
-void update_xmms2()
+int update_xmms2(void)
 {
 	struct information *current_info = &info;
 
@@ -265,7 +267,7 @@ void update_xmms2()
 		/* did init fail? */
 		if (xmms2_conn == NULL) {
 			fprintf(stderr,"XMMS2 init failed. %s\n", xmmsc_get_last_error(xmms2_conn));
-			return;
+			return 0;
 		}
 
 		/* init ok but not connected yet.. */
@@ -283,7 +285,7 @@ void update_xmms2()
 		if (!xmmsc_connect(xmms2_conn, path)) {
 			fprintf(stderr,"XMMS2 connection failed. %s\n", xmmsc_get_last_error(xmms2_conn));
 			current_info->xmms2.conn_state = CONN_NO;
-			return;
+			return 0;
 		}
 
 		/* set callbacks */
@@ -311,36 +313,13 @@ void update_xmms2()
 
 	/* handle callbacks */
 	if (current_info->xmms2.conn_state == CONN_OK) {
-		struct timeval tmout;
-
-		tmout.tv_sec = 0;
-		tmout.tv_usec = 100;
-		
-		select(xmms2_fd + 1, &xmms2_fdset, NULL, NULL, &tmout);
 
 		xmmsc_io_in_handle(xmms2_conn);
-		if (xmmsc_io_want_out(xmms2_conn)) {
+		if (xmmsc_io_want_out(xmms2_conn))
 			xmmsc_io_out_handle(xmms2_conn);
-		}
-		}
-	}
-
 
-void free_xmms2()
-{
-	struct information *current_info = &info;
-
-	current_info->xmms2.conn_state = -1;
-
-	free(current_info->xmms2.artist);
-	free(current_info->xmms2.album);
-	free(current_info->xmms2.title);
-	free(current_info->xmms2.genre);
-	free(current_info->xmms2.comment);
-	free(current_info->xmms2.url);
-	free(current_info->xmms2.date);
-	free(current_info->xmms2.playlist);
-	free(current_info->xmms2.status);
+	}
+	return 0;
 }