X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fxmms2.c;h=94f13f93b8475cad92cc09c73b5f5d7466566595;hb=3293e076c500eef4ca11a72bfb6954412c341228;hp=6a38fde191bbd2e3de3f87a06f7d7f57d2e3484e;hpb=09c0bccf55cd42fc27ffb234bda7c65b04e3dd60;p=monky

diff --git a/src/xmms2.c b/src/xmms2.c
index 6a38fde..94f13f9 100644
--- a/src/xmms2.c
+++ b/src/xmms2.c
@@ -9,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.
  *
@@ -87,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;
 }
 
 
@@ -113,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) {
 
@@ -138,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);
 
@@ -153,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))
@@ -214,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;
@@ -252,7 +253,7 @@ int handle_playlist_loaded(xmmsv_t *value, void *p)
 	return TRUE;
 }
 
-void update_xmms2(void)
+int update_xmms2(void)
 {
 	struct information *current_info = &info;
 
@@ -266,7 +267,7 @@ void update_xmms2(void)
 		/* 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.. */
@@ -284,7 +285,7 @@ void update_xmms2(void)
 		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 */
@@ -317,7 +318,8 @@ void update_xmms2(void)
 		if (xmmsc_io_want_out(xmms2_conn))
 			xmmsc_io_out_handle(xmms2_conn);
 
-		}
 	}
+	return 0;
+}