Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 08:38:26 +00:00
Code Issues Releases Activity

move audacious defs into header

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1159 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2008-06-16 19:40:28 +00:00
parent 6bb956c6e0
commit d036b5de5c
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/conky.1
View File

@ -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
@ -30,7 +30,7 @@ using scripts and other external programs.
Conky has more than 250 built in objects, including support for
a plethora of OS stats (uname, uptime, CPU usage, mem usage, disk
usage, "top" like process stats, and network monitoring, just to name a few),
built in IMAP and POP3 support, built in support for many popular
built in IMAP and POP3 support, built in support for many popular
music players (MPD, XMMS2, BMPx, Audacious), and much much more.
Conky can display this info either as text, or using simple progress
bars and graph widgets, with different fonts and colours.
@ -42,11 +42,11 @@ or stop by #conky on irc.freenode.net if you have questions or want to contribut
Thanks for your interest in Conky.
.SH COMPILING
For users compiling from source on a binary distro, make sure you have the X development
libraries installed. This should be a package along the lines of "libx11-dev" or
libraries installed. This should be a package along the lines of "libx11-dev" or
"xorg-x11-dev" for X11 libs, and similar "-dev" format for the other libs required (depending
on your configure options).
.PP
Conky has (for some time) been available in the repositories of most popular distributions.
Conky has (for some time) been available in the repositories of most popular distributions.
Here are some installation instructions for a few:
.PP
Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-admin/conky" for installation.
@ -139,7 +139,7 @@ Y position
Number of times to update Conky (and quit)
.SH "CONFIGURATION SETTINGS"
Default configuration file location is $HOME/.conkyrc or
Default configuration file location is $HOME/.conkyrc or
${sysconfdir}/conky/conky.conf. On most systems, sysconfdir is /etc,
and you can find the sample config file there (/etc/conky/conky.conf).
.PP

1
src/audacious.c
View File

@ -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;

9
src/audacious.h
View File

@ -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);

9
src/conky.h
View File

@ -175,12 +175,7 @@ struct mail_s { // for imap and pop3
#endif
#ifdef AUDACIOUS
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;
};
#include "audacious.h"
#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;