Merge configuration fixes

[disorder] / lib / uaudio-oss.c

diff --git a/lib/uaudio-oss.c b/lib/uaudio-oss.c
index adb227bd170457eec78750933dae0fa52bd30f76..35e14c0305bc000c0e8a36bc7b521b80bd5ff36c 100644 (file)
--- a/lib/uaudio-oss.c
+++ b/lib/uaudio-oss.c
@@ -146,11 +146,11 @@ static void oss_stop(void) {
 static const char *oss_channels[] = SOUND_DEVICE_NAMES;
 
 static int oss_mixer_find_channel(const char *channel) {
 static const char *oss_channels[] = SOUND_DEVICE_NAMES;
 
 static int oss_mixer_find_channel(const char *channel) {

-  if(!channel[strspn(c, "0123456789")])
+  if(!channel[strspn(channel, "0123456789")])

     return atoi(channel);
   else {
     return atoi(channel);
   else {

-    for(int n = 0; n < sizeof oss_channels / sizeof *oss_channels; ++n)
-      if(!strcmp(oss_channels[n], channels))
+    for(unsigned n = 0; n < sizeof oss_channels / sizeof *oss_channels; ++n)
+      if(!strcmp(oss_channels[n], channel))

        return n;
     return -1;
   }
        return n;
     return -1;
   }


@@ -176,7 +176,7 @@ static void oss_get_volume(int *left, int *right) {
   int r;
 
   *left = *right = 0;
   int r;
 
   *left = *right = 0;

-  if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(ch), &r) < 0)
+  if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(oss_mixer_channel), &r) < 0)

     error(errno, "error getting volume");
   else {
     *left = r & 0xff;
     error(errno, "error getting volume");
   else {
     *left = r & 0xff;


@@ -186,9 +186,9 @@ static void oss_get_volume(int *left, int *right) {
 
 static void oss_set_volume(int *left, int *right) {
   int r =  (*left & 0xff) + (*right & 0xff) * 256;
 
 static void oss_set_volume(int *left, int *right) {
   int r =  (*left & 0xff) + (*right & 0xff) * 256;

-  if(ioctl(fd, SOUND_MIXER_WRITE(ch), &r) == -1)
+  if(ioctl(oss_mixer_fd, SOUND_MIXER_WRITE(oss_mixer_channel), &r) == -1)

     error(errno, "error setting volume");
     error(errno, "error setting volume");

-  else if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(ch), &r) < 0)
+  else if(ioctl(oss_mixer_fd, SOUND_MIXER_READ(oss_mixer_channel), &r) < 0)

     error(errno, "error getting volume");
   else {
     *left = r & 0xff;
     error(errno, "error getting volume");
   else {
     *left = r & 0xff;