changeset 417:8ddd961ef0ff trunk

[svn] Use FMT_S16_NE instead of unnecessary #ifdef WORDS_BIGENDIAN trickery.
author chainsaw
date Wed, 11 Jan 2006 05:40:26 -0800
parents cb00a4b01302
children f03932d43230
files Plugins/Input/console/Audacious_Driver.cpp
diffstat 1 files changed, 10 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- 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 <cstring>
 #include <stdio.h>
 
-#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);
 	}