remove infopipe support

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

diff --git a/ChangeLog b/ChangeLog
index 032959b..44b3118 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,10 @@
 # $Id$
 
 2006-11-03     pkovacs
-       * Removed direct xmms support from conky.  The Xmms and Bmp players
-       are now no longer directly supported as those projects are dead and
-       distros such as gentoo are slated them for removal.  
-       * Added direct support for Audacious and Infopipe plugin via two new 
-       sets of variables (audacious_ and infopipe_).  Users can still view 
-       Xmms and Bmp status within conky by use of the Infopipe support.  
-       * Conky no longer loads Audacious music player library dynamically.
+       * Removed direct support for Xmms, BMP and Infopipe from conky.  
+       The Xmms and Bmp players are projects are dead and distros such 
+       as Gentoo are slating them for removal.  
+       * Added direct support for Audacious with conventional linking.
 
 2006-10-18
        * Implement WiFi signal level detection on FreeBSD (patch

diff --git a/README b/README
index 01e34d9..a9a2688 100644 (file)
--- a/README
+++ b/README
@@ -44,10 +44,10 @@ COMPILING
        ./configure     --prefix=/usr      --mandir=/usr/share/man       --in-
        fodir=/usr/share/info  --datadir=/usr/share  --sysconfdir=/etc --local-
        statedir=/var/lib --enable-xft --enable-own-window --enable-proc-uptime
-       --enable-audacious  --enable-infopipe --enable-bmpx --enable-seti --en-
-       able-hddtemp --enable-mpd --enable-xmms2 --enable-imlib2 --enable-port-
-       mon   --enable-mldonkey  --enable-debug  --enable-double-buffer  --en-
-       able-xdamage --enable-x11
+       --enable-audacious  --enable-bmpx  --enable-seti --enable-hddtemp --en-
+       able-mpd --enable-xmms2 --enable-imlib2 --enable-portmon  --enable-ml-
+       donkey  --enable-debug  --enable-double-buffer  --enable-xdamage         --en-
+       able-x11
 
        make
 
@@ -795,58 +795,6 @@ VARIABLES
              you will be prompted to enter the password when Conky starts.
 
 
-       infopipe_bar (height),(width)
-             Progress bar
-
-
-       infopipe_bitrate
-             Bitrate of current tune
-
-
-       infopipe_channels
-             Number of audio channels of current tune
-
-
-       infopipe_filename
-             Full path and filename of current tune
-
-
-       infopipe_frequency
-             Sampling frequency of current tune
-
-
-       infopipe_length
-             Total length of current tune as MM:SS
-
-
-       infopipe_length_seconds
-             Total length of current tune in seconds
-
-
-       infopipe_playlist_position
-             Playlist position of current tune
-
-
-       infopipe_playlist_length
-             Number of tunes in playlist
-
-
-       infopipe_position
-             Position of current tune (MM:SS)
-
-
-       infopipe_position_seconds
-             Position of current tune in seconds
-
-
-       infopipe_status
-             Player status (Playing/Paused/Stopped/Not running)
-
-
-       infopipe_title
-             Title of current tune
-
-
        kernel Kernel version
 
 

diff --git a/configure.ac b/configure.ac
index 6b7ea1b..4f23e60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,27 +138,6 @@ case x$want_audacious in
 esac
 AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes)
 
-dnl
-dnl InfoPipe (Version 1.3)
-dnl
-
-want_infopipe=no
-AC_ARG_ENABLE(infopipe,
-   [  --enable-infopipe       enable xmms/bmp infopipe support [[default=no]]],
-   [want_infopipe="$enableval"])
-
-case x$want_infopipe in
-    xyes)
-        AC_DEFINE(INFOPIPE, 1, [Define for InfoPipe support])
-        ;;
-    xno)
-        ;;
-    *)
-        echo "Error: invalid infopipe parameter specified: $want_infopipe"
-        exit -1
-        ;;
-esac
-AM_CONDITIONAL(BUILD_INFOPIPE, test x$want_infopipe = xyes)
 
 dnl
 dnl BMPx
