Changeset 4378:df6cda763dce in roaraudio

Timestamp:

09/14/10 22:07:07 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implemented support to read mixer values from hwmixer

Location:

roard

Files:

• hwmixer.c (modified) (1 diff)
• hwmixer_oss.c (modified) (1 diff)
• include/hwmixer.h (modified) (1 diff)

roard/hwmixer.c

@@ -43 +43 @@
 
 struct hwmixer g_hwmixers[] = {
- {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, hwmixer_oss_open, hwmixer_oss_close, hwmixer_oss_set_vol, NULL},
+ {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, hwmixer_oss_open, hwmixer_oss_close, hwmixer_oss_set_vol, hwmixer_oss_get_vol},
  {"file", "Write to plain file", "/some/file", FLAG_FHSEC, NULL, NULL, NULL, NULL},
  {"dstr", "Write to DSTR",       "/some/file", FLAG_NONE,  hwmixer_dstr_open, hwmixer_dstr_close, hwmixer_dstr_set_vol, NULL},

roard/hwmixer_oss.c

@@ -182 +182 @@
 }
 
+int hwmixer_oss_get_vol(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings) {
+ struct roar_vio_calls * vio = stream->baseud;
+ struct roar_vio_sysio_ioctl ctl;
+ struct subdev         * subdev = stream->ud;
+ int i;
+ int l, r;
+
+ ctl.cmd = subdev->cmd_read;
+ ctl.argp = &i;
+
+ if ( roar_vio_ctl(vio, ROAR_VIO_CTL_SYSIO_IOCTL, &ctl) == -1 )
+  return -1;
+
+ l =  i       & 0xFF;
+ r = (i >> 8) & 0xFF;
+
+ if ( subdev->channels == 1 )
+  r = l;
+
+ settings->scale    = OSS_VOLUME_SCALE;
+
+ if ( channels == 1 ) {
+  settings->mixer[0] = (l + r) / 2;
+ } else if ( channels == 2 ) {
+  settings->mixer[0] = l;
+  settings->mixer[1] = r;
+ } else {
+  return -1;
+ }
+
+ return 0;
+}
+
 //ll

roard/include/hwmixer.h

@@ -60 +60 @@
 int hwmixer_oss_close(struct hwmixer_stream * stream);
 int hwmixer_oss_set_vol(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings);
+int hwmixer_oss_get_vol(struct hwmixer_stream * stream, int channels, int mode, struct roar_mixer_settings * settings);
 
 #endif