Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 152477
Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +13 lines)
Line  Link Here
0
-- old/BemusedServerDlg.cpp    2006-10-23 12:21:49.966254743 +0300
0
++ ./BemusedServerDlg.cpp      2006-10-23 12:22:37.309294887 +0300
Lines 46-52 Link Here
46
#include <affix/sdpsrv.h>
46
#include <affix/sdpsrv.h>
47
#endif
47
#endif
48
#include <xmmsctrl.h>
48
#include <beepctrl.h>
49
#include "BemusedServerDlg.h"
49
#include "BemusedServerDlg.h"
Lines 232-238 Link Here
232
  tcpport=7654;
232
  tcpport=7654;
233
  channel=10;
233
  channel=10;
234
  tcp=false;
234
  tcp=false;
235
  strcpy(winampPath,"xmms");
235
  strcpy(winampPath,"audacious");
236
  startAutomatically=1;
236
  startAutomatically=1;
237
  ifstream conffile("/etc/bemused.conf");
237
  ifstream conffile("/etc/bemused.conf");
238
  if (!conffile) {
238
  if (!conffile) {
239
-- old/Makefile        2006-10-23 12:24:22.834781996 +0300
239
++ ./Makefile  2006-10-23 12:22:03.506264230 +0300
Lines 1-7 Link Here
1
SHELL = /bin/sh
1
SHELL = /bin/sh
2
LIB = -lxmms -lbluetooth
2
LIB = -laudacious -lbluetooth
3
INCL = -I/usr/include/xmms -I./
3
INCL = -I/usr/include/audacious -I./
4
bemusedlinuxserver:    main.cpp BemusedServerDlg.cpp
4
bemusedlinuxserver:    main.cpp BemusedServerDlg.cpp
5
                       $(CXX) -o bemusedlinuxserver $(INCL) $(LIB) `gtk-config --libs --cflags` main.cpp BemusedServerDlg.cpp
5
                       $(CXX) -o bemusedlinuxserver $(INCL) $(LIB) `gtk-config --libs --cflags` main.cpp BemusedServerDlg.cpp
6
-- old/Makefile.affix  2006-10-23 12:24:18.611402850 +0300
6
++ ./Makefile.affix    2006-10-23 12:22:14.786605915 +0300
Lines 1-8 Link Here
1
# Makefile for compiling Bemused for Affix
1
# Makefile for compiling Bemused for Affix
2
# 2004, Andrei Emeltchenko
2
# 2004, Andrei Emeltchenko
3
LIBS = -lxmms -laffix -laffix_sdp -laffix_sdpsvc -L/usr/local/lib
3
LIBS = -laudacious -laffix -laffix_sdp -laffix_sdpsvc -L/usr/local/lib
4
INCL = -I/usr/include/xmms -I./
4
INCL = -I/usr/include/audacious -I./
5
CXXFLAGS = $(INCL) -DAFFIX `gtk-config --cflags`
5
CXXFLAGS = $(INCL) -DAFFIX `gtk-config --cflags`
6
LDFLAGS = $(LIBS)
6
LDFLAGS = $(LIBS)
7
-- old/bemused.conf    2006-10-23 12:21:44.512056565 +0300
7
++ ./bemused.conf      2006-10-23 12:23:27.291947079 +0300
Lines 1-12 Link Here
1
# bemused config file Version 1.73 (no changes since 1.71)
1
# bemused config file Version 1.73 (no changes since 1.71)
2
# Gentoo-specific changes: Audacious as a default player instead of xmms
2
# lines with a # at the beinning are for comments and not readen by the bemusedserver
3
# lines with a # at the beinning are for comments and not readen by the bemusedserver
3
# You only need to set up options which have no default and which ware not optinal
4
# You only need to set up options which have no default and which ware not optinal
4
# Path to xmms (if xmms is in path only xmms) (default is xmms)
5
# Path to xmms-compatible player (default is audacious)
5
xmmsdir=xmms
6
xmmsdir=audacious
6
# channel for what the serial port service is registered (with sdptool look in README) (default 10)
7
# channel for what the serial port service is registered (with sdptool look in README) (default 10)
7
#channel=10
8
#channel=10

Return to bug 152477