@@ -536,7 +515,6 @@ $PACKAGE $VERSION configured successfully:
 
  * music detection:
   audacious:           $want_audacious
-  infopipe:            $want_infopipe
   bmpx:                        $want_bmpx
   xmms2:               $want_xmms2
   mpd:                 $want_mpd

diff --git a/doc/conky.1 b/doc/conky.1
index ee1b336..a9bcb72 100644 (file)
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -44,7 +44,7 @@ Example to compile and run Conky with all optional components (note that some co
 .TP 
 \fB\*(T<\fBsh autogen.sh\fR\*(T>\fR \*(T<\fB# Only required if building from Svn\fR\*(T> 
 .TP 
-\fB\*(T<\fB\&./configure \fR\*(T>\fR\*(T<\fB\-\-prefix=/usr \-\-mandir=/usr/share/man \-\-infodir=/usr/share/info \-\-datadir=/usr/share \-\-sysconfdir=/etc \-\-localstatedir=/var/lib \-\-enable\-xft \-\-enable\-own\-window \-\-enable\-proc\-uptime \-\-enable\-audacious \-\-enable\-infopipe \-\-enable\-bmpx \-\-enable\-seti \-\-enable\-hddtemp \-\-enable\-mpd \-\-enable\-xmms2 \-\-enable\-imlib2 \-\-enable\-portmon \-\-enable\-mldonkey \-\-enable\-debug \-\-enable\-double\-buffer \-\-enable\-xdamage \-\-enable\-x11\fR\*(T> 
+\fB\*(T<\fB\&./configure \fR\*(T>\fR\*(T<\fB\-\-prefix=/usr \-\-mandir=/usr/share/man \-\-infodir=/usr/share/info \-\-datadir=/usr/share \-\-sysconfdir=/etc \-\-localstatedir=/var/lib \-\-enable\-xft \-\-enable\-own\-window \-\-enable\-proc\-uptime \-\-enable\-audacious \-\-enable\-bmpx \-\-enable\-seti \-\-enable\-hddtemp \-\-enable\-mpd \-\-enable\-xmms2 \-\-enable\-imlib2 \-\-enable\-portmon \-\-enable\-mldonkey \-\-enable\-debug \-\-enable\-double\-buffer \-\-enable\-xdamage \-\-enable\-x11\fR\*(T> 
 .TP 
 \fB\*(T<\fBmake\fR\*(T>\fR 
 .TP 
@@ -710,58 +710,6 @@ Displays the number of messages in your global IMAP inbox by default. You can de
 Displays the number of unseen messages in your global IMAP inbox by default. You can define individual IMAP inboxes seperately by passing arguments to this object. Arguments are: "host user pass [-i interval] [-p port] [-e command]". Default port is 110, default interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
 
 .TP 
-\fB\*(T<\fBinfopipe_bar\fR\*(T>\fR \*(T<\fB(height),(width)\fR\*(T> 
-Progress bar
-
-.TP 
-\fB\*(T<\fBinfopipe_bitrate\fR\*(T>\fR 
-Bitrate of current tune
-
-.TP 
-\fB\*(T<\fBinfopipe_channels\fR\*(T>\fR 
-Number of audio channels of current tune
-
-.TP 
-\fB\*(T<\fBinfopipe_filename\fR\*(T>\fR 
-Full path and filename of current tune
-
-.TP 
-\fB\*(T<\fBinfopipe_frequency\fR\*(T>\fR 
-Sampling frequency of current tune
-
-.TP 
-\fB\*(T<\fBinfopipe_length\fR\*(T>\fR 
-Total length of current tune as MM:SS
-
-.TP 
-\fB\*(T<\fBinfopipe_length_seconds\fR\*(T>\fR 
-Total length of current tune in seconds
-
-.TP 
-\fB\*(T<\fBinfopipe_playlist_position\fR\*(T>\fR 
-Playlist position of current tune
-
-.TP 
-\fB\*(T<\fBinfopipe_playlist_length\fR\*(T>\fR 
-Number of tunes in playlist
-
-.TP 
-\fB\*(T<\fBinfopipe_position\fR\*(T>\fR 
-Position of current tune (MM:SS)
-
-.TP 
-\fB\*(T<\fBinfopipe_position_seconds\fR\*(T>\fR 
-Position of current tune in seconds
-
-.TP 
-\fB\*(T<\fBinfopipe_status\fR\*(T>\fR 
-Player status (Playing/Paused/Stopped/Not running)
-
-.TP 
-\fB\*(T<\fBinfopipe_title\fR\*(T>\fR 
-Title of current tune
-
-.TP 
 \fB\*(T<\fBkernel\fR\*(T>\fR 
 Kernel version
 

diff --git a/doc/conkyrc.sample b/doc/conkyrc.sample
index 77a2579..a240782 100644 (file)
--- a/doc/conkyrc.sample
+++ b/doc/conkyrc.sample
@@ -141,9 +141,6 @@ use_spacer no
 # Allow each port monitor to track at least this many connections (if 0 or not set, default is 256)
 #min_port_monitor_connections 256
 
-# none, xmms, bmp, audacious, infopipe (default is none)
-#xmms_player none
-
 # variable is given either in format $variable or in ${variable}. Latter
 # allows characters right after the variable and must be used in network
 # stuff because of an argument

diff --git a/doc/docs.xml b/doc/docs.xml
index 2fd0587..a3a9758 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -79,7 +79,7 @@
                        </varlistentry>
                        <varlistentry>
                                <term>
-                                       <command><option>./configure </option></command><option>--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --enable-xft --enable-own-window --enable-proc-uptime --enable-audacious --enable-infopipe --enable-bmpx --enable-seti --enable-hddtemp --enable-mpd --enable-xmms2 --enable-imlib2 --enable-portmon --enable-mldonkey --enable-debug --enable-double-buffer --enable-xdamage --enable-x11</option>
+                                       <command><option>./configure </option></command><option>--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --enable-xft --enable-own-window --enable-proc-uptime --enable-audacious --enable-bmpx --enable-seti --enable-hddtemp --enable-mpd --enable-xmms2 --enable-imlib2 --enable-portmon --enable-mldonkey --enable-debug --enable-double-buffer --enable-xdamage --enable-x11</option>
                                </term>
                        </varlistentry>
                        <varlistentry>

diff --git a/doc/variables.xml b/doc/variables.xml
index 5a3ee95..77795a6 100644 (file)
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -845,124 +845,6 @@
 
 <varlistentry>
        <term>
-               <command><option>infopipe_bar</option></command>
-                <option>(height),(width)</option>
-       </term>
-       <listitem>
-               Progress bar
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_bitrate</option></command>
-       </term>
-       <listitem>
-               Bitrate of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_channels</option></command>
-       </term>
-       <listitem>
-               Number of audio channels of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_filename</option></command>
-       </term>
-       <listitem>
-               Full path and filename of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_frequency</option></command>
-       </term>
-       <listitem>
-               Sampling frequency of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_length</option></command>
-       </term>
-       <listitem>
-               Total length of current tune as MM:SS
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_length_seconds</option></command>
-       </term>
-       <listitem>
-               Total length of current tune in seconds
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_playlist_position</option></command>
-       </term>
-       <listitem>
-               Playlist position of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_playlist_length</option></command>
-       </term>
-       <listitem>
-               Number of tunes in playlist
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_position</option></command>
-       </term>
-       <listitem>
-               Position of current tune (MM:SS)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_position_seconds</option></command>
-       </term>
-       <listitem>
-               Position of current tune in seconds
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_status</option></command>
-       </term>
-       <listitem>
-               Player status (Playing/Paused/Stopped/Not running)
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
-               <command><option>infopipe_title</option></command>
-       </term>
-       <listitem>
-               Title of current tune
-       <para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-       <term>
                <command><option>kernel</option></command>
        </term>
        <listitem>