[Mplayer-cvslog] CVS: main/libmp1e global_data.c,1.1,1.2

[David Holm]

Update of /cvsroot/mplayer/main/libmp1e
In directory mplayer:/var/tmp.root/cvs-serv31899/libmp1e

Modified Files:
	global_data.c 
Log Message:
More FreeBSD fixes.


Index: global_data.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmp1e/global_data.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- global_data.c	4 Dec 2001 23:53:53 -0000	1.1
+++ global_data.c	8 Dec 2001 15:35:24 -0000	1.2
@@ -26,13 +26,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 #include <ctype.h>
 #include <limits.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <asm/types.h>
-#include <linux/soundcard.h>
+#include <unistd.h>
+#include <inttypes.h>
 #include "common/types.h"
 #include "common/log.h"
 #include "common/fifo.h"
@@ -86,9 +85,9 @@
 int			audio_bit_rate_stereo	= 160000;
 long long		audio_num_frames	= INT_MAX;
 int			sampling_rate		= 44100;
-int			mix_line		= SOUND_MIXER_LINE;	// soundcard.h
+int			mix_line		= 0;
 int			mix_volume		= 80;			// 0 <= n <= 100
-int			audio_mode		= AUDIO_MODE_MONO;
+int			audio_mode		= 0;
 int			psycho_loops		= 0;			// 0 = static psy, low, hi quality
 int			mute			= 0;			// bttv specific, boolean