# HG changeset patch # User chainsaw # Date 1136926070 28800 # Node ID d55ffce8b1ba6b126b56b73756d7f4ea46a8393a # Parent 7fa1738514d5353202843bfc8280508b2a82ca9d [svn] Use FMT_S16_NE instead of unnecessary #ifdef WORDS_BIGENDIAN trickery. diff -r 7fa1738514d5 -r d55ffce8b1ba Plugins/Input/wav/wav-sndfile.c --- a/Plugins/Input/wav/wav-sndfile.c Tue Jan 10 12:22:40 2006 -0800 +++ b/Plugins/Input/wav/wav-sndfile.c Tue Jan 10 12:47:50 2006 -0800 @@ -131,7 +131,7 @@ samples = sf_read_short (sndfile, buffer, BUFFER_SIZE); if (samples > 0 && decoding) - { wav_ip.add_vis_pcm (wav_ip.output->written_time (), HOST_SIGNED_SHORT, sfinfo.channels, samples * sizeof (short), buffer); + { wav_ip.add_vis_pcm (wav_ip.output->written_time (), FMT_S16_NE, sfinfo.channels, samples * sizeof (short), buffer); while ((wav_ip.output->buffer_free () < (samples * sizeof (short))) && decoding) xmms_usleep (10000); @@ -178,7 +178,7 @@ else song_length = 0; - if (! wav_ip.output->open_audio (HOST_SIGNED_SHORT, sfinfo.samplerate, sfinfo.channels)) + if (! wav_ip.output->open_audio (FMT_S16_NE, sfinfo.samplerate, sfinfo.channels)) { sf_close (sndfile); sndfile = NULL; return; diff -r 7fa1738514d5 -r d55ffce8b1ba Plugins/Input/wav/wav-sndfile.h --- a/Plugins/Input/wav/wav-sndfile.h Tue Jan 10 12:22:40 2006 -0800 +++ b/Plugins/Input/wav/wav-sndfile.h Tue Jan 10 12:47:50 2006 -0800 @@ -25,12 +25,6 @@ #define BUFFER_SIZE 8192 #define TITLE_LEN 64 -#ifdef WORDS_BIGENDIAN -# define HOST_SIGNED_SHORT FMT_S16_BE -#else -# define HOST_SIGNED_SHORT FMT_S16_LE -#endif - static void plugin_init (void); static int is_our_file (char *filename); static void play_start (char *filename);