Add BMPx (http://beep-media-player.org/) support. Bugs and memleaks are here

[monky] / src / conky.h

diff --git a/src/conky.h b/src/conky.h
index 3ca7713..a9d39fe 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -56,8 +56,12 @@ fprintf(stderr, "Conky: " s "\n", ##varargs)
 #define CRIT_ERR(s, varargs...) \
 { fprintf(stderr, "Conky: " s "\n", ##varargs);  exit(EXIT_FAILURE); }
 
+#ifndef MIN
 #define MIN(a,b) (a>b ? b : a)
+#endif
+#ifndef MAX
 #define MAX(a,b) (a<b ? b : a)
+#endif
 
 struct i8k_struct {
        char *version;
@@ -118,6 +122,17 @@ struct mpd_s {
 };
 #endif
 
+#ifdef BMPX
+struct bmpx_s {
+       char *title;
+       char *artist;
+       char *album;
+       char *uri;
+       int bitrate;
+       int track;
+};
+#endif
+
 #ifdef TCP_PORT_MONITOR
 #include "libtcp-portmon.h"
 #define MIN_PORT_MONITORS_DEFAULT 16
@@ -155,6 +170,9 @@ enum {
 #ifdef TCP_PORT_MONITOR
         INFO_TCP_PORT_MONITOR = 22,
 #endif
+#ifdef BMPX
+       INFO_BMPX = 23,
+#endif
 };
 
 
@@ -198,6 +216,9 @@ struct information {
        struct mpd_s mpd;
        mpd_Connection *conn;
 #endif
+#ifdef BMPX
+       struct bmpx_s bmpx;
+#endif
        struct process *cpu[10];
        struct process *memu[10];
        struct process *first_process;