Changeset 1533:c596caf4c8f8 in roaraudio

Timestamp:

04/12/09 01:10:01 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done a lot cleanup

File:

• roard/driver_oss.c (modified) (8 diffs)

roard/driver_oss.c

@@ -104 +104 @@
  }
 
- ROAR_WARN("driver_oss_config_device(self=%p): ssid=%i, autoconfig=%i", self, self->ssid, autoconfig);
+ ROAR_DBG("driver_oss_config_device(self=%p): ssid=%i, autoconfig=%i", self, self->ssid, autoconfig);
 
 #ifdef SNDCTL_DSP_CHANNELS
@@ -110 +110 @@
 
  if ( ioctl(fh, SNDCTL_DSP_CHANNELS, &tmp) == -1 ) {
-  ROAR_ERR("driver_oss_open(*): can not set number of channels");
+  ROAR_ERR("driver_oss_config_device(*): can not set number of channels");
   return -1;
  }
@@ -119 +119 @@
    self->info.channels = tmp;
   } else {
-   ROAR_ERR("driver_oss_open(*): can not set requested numer of channels, OSS suggested %i channels, to use this restart with -oO channels=%i or set codec manuelly via -oO channels=num", tmp, tmp);
+   ROAR_ERR("driver_oss_config_device(*): can not set requested numer of channels, OSS suggested %i channels, to use this restart with -oO channels=%i or set codec manuelly via -oO channels=num", tmp, tmp);
    return -1;
   }
@@ -131 +131 @@
 
  if ( ioctl(fh, SNDCTL_DSP_STEREO, &tmp) == -1 ) {
-  ROAR_ERR("driver_oss_open(*): can not set number of channels");
+  ROAR_ERR("driver_oss_config_device(*): can not set number of channels");
   return -1;
  }
@@ -194 +194 @@
  if ( ioctl(fh, SNDCTL_DSP_SAMPLESIZE, &tmp) == -1 ) {
 #endif
-  ROAR_ERR("driver_oss_open(*): can not set sample format");
+  ROAR_ERR("driver_oss_config_device(*): can not set sample format");
   return -1;
  }
@@ -247 +247 @@
 
    if ( es != NULL ) {
-    ROAR_ERR("driver_oss_open(*): can not set requested codec, OSS retruned another codec than requested, to use this restart with -oO %s or set codec manuelly via -oO codec=somecodec", es);
+    ROAR_ERR("driver_oss_config_device(*): can not set requested codec, OSS retruned another codec than requested, to use this restart with -oO %s or set codec manuelly via -oO codec=somecodec", es);
    } else {
-    ROAR_ERR("driver_oss_open(*): can not set requested codec, set codec manuelly via -oO codec=somecodec");
+    ROAR_ERR("driver_oss_config_device(*): can not set requested codec, set codec manuelly via -oO codec=somecodec");
    }
    return -1;
@@ -258 +258 @@
 
  if ( ioctl(fh, SNDCTL_DSP_SPEED, &tmp) == -1 ) {
-  ROAR_ERR("driver_oss_open(*): can not set sample rate");
+  ROAR_ERR("driver_oss_config_device(*): can not set sample rate");
   return -1;
  }
@@ -271 +271 @@
 
    if ( tmp < info->rate * 0.98 || tmp > info->rate * 1.02 ) {
-    ROAR_ERR("driver_oss_open(*): sample rate out of acceptable accuracy");
+    ROAR_ERR("driver_oss_config_device(*): sample rate out of acceptable accuracy");
     return -1;
    }