# HG changeset patch # User chainsaw # Date 1136986826 28800 # Node ID 8ddd961ef0ff65b42717c647f9ce6c545ddbe710 # Parent cb00a4b01302a5aae48d2fb0a4bb3e8ba771406b [svn] Use FMT_S16_NE instead of unnecessary #ifdef WORDS_BIGENDIAN trickery. diff -r cb00a4b01302 -r 8ddd961ef0ff Plugins/Input/console/Audacious_Driver.cpp --- a/Plugins/Input/console/Audacious_Driver.cpp Tue Jan 10 16:50:39 2006 -0800 +++ b/Plugins/Input/console/Audacious_Driver.cpp Wed Jan 11 05:40:26 2006 -0800 @@ -28,12 +28,6 @@ #include #include -#ifdef WORDS_BIGENDIAN -# define MY_FMT FMT_S16_BE -#else -# define MY_FMT FMT_S16_LE -#endif - static Spc_Emu *spc = NULL; static Nsf_Emu *nsf = NULL; static Gbs_Emu *gbs = NULL; @@ -245,7 +239,7 @@ g_free(name); - if (!console_ip.output->open_audio(MY_FMT, samplerate, 2)) + if (!console_ip.output->open_audio(FMT_S16_NE, samplerate, 2)) return; playing_type = PLAY_TYPE_SPC; @@ -286,7 +280,7 @@ g_free(name); - if (!console_ip.output->open_audio(MY_FMT, samplerate, 2)) + if (!console_ip.output->open_audio(FMT_S16_NE, samplerate, 2)) return; playing_type = PLAY_TYPE_NSF; @@ -327,7 +321,7 @@ g_free(name); - if (!console_ip.output->open_audio(MY_FMT, samplerate, 2)) + if (!console_ip.output->open_audio(FMT_S16_NE, samplerate, 2)) return; playing_type = PLAY_TYPE_GBS; @@ -371,7 +365,7 @@ g_free(name); - if (!console_ip.output->open_audio(MY_FMT, samplerate, 2)) + if (!console_ip.output->open_audio(FMT_S16_NE, samplerate, 2)) return; playing_type = PLAY_TYPE_GYM; @@ -412,7 +406,7 @@ g_free(name); - if (!console_ip.output->open_audio(MY_FMT, samplerate, 2)) + if (!console_ip.output->open_audio(FMT_S16_NE, samplerate, 2)) return; playing_type = PLAY_TYPE_VGM; @@ -509,7 +503,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, NULL); + FMT_S16_NE, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -541,7 +535,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, NULL); + FMT_S16_NE, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -573,7 +567,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, NULL); + FMT_S16_NE, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -608,7 +602,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, NULL); + FMT_S16_NE, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -640,7 +634,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, NULL); + FMT_S16_NE, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); }