Looks good for HEAD and 310Atlas.

--greg.


Justin Gallardo wrote:
> Modified by: Justin Gallardo <jirwin at osuosl.org>
> Date: <09:26:07>
> Project: helix-client
> 
> Synopsis:  Added some logic to default to alsa when the olpc profile is used.
> 
> Files Modified:
> audio/device/hxaudev.cpp
> 
> Platforms and Profiles Functionality verified:
> x86, helix-client-OLPC
> 
> Branch: HEAD
> 
> Copyright assignment:
> 
> In consideration for RealNetworks' hosting and maintenance of my
> modification,
> I agree to assign to RealNetworks full copyright ownership of the code
> included
> in the attached patch, and agree that RealNetworks has no duty of
> accounting to
> me for it. I warrant that this code is entirely original to and owned by me,
> that I can legally grant the copyright assignment, and that my contribution
> does not violate any other person's rights, and laws or breach any
> contract. I
> understand that RealNetworks may license this code under RPSL, RCSL,
> and/or any
> other license at RealNetworks' discretion, and use the code in any way.
> 
> ? Makefile
> ? Umakefil.upp
> ? alsa.patch
> ? auddevlib.mak
> ? auddevlib.upp
> ? dbg
> ? rel
> ? ribosome_logs
> Index: hxaudev.cpp
> ===================================================================
> RCS file: /cvsroot/audio/device/hxaudev.cpp,v
> retrieving revision 1.34
> diff -u -w -r1.34 hxaudev.cpp
> --- hxaudev.cpp	6 Jul 2007 20:21:11 -0000	1.34
> +++ hxaudev.cpp	26 Sep 2007 22:36:50 -0000
> @@ -248,7 +248,11 @@
>  #endif
> 
>  #if defined(_LINUX) ||  defined(_FREEBSD) || defined(_NETBSD)
> +# if defined(HELIX_FEATURE_OLPC)
> +    UINT16 nSoundDriver = kALSA;
> +# else
>      UINT16 nSoundDriver = kOSS;
> +# endif
>      ReadPrefUINT16(z_pIHXPrefs, "SoundDriver", nSoundDriver );
> 
>  #if defined(HELIX_FEATURE_USOUND)
> 
>