[Mplayer-cvslog] CVS: main/libmpdemux tv.c,1.63,1.64 tv.h,1.26,1.27 tvi_bsdbt848.c,1.7,1.8

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv7491/libmpdemux

Modified Files:
	tv.c tv.h tvi_bsdbt848.c 
Log Message:
audio id setting support for bsdbt848 by Nikolay Nikolaev <nicknickolaev at yahoo.com>

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- tv.c	1 Sep 2003 01:21:40 -0000	1.63
+++ tv.c	6 Sep 2003 00:24:05 -0000	1.64
@@ -57,9 +57,9 @@
 int tv_param_outfmt = IMGFMT_YV12;
 float tv_param_fps = -1.0;
 char **tv_param_channels = NULL;
+int tv_param_audio_id = 0;
 #if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
 int tv_param_amode = -1;
-int tv_param_audio_id = 0;
 int tv_param_volume = 60000;
 int tv_param_bass = -1;
 int tv_param_treble = -1;

Index: tv.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tv.h	13 Aug 2003 18:56:29 -0000	1.26
+++ tv.h	6 Sep 2003 00:24:05 -0000	1.27
@@ -27,9 +27,9 @@
 extern int tv_param_noaudio;
 extern int tv_param_immediate;
 extern int tv_param_audiorate;
+extern int tv_param_audio_id;
 #if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
 extern int tv_param_amode;
-extern int tv_param_audio_id;
 extern int tv_param_volume;
 extern int tv_param_bass;
 extern int tv_param_treble;

Index: tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tvi_bsdbt848.c	29 Apr 2003 02:23:47 -0000	1.7
+++ tvi_bsdbt848.c	6 Sep 2003 00:24:05 -0000	1.8
@@ -358,6 +358,14 @@
             return(0);
             }
 
+#ifdef BT848_SAUDIO
+	if((priv->tunerready == TRUE) &&
+	    ioctl(priv->btfd, BT848_SAUDIO, &tv_param_audio_id) < 0)
+	    {
+	    perror("audioid:ioctl");
+	    }
+#endif
+
         return(TVI_CONTROL_TRUE);
         }