[Pkg-wmaker-commits] [wmmixer] 09/24: Import Debian changes 1.5-4

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sun Aug 27 13:12:52 UTC 2017


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmmixer.

commit 3cc292ecd595ba4c38e16b7665c73b0d9621b72a
Merge: 94d5557 7ca18a0
Author: Doug Torrance <gordon at debian.org>
Date:   Thu Jul 29 08:38:02 2004 +0200

    Import Debian changes 1.5-4
    
    wmmixer (1.5-4) unstable; urgency=low
    
      * Added missing dot to package description (Closes: #174899)
    
    wmmixer (1.5-3) unstable; urgency=low
    
      * gcc-3.x updates to fix FTBFS (Closes: #218942)
        (Thanks, Frank Lichtenheld)
    
    wmmixer (1.5-2) unstable; urgency=low
    
      * Fix documentation error (Closes: #151385)
    
    wmmixer (1.5-1) unstable; urgency=low
    
      * New upstream version
    
    wmmixer (1.4-1) unstable; urgency=low
    
      * New upstream version
    
    wmmixer (1.3-3) unstable; urgency=low
    
      * Fix build failure on ia64 (Closes: #148454)
    
    wmmixer (1.3-2) unstable; urgency=low
    
      * Fix segfault on reading configuration file (Closes: #148245)
      * Support DEB_BUILD_OPTIONS
    
    wmmixer (1.3-1) unstable; urgency=low
    
      * New upstream version
      * Fix build failure on hppa (Closes: #148196)
    
    wmmixer (1.2-1) unstable; urgency=low
    
      * New upstream version

 CHANGES                      |   23 +
 Makefile                     |   37 +-
 README                       |   20 +-
 XPM/.xvpics/norec.xpm        |    5 +
 XPM/.xvpics/wmmixer.xpm      |  Bin 0 -> 3666 bytes
 XPM/.xvpics/wmmixer_new.xpm  |  Bin 0 -> 3666 bytes
 XPM/.xvpics/wmmixer_new2.xpm |  Bin 0 -> 3666 bytes
 XPM/norec.xpm                |   23 +-
 XPM/wmmixer.xpm              |  127 ++---
 common.h                     |   30 ++
 debian/changelog             |   57 +++
 debian/control               |    4 +-
 debian/copyright             |    2 +-
 debian/rules                 |   19 +-
 exception.cc                 |   53 ++
 exception.h                  |   40 ++
 home.wmmixer                 |    2 +-
 mixctl.cc                    |  258 ++++++++++
 mixctl.h                     |  250 +++-------
 wmmixer.1                    |    5 +-
 wmmixer.cc                   | 1107 +++++++++++++++++++-----------------------
 wmmixer.h                    |  196 +++-----
 xhandler.cc                  |  549 +++++++++++++++++++++
 xhandler.h                   |  153 ++++++
 24 files changed, 1932 insertions(+), 1028 deletions(-)

diff --cc README
index c6b2b7d,5109cbb..e77d72b
--- a/README
+++ b/README
@@@ -68,10 -82,10 +82,10 @@@ The effect this has is to enable shape 
  to reduce the size of the window to 56x56 pixels.
  The "-position position" option has also been added, so you can push
  wmcdplay off the edge of the screen while it gets swallowed.
--To put wmmount in your Wharf, add the following line in the appropriate
++To put wmmixer in your Wharf, add the following line in the appropriate
  part of your .steprc
  
--*Wharf wmmixer nil MaxSwallow "wmmount" wmmixer -a -g -0-0 &
++*Wharf wmmixer nil MaxSwallow "wmmixer" wmmixer -a -g -0-0 &
  
  It is also possible (by editing and recompiling the afterstep sources),
  to make Wharf handle the new 56x56 pixel window properly - yes, I add
diff --cc debian/changelog
index a460e51,0000000..1f7494b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,125 -1,0 +1,182 @@@
++wmmixer (1.5-4) unstable; urgency=low
++
++  * Added missing dot to package description (Closes: #174899)
++
++ --  <gordon at debian.org>  Thu, 29 Jul 2004 08:38:02 +0200
++
++wmmixer (1.5-3) unstable; urgency=low
++
++  * gcc-3.x updates to fix FTBFS (Closes: #218942)
++    (Thanks, Frank Lichtenheld)
++
++ -- Gordon Fraser <gordon at debian.org>  Tue, 11 Nov 2003 07:51:21 +0100
++
++wmmixer (1.5-2) unstable; urgency=low
++
++  * Fix documentation error (Closes: #151385)
++
++ -- Gordon Fraser <gordon at debian.org>  Sat, 29 Jun 2002 19:16:55 +0200
++
++wmmixer (1.5-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Gordon Fraser <gordon at debian.org>  Tue, 25 Jun 2002 22:14:11 +0200
++
++wmmixer (1.4-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Gordon Fraser <gordon at debian.org>  Sat,  8 Jun 2002 18:13:17 +0200
++
++wmmixer (1.3-3) unstable; urgency=low
++
++  * Fix build failure on ia64 (Closes: #148454)
++
++ -- Gordon Fraser <gordon at debian.org>  Wed, 29 May 2002 11:29:51 +0200
++
++wmmixer (1.3-2) unstable; urgency=low
++
++  * Fix segfault on reading configuration file (Closes: #148245)
++  * Support DEB_BUILD_OPTIONS
++
++ -- Gordon Fraser <gordon at debian.org>  Mon, 27 May 2002 09:28:24 +0200
++
++wmmixer (1.3-1) unstable; urgency=low
++
++  * New upstream version
++  * Fix build failure on hppa (Closes: #148196)
++
++ -- Gordon Fraser <gordon at debian.org>  Sun, 26 May 2002 13:18:59 +0200
++
++wmmixer (1.2-1) unstable; urgency=low
++
++  * New upstream version
++
++ -- Gordon Fraser <gordon at debian.org>  Sat, 25 May 2002 15:01:15 +0200
++
 +wmmixer (1.1-4) unstable; urgency=low
 +
 +  * Fix version string
 +  * Improve mousewheel behaviour for changing both channels
 +
 + -- Gordon Fraser <gordon at debian.org>  Sun, 14 Apr 2002 15:52:40 +0200
 +
 +wmmixer (1.1-3) unstable; urgency=low
 +
 +  * Added ioctl to check for changes before doing updates
 +    This reduces CPU load a _lot_
 +  * Really give compiler CXXFLAGS
 +  * Get rid of compiler warnings
 +
 + -- Gordon Fraser <gordon at debian.org>  Fri, 12 Apr 2002 09:13:37 +0200
 +
 +wmmixer (1.1-2) unstable; urgency=low
 +
 +  * Correct Makefile to use C++ compiler instead of C compiler 
 +    (Closes: #141696)
 +
 + -- Gordon Fraser <gordon at debian.org>  Mon,  8 Apr 2002 09:00:48 +0200
 +
 +wmmixer (1.1-1) unstable; urgency=low
 +
 +  * New maintainer
 +  * New upstream release, new upstream author - me
 +  * Add manpage (Closes: #93477)
 +  * Add wheelmouse support (Closes: #47984)
 +  * Move executable to /usr/bin (Closes: #122022)
 +  * Update menu entry (Closes: #82330)
 +  * Update X handling, now works with KDE Dock App Bar (Closes: #108529)
 +  * It builds now (new Makefile, without imake), change Build-Depends
 +
 + -- Gordon Fraser <gordon at debian.org>  Tue,  2 Apr 2002 19:36:36 +0200
 +
 +wmmixer (1.0beta1-6.1) unstable; urgency=low
 +
 +  * NMU
 +  * Add Build-Depends: xutils.  Closes: #105305
 +
 + -- LaMont Jones <lamont at smallone.fc.hp.com>  Sat, 14 Jul 2001 23:16:14 -0600
 +
 +wmmixer (1.0beta1-6) unstable; urgency=low
 +
 +  * Can now handle as many channels as your sound card can.
 +  * cleaned up menu file, added a non-docked entry
 +  * Closes: #52908
 +
 + -- Sean 'Shaleh' Perry <shaleh at debian.org>  Fri,  6 Oct 2000 10:46:24 -0700
 +
 +wmmixer (1.0beta1-5) unstable; urgency=low
 +
 +  * New maintainer
 +
 + -- Sean E. Perry <shaleh at debian.org>  Fri,  3 Sep 1999 14:30:29 -0700
 +
 +wmmixer (1.0beta1-4) unstable; urgency=low
 +
 +  * New maintainer
 +
 + -- Neale Pickett <neale at debian.org>  Thu, 25 Feb 1999 14:30:29 -0700
 +
 +wmmixer (1.0beta1-3) frozen unstable; urgency=low
 +
 +  * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482)
 +  * recompiled with lastest g++
 +  * Added frozen to the target distributions...
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Fri,  4 Dec 1998 13:58:26 -0600
 +
 +wmmixer (1.0beta1-2) unstable; urgency=low
 +
 +  * debian/rules: added dh_installexamples home.wmmixer (closes: bug#25482)
 +  * recompiled with lastest g++
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Fri,  4 Dec 1998 12:36:31 -0600
 +
 +wmmixer (1.0beta1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Added CC=c++ to debian/rules (why does it work ok with wmmount but not
 +    with this one?)
 +  * debian/rules: changed cp wmmixer ... to install -s -m 0755 wmmixer ...
 +  * debian/control: upgraded Standards Version to 2.4.1
 +  * debian/control: Suggests: wmaker | afterstep
 +  * debian/rules: nuke -DX_LOCALE after making Makefile
 +  * Added copyright information to debian/rules
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Sun,  4 Oct 1998 20:42:22 -0600
 +
 +wmmixer (0.8-1) frozen unstable; urgency=low
 +
 +  * New upstream version
 +  * WRT version 0.2 this: fixes bug relating to manual window positioning;
 +    reduces CPU load; fixes bug relating to cards with no volume channel;
 +    has better checking of supported channels; is GPLed.
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Sat,  9 May 1998 21:33:48 -0600
 +
 +wmmixer (0.7-1) unstable; urgency=low
 +
 +  * New upstream version. It's GPL'ed now! Moving into main
 +  * Applied patch that handles Expose events
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Sat,  2 May 1998 13:37:54 -0600
 +
 +wmmixer (0.6-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Wed,  8 Apr 1998 21:20:33 -0600
 +
 +wmmixer (0.2-2) frozen unstable; urgency=low
 +
 +  * Moving to non-free due to copyright
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Sat, 21 Mar 1998 15:29:04 -0600
 +
 +wmmixer (0.2-1) unstable; urgency=low
 +
 +  * Initial release
 +
 + -- Marcelo E. Magallon <mmagallo at debian.org>  Sun,  5 Mar 1998 23:01:10 -0600
 +
diff --cc debian/control
index 58cfccd,0000000..afb17b5
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,0 +1,15 @@@
 +Source: wmmixer
- Section: sound
++Section: x11
 +Priority: optional
 +Build-Depends: xlibs-dev, debhelper (>> 3.0.0)
 +Maintainer: Gordon Fraser <gordon at debian.org>
 +Standards-Version: 3.5.6
 +
 +Package: wmmixer
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Suggests: wmaker | afterstep
 +Description: A mixer application designed for WindowMaker
 + There's nothing in the program that makes it require WindowMaker, except
 + maybe the NeXTStep look and the fact that it properly docks. It can
-  be used with other window managers without problems
++ be used with other window managers without problems.
diff --cc debian/copyright
index efff265,0000000..e510f39
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,0 +1,15 @@@
 +This package was first debianized by Marcelo E. Magallon
 +<mmagallo at debian.org> on Sun, 5 Mar 1998 23:00:00 -0600.
 +Additional modifications by Neale Pickett <neale at debian.org> 
 +and Gordon Fraser <gordon at debian.org>
 +
 +wmmixer - a mixer control for WindowMaker, originally by 
 +Sam Hawker <shawkie at geocities.com>, now maintained by 
 +Gordon Fraser <gordon at freakzone.net>
 +
 +It was downloaded from:
 +
-   http://freakzone.net/gordon/wmmixer-1.1.tar.gz
++  http://freakzone.net/gordon/wmmixer-1.3.tar.gz
 +
 +This program is distributed under the GPL. You can find a copy on
 +/usr/share/common-licenses/GPL.
diff --cc debian/rules
index eba03a5,0000000..ffe86f1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,55 -1,0 +1,68 @@@
 +#!/usr/bin/make -f
 +# This is a -*- makefile -*-
 +# Modified from the sample debian/rules that uses debhelper.
 +# GNU copyright 1998 by Marcelo Magallon.
 +# GNU copyright 1997 by Joey Hess.
 +
 +package=wmmixer
 +
- #export DH_VERBOSE = 1
++#export DH_VERBOSE=1
++export DH_COMPAT=3
++
++CXXFLAGS= -Wall -O
++INSTALL = install
++INSTALL_FILE    = $(INSTALL) -D -p    -o root -g root  -m  644
++INSTALL_PROGRAM = $(INSTALL) -D -p    -o root -g root  -m  755
++
++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
++  CXXFLAGS += -g
++endif
++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
++  INSTALL_PROGRAM += -s
++endif
 +
 +build: stamp-build
 +
 +stamp-build:
 +	dh_testdir
- 	$(MAKE)
++	$(MAKE) CXXFLAGS="$(CXXFLAGS)"
 +	touch stamp-build
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	-rm -f stamp-build
 +	-$(MAKE) clean
 +	dh_clean
 +
 +install:
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
- 	$(MAKE) prefix=/usr DESTDIR=$(CURDIR)/debian/wmmixer install
++	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" prefix=/usr DESTDIR=$(CURDIR)/debian/wmmixer install
 +
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installdocs README
 +	dh_installexamples home.wmmixer
 +	dh_installmenu
 +	dh_installman
 +	dh_installchangelogs CHANGES
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary:	binary-indep binary-arch
 +
 +.PHONY: binary binary-arch binary-indep build clean install
 +
 +
diff --cc exception.h
index 0000000,3923006..4c8a138
mode 000000,100644..100644
--- a/exception.h
+++ b/exception.h
@@@ -1,0 -1,40 +1,40 @@@
+ // wmmixer - A mixer designed for WindowMaker
+ //
+ // Release 1.5
+ // Copyright (C) 1998  Sam Hawker <shawkie at geocities.com>
+ // Copyright (C) 2002 Gordon Fraser <gordon at debian.org>
+ // This software comes with ABSOLUTELY NO WARRANTY
+ // This software is free software, and you are welcome to redistribute it
+ // under certain conditions
+ // See the COPYING file for details.
+ 
+ 
+ #ifndef __exception_h__
+ #define __exception_h__
+ 
+ #include <stdlib.h>
+ #include <string.h>
+ 
+ //--------------------------------------------------------------------
+ class Exception
+ {
+  protected:
+   char* error_message_;
+   
+  public:
+   Exception();
+   Exception(const Exception&);
+   virtual ~Exception();
+   char* getErrorMessage() const;
+ };
+ 
+ 
+ //--------------------------------------------------------------------
+ class MixerDeviceException : public Exception
+ {
+  public:
+   MixerDeviceException(char *);
+   //  virtual ~MixerDeviceException();
+ };
+ 
 -#endif _exception_h__
++#endif //_exception_h__
diff --cc mixctl.cc
index 0000000,7cf3261..10de39d
mode 000000,100644..100644
--- a/mixctl.cc
+++ b/mixctl.cc
@@@ -1,0 -1,258 +1,258 @@@
+ // mixctl.h - MixCtl class provides control of audio mixer functions
+ //
+ // Release 1.5
+ // Copyright (C) 1998  Sam Hawker <shawkie at geocities.com>
+ // Copyright (C) 2002 Gordon Fraser <gordon at debian.org>
+ // This software comes with ABSOLUTELY NO WARRANTY
+ // This software is free software, and you are welcome to redistribute it
+ // under certain conditions
+ // See the COPYING file for details.
+ 
+ 
+ 
+ #include "mixctl.h"
+ 
+ //----------------------------------------------------------------------
+ MixCtl::MixCtl(char *device_name) throw(MixerDeviceException)
+ {
+   device_ = new char[strlen(device_name)+1];
+   strcpy(device_, device_name);
+ 
+   modify_counter = -1;
+ 
+   if((mixfd = open(device_,O_RDONLY | O_NONBLOCK)) != -1)
+     {
+       num_devices_      = SOUND_MIXER_NRDEVICES;
+       char *devnames[]  = SOUND_DEVICE_NAMES;
+       char *devlabels[] = SOUND_DEVICE_LABELS;
+       ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask);
+       ioctl(mixfd, SOUND_MIXER_READ_STEREODEVS, &stmask);
+       ioctl(mixfd, SOUND_MIXER_READ_RECMASK, &recmask);
+       ioctl(mixfd, SOUND_MIXER_READ_CAPS, &caps);
+ 
+       mixer_devices_ = new MixerDevice[num_devices_];
+       int mixmask = 1;
+ 
+       for(unsigned count=0; count<num_devices_; count++)
+ 	{
+ 	  mixer_devices_[count].support = devmask & mixmask;
+ 	  mixer_devices_[count].stereo  = stmask  & mixmask;
+ 	  mixer_devices_[count].records = recmask & mixmask;
+ 	  mixer_devices_[count].mask    = mixmask;
+ 	  mixer_devices_[count].name    = devnames[count];
+ 	  mixer_devices_[count].label   = devlabels[count];
+ 	  mixer_devices_[count].muted   = 0;
+ 	  mixmask*=2;
+ 	}
+       doStatus();
+     }
+   else
+     {
+       throw MixerDeviceException(device_name);
+     }
+ }
+ 
+ //----------------------------------------------------------------------
+ MixCtl::~MixCtl()
+ {
+   if(mixer_devices_ != NULL)
+     delete[](mixer_devices_);
+   close(mixfd);
+ 
+   delete[] device_;
+ }
+ 
+ //----------------------------------------------------------------------
+ bool MixCtl::isMuted(int channel)
+ {
+   return mixer_devices_[channel].muted;
+ }
+ 
+ //----------------------------------------------------------------------
+ void MixCtl::mute(int channel)
+ {
+   mixer_devices_[channel].muted = mixer_devices_[channel].value;
+   mixer_devices_[channel].value = 0;
+   writeVol(channel);
+ }
+ 
+ //----------------------------------------------------------------------
+ void MixCtl::unmute(int channel)
+ {
+   mixer_devices_[channel].value = mixer_devices_[channel].muted;
+   mixer_devices_[channel].muted = 0;
+   writeVol(channel);
+ }
+ 
+ //----------------------------------------------------------------------
+ void MixCtl::doStatus()
+ {
+   ioctl(mixfd, SOUND_MIXER_READ_RECSRC, &recsrc);
+   for(unsigned i=0;i<num_devices_;i++)
+     {
+       if(mixer_devices_[i].support)
+ 	{
+ 	  ioctl(mixfd, MIXER_READ(i), &mixer_devices_[i].value);
+ 	}
+       mixer_devices_[i].recsrc=(recsrc & mixer_devices_[i].mask);
+     }
+ }
+ 
+ 
+ //----------------------------------------------------------------------
+ // Return volume for a device, optionally reading it from device first.
+ // Can be used as a way to avoid calling doStatus().
+ int MixCtl::readVol(int dev, bool read)
+ {
+   if(read)
+     {
+       ioctl(mixfd, MIXER_READ(dev), &mixer_devices_[dev].value);
+     }
+   return mixer_devices_[dev].value;
+ }
+ 
+ //----------------------------------------------------------------------
+ // Return left and right componenets of volume for a device.
+ // If you are lazy, you can call readVol to read from the device, then these
+ // to get left and right values.
+ int MixCtl::readLeft(int dev)
+ {
+   return mixer_devices_[dev].value%256;
+ }
+ 
+ //----------------------------------------------------------------------
+ int MixCtl::readRight(int dev)
+ {
+   return mixer_devices_[dev].value/256;
+ }
+ 
+ //----------------------------------------------------------------------
+ // Write volume to device. Use setVolume, setLeft and setRight first.
+ void MixCtl::writeVol(int dev)
+ {
+   ioctl(mixfd, MIXER_WRITE(dev), &mixer_devices_[dev].value);
+ }
+ 
+ //----------------------------------------------------------------------
+ // Set volume (or left or right component) for a device. You must call writeVol to write it.
+ void MixCtl::setVol(int dev, int value)
+ {
+   mixer_devices_[dev].value=value;
+ }
+ //----------------------------------------------------------------------
+ void MixCtl::setBoth(int dev, int l, int r)
+ {
+   mixer_devices_[dev].value=256*r+l;
+ }
+ //----------------------------------------------------------------------
+ void MixCtl::setLeft(int dev, int l)
+ {
+   int r;
+   if(mixer_devices_[dev].stereo)
+     r=mixer_devices_[dev].value/256;
+   else
+     r=l;
+   mixer_devices_[dev].value=256*r+l;
+ }
+ //----------------------------------------------------------------------
+ void MixCtl::setRight(int dev, int r)
+ {
+   int l;
+   if(mixer_devices_[dev].stereo)
+     l=mixer_devices_[dev].value%256;
+   else
+     l=r;
+   mixer_devices_[dev].value=256*r+l;
+ }
+ 
+ //----------------------------------------------------------------------
+ // Return record source value for a device, optionally reading it from device first.
+ bool MixCtl::readRec(int dev, bool read)
+ {
+   if(read)
+     {
+       ioctl(mixfd, SOUND_MIXER_READ_RECSRC, &recsrc);
+       mixer_devices_[dev].recsrc=(recsrc & mixer_devices_[dev].mask);
+     }
+   return mixer_devices_[dev].recsrc;
+ }
+ 
+ //----------------------------------------------------------------------
+ // Write record source values to device. Use setRec first.
+ void MixCtl::writeRec(){
+   ioctl(mixfd, SOUND_MIXER_WRITE_RECSRC, &recsrc);
+ }
+ 
+ //----------------------------------------------------------------------
+ // Make a device (not) a record source.
+ void MixCtl::setRec(int dev, bool rec)
+ {
+   if(rec)
+     {
+       if(caps & SOUND_CAP_EXCL_INPUT)
+ 	recsrc=mixer_devices_[dev].mask;
+       else
+ 	recsrc|=mixer_devices_[dev].mask;
+     }
+   else
+     recsrc&=~mixer_devices_[dev].mask;
+ }
+ 
+ //----------------------------------------------------------------------
+ // Return various other info
+ char* MixCtl::getDevName()
+ {
+   return device_;
+ }
+ //----------------------------------------------------------------------
+ unsigned MixCtl::getNrDevices()
+ {
+   return num_devices_;
+ }
+ //----------------------------------------------------------------------
+ int MixCtl::getCapabilities()
+ {
+   return caps;
+ }
+ //----------------------------------------------------------------------
+ bool MixCtl::getSupport(int dev)
+ {
+   return mixer_devices_[dev].support;
+ }
+ //----------------------------------------------------------------------
+ bool MixCtl::getStereo(int dev)
+ {
+   return mixer_devices_[dev].stereo;
+ }
+ //----------------------------------------------------------------------
+ bool MixCtl::getRecords(int dev)
+ {
+   return mixer_devices_[dev].records;
+ }
+ //----------------------------------------------------------------------
+ char* MixCtl::getName(int dev)
+ {
+   return mixer_devices_[dev].name;
+ }
+ //----------------------------------------------------------------------
+ char* MixCtl::getLabel(int dev)
+ {
+   return mixer_devices_[dev].label;
+ }
+ 
+ //----------------------------------------------------------------------
+ bool MixCtl::hasChanged()
+ {
 -  struct mixer_info mixer_info;
 -  ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info);
++  struct mixer_info mixer_info1;
++  ioctl(mixfd, SOUND_MIXER_INFO, &mixer_info1);
+      
 -  if (mixer_info.modify_counter == modify_counter)
++  if (mixer_info1.modify_counter == modify_counter)
+     {
+       return false;
+     }
+   else 
+     {
 -      modify_counter = mixer_info.modify_counter;
++      modify_counter = mixer_info1.modify_counter;
+       return true;
+     }
+ }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmmixer.git



More information about the Pkg-wmaker-commits mailing list