move audacious defs into header

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1159 7f574dfc-610e-0410-a909-a81674777703

doc/conky.1

@@ -1,4 +1,4 @@
-.\" -*- coding: us-ascii -*-
+'\" -*- coding: us-ascii -*-
 .if \n(.g .ds T< \\FC
 .if \n(.g .ds T> \\F[\n[.fam]]
 .de URL

src/audacious.c

@@ -54,7 +54,6 @@
 
 #include "conky.h"
 #include "audacious.h"
-#include "timed_thread.h"
 
 /* access to this item array is synchronized */
 static audacious_t audacious_items;

src/audacious.h

@@ -22,6 +22,8 @@
 #ifndef AUDACIOUS_H
 #define AUDACIOUS_H
 
+#include "timed_thread.h"
+
 enum _audacious_items {
 	AUDACIOUS_STATUS = 0,
 	AUDACIOUS_TITLE,
@@ -40,6 +42,13 @@ enum _audacious_items {
 /* 12 slots for the audacious values */
 typedef char audacious_t[12][128];
 
+/* type for data exchange with main thread */
+typedef struct audacious_s {
+  audacious_t items;  /* e.g. items[AUDACIOUS_STATUS] */
+  int max_title_len;  /* e.g. ${audacious_title 50} */
+  timed_thread *p_timed_thread;
+} AUDACIOUS_S;
+
 /* create a worker thread for audacious media player status */
 int create_audacious_thread(void);
 

src/conky.h

@@ -175,12 +175,7 @@ struct mail_s {			// for imap and pop3
 #endif
 
 #ifdef AUDACIOUS
-struct audacious_s {
+#include "audacious.h"
-  audacious_t items;  /* e.g. items[AUDACIOUS_STATUS] */
-  int max_title_len;  /* e.g. ${audacious_title 50} */
-  timed_thread *p_timed_thread;
-};
-
 #endif
 
 #ifdef BMPX
@@ -316,7 +311,7 @@ struct information {
 	xmmsc_connection_t *xmms2_conn;
 #endif
 #ifdef AUDACIOUS
-	struct audacious_s audacious;
+	AUDACIOUS_S audacious;
 #endif
 #ifdef BMPX
 	struct bmpx_s bmpx;