[MPlayer-dev-eng] merging alsa9/alsa1.x

[James Courtier-Dutton]

joy at pingfm.org wrote:
> On Fri, 16 Apr 2004, James Courtier-Dutton wrote:
>>
>>Why is there a difference between alsa 0.9 and alsa 1.x driver in mplayer.
>>It is possible with only adding 2 lines to the source code, to make a 
>>single driver that works for 0.9.0rc2 and above.
> 
> that is exactly what i want, or already did. it's about up to 5 lines, 
> but not many differences though. 
> 
> regards
> 
> joy
> 

Which 5 lines do you use ?

My two lines are just to insert these 2 lines somewhere before
"#include <alsa/asoundlib.h>"

#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API

So, in your libao2/ao_alsa1x.c would change to: -
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#if HAVE_SYS_ASOUNDLIB_H
#include <sys/asoundlib.h>
#elif HAVE_ALSA_ASOUNDLIB_H
#include <alsa/asoundlib.h>
#else
#error "asoundlib.h is not in sys/ or alsa/ - please bugreport"
#endif