diff -rc icewm-1.2.20/configure.in icewm-1.2.20-mixer/configure.in
*** icewm-1.2.20/configure.in 2005-01-09 23:48:22.000000000 +0200
--- icewm-1.2.20-mixer/configure.in 2005-01-14 10:53:32.000000000 +0200
***************
*** 624,629 ****
--- 624,630 ----
AC_DEFINE(CONFIG_APPLET_NET_STATUS, 1, [Network status applet])
AC_DEFINE(CONFIG_APPLET_CLOCK, 1, [LCD clock applet])
AC_DEFINE(CONFIG_APPLET_APM, 1, [APM status applet])
+ AC_DEFINE(CONFIG_APPLET_MIXER, 1, [Sound Mixer])
fi
AC_DEFINE(CONFIG_WINLIST, 1, [OS/2 like window list])
if test "${enable_winmenu}" != "no"; then
diff -rc icewm-1.2.20/Makefile.in icewm-1.2.20-mixer/Makefile.in
*** icewm-1.2.20/Makefile.in 2005-01-09 23:48:20.000000000 +0200
--- icewm-1.2.20-mixer/Makefile.in 2005-01-14 10:53:32.000000000 +0200
***************
*** 34,40 ****
LIBFILES = lib/preferences lib/winoptions lib/keys \
lib/menu lib/toolbar # lib/programs
DOCFILES = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
! XPMDIRS = icons ledclock taskbar mailbox cursors
THEMES = nice motif win95 warp3 warp4 metal2 gtk2 Infadel2 nice2 \
icedesert yellowmotif
--- 34,40 ----
LIBFILES = lib/preferences lib/winoptions lib/keys \
lib/menu lib/toolbar # lib/programs
DOCFILES = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
! XPMDIRS = icons ledclock taskbar mailbox cursors mixer
THEMES = nice motif win95 warp3 warp4 metal2 gtk2 Infadel2 nice2 \
icedesert yellowmotif
diff -rc icewm-1.2.20/src/default.h icewm-1.2.20-mixer/src/default.h
*** icewm-1.2.20/src/default.h 2005-01-09 23:48:23.000000000 +0200
--- icewm-1.2.20-mixer/src/default.h 2005-01-14 10:53:32.000000000 +0200
***************
*** 34,39 ****
--- 34,40 ----
XIV(bool, taskBarShowClock, true)
XIV(bool, taskBarShowApm, false)
XIV(bool, taskBarShowApmTime, true) // mschy
+ XIV(bool, taskBarShowMixer, false)
XIV(bool, taskBarShowMailboxStatus, true)
XIV(bool, taskBarShowStartMenu, true)
XIV(bool, taskBarShowWindowListMenu, true)
***************
*** 233,238 ****
--- 234,240 ----
OBV("TaskBarShowClock", &taskBarShowClock, "Show clock on task bar"),
OBV("TaskBarShowAPMStatus", &taskBarShowApm, "Show APM status on task bar"),
OBV("TaskBarShowAPMTime", &taskBarShowApmTime, "Show APM status on task bar in time-format"), // mschy
+ OBV("TaskBarShowMixer", &taskBarShowMixer, "Show the sound mixer on the task bar"),
OBV("TaskBarShowMailboxStatus", &taskBarShowMailboxStatus, "Show mailbox status on task bar"),
OBV("TaskBarMailboxStatusBeepOnNewMail", &beepOnNewMail, "Beep when new mail arrives"),
OBV("TaskBarMailboxStatusCountMessages", &countMailMessages, "Count messages in mailbox"),
diff -rc icewm-1.2.20/src/Makefile.in icewm-1.2.20-mixer/src/Makefile.in
*** icewm-1.2.20/src/Makefile.in 2005-01-09 23:48:23.000000000 +0200
--- icewm-1.2.20-mixer/src/Makefile.in 2005-01-14 10:53:32.000000000 +0200
***************
*** 76,82 ****
themes.o decorate.o browse.o \
wmprog.o \
atasks.o aworkspaces.o amailbox.o aclock.o acpustatus.o \
! apppstatus.o aaddressbar.o objbar.o aapm.o atray.o ysmapp.o \
yxtray.o \
$(libitk_OBJS) $(libice_OBJS)
--- 76,82 ----
themes.o decorate.o browse.o \
wmprog.o \
atasks.o aworkspaces.o amailbox.o aclock.o acpustatus.o \
! apppstatus.o aaddressbar.o objbar.o aapm.o amixer.o atray.o ysmapp.o \
yxtray.o \
$(libitk_OBJS) $(libice_OBJS)
diff -rc icewm-1.2.20/src/wmtaskbar.cc icewm-1.2.20-mixer/src/wmtaskbar.cc
*** icewm-1.2.20/src/wmtaskbar.cc 2005-01-09 23:48:23.000000000 +0200
--- icewm-1.2.20-mixer/src/wmtaskbar.cc 2005-01-14 16:39:39.000000000 +0200
***************
*** 41,46 ****
--- 41,47 ----
#include "prefs.h"
#include "aapm.h"
+ #include "amixer.h"
#include "intl.h"
***************
*** 300,305 ****
--- 301,309 ----
#ifdef CONFIG_APPLET_APM
delete fApm; fApm = 0;
#endif
+ #ifdef CONFIG_APPLET_MIXER
+ delete fMixer; fMixer = 0;
+ #endif
#ifdef HAVE_NET_STATUS
delete [] fNetStatus;
#endif
***************
*** 401,406 ****
--- 405,418 ----
} else
fCollapseButton = 0;
+ #ifdef CONFIG_APPLET_MIXER
+ if (taskBarShowMixer)
+ {
+ fMixer = new YMixer(this);
+ } else
+ fMixer = 0;
+ #endif
+
#ifdef CONFIG_APPLET_MAILBOX
fMailBoxStatus = 0;
***************
*** 524,529 ****
--- 536,544 ----
#ifdef CONFIG_APPLET_CLOCK
{ fClock, false, 1, true, 2, 2, false },
#endif
+ #ifdef CONFIG_APPLET_MIXER
+ { fMixer, false, 0, true, 1, 1, false },
+ #endif
#ifdef CONFIG_APPLET_MAILBOX
{ fMailBoxStatus ? fMailBoxStatus[0] : 0, false, 1, true, 1, 1, false },
#warning "a hack"
Only in icewm-1.2.20-mixer/src: wmtaskbar.cc.orig
Only in icewm-1.2.20-mixer/src: wmtaskbar.cc.rej
diff -rc icewm-1.2.20/src/wmtaskbar.h icewm-1.2.20-mixer/src/wmtaskbar.h
*** icewm-1.2.20/src/wmtaskbar.h 2005-01-09 23:48:23.000000000 +0200
--- icewm-1.2.20-mixer/src/wmtaskbar.h 2005-01-14 10:53:32.000000000 +0200
***************
*** 19,24 ****
--- 19,25 ----
class MailBoxStatus;
class YClock;
class YApm;
+ class YMixer;
class TaskPane;
class TrayPane;
class WorkspacesPane;
***************
*** 108,113 ****
--- 109,117 ----
#ifdef CONFIG_APPLET_APM
YApm *fApm;
#endif
+ #ifdef CONFIG_APPLET_MIXER
+ YMixer *fMixer;
+ #endif
#ifdef CONFIG_APPLET_NET_STATUS
NetStatus **fNetStatus;
#endif
Only in icewm-1.2.20-mixer/src: wmtaskbar.h.orig