.fvwmrc: Return to `audacious` and `audtool`

Switch from `deadbeef` back again.

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 619baa8bab455e5427d523c7141ea84b123c28d1..75de9a691229ab8cf368599c473812eb47ba6632 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -591,12 +591,12 @@ AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 
 changequote([,])
 DestroyFunc Id3Info
-AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`deadbeef --nowplaying '%F'`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
+AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`audtool --current-song-filename`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 changequote([`], ['])
 
-DestroyFunc DeadBeef
-AddToFunc DeadBeef            I GotoDeskAndPage 0 1 1
-+                             I Exec exec deadbeef
+DestroyFunc AudioPlayer
+AddToFunc AudioPlayer         I GotoDeskAndPage 0 1 1
++                             I Exec exec audacious
 
 DestroyFunc Term-Phdru
 AddToFunc Term-Phdru          I GotoDeskAndPage 1 0 1
@@ -790,7 +790,7 @@ AddToMenu Utilities     "Choose one:" Title
 #+                       "xbuffy" Exec exec xbuffy -fn 'XBUFFY_FONT' -geometry +0+125 -boxfile mail/misc/.xbuffyrc
 #+                       ""       Nop
 +                       "pavucontrol" PaVuControl
-+                       "DeadBeef"    DeadBeef
++                       "AudioPlayer" AudioPlayer
 +                       "Id3Info"     Id3Info
 +                       ""       Nop
 +                       "Gajim"       Gajim
@@ -910,7 +910,7 @@ popdef(`TERM_KOI8', `TERM_UTF8')
 *FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-force)
 *FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action Exec "Volume Control" exec pavucontrol)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
-*FvwmButtons: (Title DeadBeef,  Icon bell.xpm,         Action Exec "DeaDBeeF-*" exec deadbeef)
+*FvwmButtons: (Title AudioPlayer,  Icon bell.xpm,      Action Exec "Audacious" exec audacious)
 #*FvwmButtons: (Title XLock,     Icon Jxlock.xpm,      Action Exec exec xscreensaver-command -lock)
 
 ############################################################################