diff -Nru bemusedlinuxserver1.73.orig/bemused.conf bemusedlinuxserver1.73/bemused.conf --- bemusedlinuxserver1.73.orig/bemused.conf 2006-10-24 11:34:29.000000000 +0300 +++ bemusedlinuxserver1.73/bemused.conf 2006-10-24 11:34:36.000000000 +0300 @@ -1,12 +1,13 @@ # bemused config file Version 1.73 (no changes since 1.71) +# Gentoo-specific changes: Audacious as a default player instead of xmms # lines with a # at the beinning are for comments and not readen by the bemusedserver # You only need to set up options which have no default and which ware not optinal -# Path to xmms (if xmms is in path only xmms) (default is xmms) -xmmsdir=xmms +# Path to xmms-compatible player (default is audacious) +xmmsdir=audacious # channel for what the serial port service is registered (with sdptool look in README) (default 10) #channel=10 diff -Nru bemusedlinuxserver1.73.orig/BemusedServerDlg.cpp bemusedlinuxserver1.73/BemusedServerDlg.cpp --- bemusedlinuxserver1.73.orig/BemusedServerDlg.cpp 2006-10-24 11:34:29.000000000 +0300 +++ bemusedlinuxserver1.73/BemusedServerDlg.cpp 2006-10-24 11:34:36.000000000 +0300 @@ -46,7 +46,7 @@ #include #endif -#include +#include #include "BemusedServerDlg.h" @@ -232,7 +232,7 @@ tcpport=7654; channel=10; tcp=false; - strcpy(winampPath,"xmms"); + strcpy(winampPath,"audacious"); startAutomatically=1; ifstream conffile("/etc/bemused.conf"); if (!conffile) { diff -Nru bemusedlinuxserver1.73.orig/Makefile bemusedlinuxserver1.73/Makefile --- bemusedlinuxserver1.73.orig/Makefile 2006-10-24 11:34:29.000000000 +0300 +++ bemusedlinuxserver1.73/Makefile 2006-10-24 11:36:17.000000000 +0300 @@ -1,10 +1,10 @@ SHELL = /bin/sh -LIB = -lxmms -lbluetooth -INCL = -I/usr/include/xmms -I./ +LIB = -lbluetooth +INCL = -I/usr/include/audacious -I./ bemusedlinuxserver: main.cpp BemusedServerDlg.cpp - $(CXX) -o bemusedlinuxserver $(INCL) $(LIB) `gtk-config --libs --cflags` main.cpp BemusedServerDlg.cpp + $(CXX) -o bemusedlinuxserver $(INCL) $(LIB) `pkg-config audacious --libs --cflags` main.cpp BemusedServerDlg.cpp install: bemusedlinuxserver diff -Nru bemusedlinuxserver1.73.orig/Makefile.affix bemusedlinuxserver1.73/Makefile.affix --- bemusedlinuxserver1.73.orig/Makefile.affix 2006-10-24 11:34:29.000000000 +0300 +++ bemusedlinuxserver1.73/Makefile.affix 2006-10-24 11:34:36.000000000 +0300 @@ -1,8 +1,8 @@ # Makefile for compiling Bemused for Affix # 2004, Andrei Emeltchenko -LIBS = -lxmms -laffix -laffix_sdp -laffix_sdpsvc -L/usr/local/lib -INCL = -I/usr/include/xmms -I./ +LIBS = -laudacious -laffix -laffix_sdp -laffix_sdpsvc -L/usr/local/lib +INCL = -I/usr/include/audacious -I./ CXXFLAGS = $(INCL) -DAFFIX `gtk-config --cflags` LDFLAGS = $(LIBS)