Changeset 945:d65997b421d1 in roaraudio

Timestamp:

12/07/08 23:07:14 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed the way the number of channels is set and added some error messages

File:

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

roard/driver_oss.c

@@ -54 +54 @@
  roar_vio_set_fh(inst, fh);
 
+
+
+#ifdef SNDCTL_DSP_CHANNELS
+ tmp = info->channels;
+
+ if ( ioctl(fh, SNDCTL_DSP_CHANNELS, &tmp) == -1 ) {
+  ROAR_ERR("driver_oss_open(*): can not set number of channels");
+  er();
+ }
+
+ if ( tmp != info->channels ) {
+   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);
+  er();
+ }
+#else
  switch (info->channels) {
   case  1: tmp = 0; break;
@@ -61 +76 @@
 
  if ( ioctl(fh, SNDCTL_DSP_STEREO, &tmp) == -1 ) {
+  ROAR_ERR("driver_oss_open(*): can not set number of channels");
   er();
  }
+#endif
 
  switch (info->codec) {