Changeset 4379:5861284631eb in roaraudio for roard/hwmixer.c

Timestamp:

09/14/10 22:16:53 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support reading volumes at startup

File:

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

roard/hwmixer.c

@@ -137 +137 @@
  streams_set_mixerstream(basestream, stream);
 
+ // try to get in sync with HW mixer.
+ // if possible read hw mixer state.
+ // if not possible write to force a sync value.
  if ( streams_get(basestream, &ss) == 0 ) {
-  hwmixer_set_volume(basestream, ss, stream, &(ss->mixer));
+  if ( mixer->get_vol != NULL ) {
+   hwmixer_get_volume(basestream, ss, stream, &(ss->mixer));
+  } else {
+   hwmixer_set_volume(basestream, ss, stream, &(ss->mixer));
+  }
  }
 
@@ -162 +169 @@
  if ( mstream->hwmixer->set_vol != NULL )
   return mstream->hwmixer->set_vol(mstream, ROAR_STREAM(ss)->info.channels, HWMIXER_MODE_SET, settings);
+
+ return 0;
+}
+
+int hwmixer_get_volume(int id, struct roar_stream_server * ss, struct hwmixer_stream * mstream, struct roar_mixer_settings *
+settings) {
+ if ( mstream->hwmixer->get_vol != NULL )
+  return mstream->hwmixer->get_vol(mstream, ROAR_STREAM(ss)->info.channels, HWMIXER_MODE_ASK, settings);
 
  return 0;