# HG changeset patch # User pontscho # Date 987626344 0 # Node ID 5cc44d8c20f294e5b2ba9a79a82d0f44305586fa # Parent e80c8abd26d11450293f2f31913cd4d3019a5e01 some code cleanup diff -r e80c8abd26d1 -r 5cc44d8c20f2 mixer.c --- a/mixer.c Wed Apr 18 20:38:03 2001 +0000 +++ b/mixer.c Wed Apr 18 20:39:04 2001 +0000 @@ -7,20 +7,14 @@ #include "mixer.h" -#define DEV_MIXER "/dev/mixer" - char * mixer_device=NULL; -char * devname=NULL; int mixer_usemaster=0; void mixer_getvolume( int *l,int *r ) { int fd,v,cmd,devs; - if ( !mixer_device ) devname=strdup( DEV_MIXER ); - else devname=strdup( mixer_device ); - fd=open( devname,O_RDONLY ); - free( devname ); + fd=open( mixer_device,O_RDONLY ); if ( fd != -1 ) { ioctl( fd,SOUND_MIXER_READ_DEVMASK,&devs ); @@ -43,10 +37,7 @@ { int fd,v,cmd,devs; - if ( !mixer_device ) devname=strdup( DEV_MIXER ); - else devname=strdup( mixer_device ); - fd=open( devname,O_RDONLY ); - free( devname ); + fd=open( mixer_device,O_RDONLY ); if ( fd != -1 ) { ioctl( fd,SOUND_MIXER_READ_DEVMASK,&devs );