[MPlayer-cvslog] CVS: main/libmpdemux demuxer.c, 1.178, 1.179 tv.c, 1.68, 1.69 tvi_bsdbt848.c, 1.14, 1.15 tvi_v4l.c, 1.72, 1.73 tvi_v4l2.c, 1.18, 1.19

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv24154/libmpdemux

Modified Files:
	demuxer.c tv.c tvi_bsdbt848.c tvi_v4l.c tvi_v4l2.c 
Log Message:
removing AFMT_ dependancy

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- demuxer.c	21 Dec 2004 12:25:59 -0000	1.178
+++ demuxer.c	27 Dec 2004 17:30:14 -0000	1.179
@@ -18,7 +18,7 @@
 #include "stheader.h"
 #include "mf.h"
 
-#include "../libao2/afmt.h"
+#include "../libaf/af_format.h"
 #include "../libvo/fastmemcpy.h"
 
 // Should be set to 1 by demux module if ids it passes to new_sh_audio and
@@ -91,7 +91,7 @@
         sh = demuxer->a_streams[id];
         // set some defaults
         sh->samplesize=2;
-        sh->sample_format=AFMT_S16_NE;
+        sh->sample_format=AF_FORMAT_S16_NE;
         sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
         if (identify && !demux_aid_vid_mismatch)
           mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", id);

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- tv.c	19 Nov 2004 13:04:24 -0000	1.68
+++ tv.c	27 Dec 2004 17:30:14 -0000	1.69
@@ -29,8 +29,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libao2/afmt.h"
-#include "../libao2/audio_out.h"
+#include "../libaf/af_format.h"
 #include "../libvo/img_format.h"
 #include "../libvo/fastmemcpy.h"
 
@@ -516,6 +515,7 @@
     {
 	int audio_format;
 	int sh_audio_format;
+	char buf[128];
 
 	/* yeah, audio is present */
 
@@ -527,24 +527,24 @@
 
 	switch(audio_format)
 	{
-	    case AFMT_U8:
-	    case AFMT_S8:
-	    case AFMT_U16_LE:
-	    case AFMT_U16_BE:
-	    case AFMT_S16_LE:
-	    case AFMT_S16_BE:
-	    case AFMT_S32_LE:
-	    case AFMT_S32_BE:
+	    case AF_FORMAT_U8:
+	    case AF_FORMAT_S8:
+	    case AF_FORMAT_U16_LE:
+	    case AF_FORMAT_U16_BE:
+	    case AF_FORMAT_S16_LE:
+	    case AF_FORMAT_S16_BE:
+	    case AF_FORMAT_S32_LE:
+	    case AF_FORMAT_S32_BE:
 		sh_audio_format = 0x1; /* PCM */
 		break;
-	    case AFMT_IMA_ADPCM:
-	    case AFMT_MU_LAW:
-	    case AFMT_A_LAW:
-	    case AFMT_MPEG:
-	    case AFMT_AC3:
+	    case AF_FORMAT_IMA_ADPCM:
+	    case AF_FORMAT_MU_LAW:
+	    case AF_FORMAT_A_LAW:
+	    case AF_FORMAT_MPEG2:
+	    case AF_FORMAT_AC3:
 	    default:
 		mp_msg(MSGT_TV, MSGL_ERR, "Audio type '%s (%x)' unsupported!\n",
-		    audio_out_format_name(audio_format), audio_format);
+		    af_fmt2str(audio_format, &buf, 128), audio_format);
 		goto no_audio;
 	}
 	

Index: tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tvi_bsdbt848.c	18 Jun 2004 13:01:18 -0000	1.14
+++ tvi_bsdbt848.c	27 Dec 2004 17:30:14 -0000	1.15
@@ -61,6 +61,7 @@
 #endif
 #endif
 
+#include "../libaf/af_format.h"
 #include "../libvo/img_format.h"
 #include "tv.h"
 
@@ -246,7 +247,7 @@
 
     case TVI_CONTROL_AUD_GET_FORMAT:
         {
-        (int)*(void **)arg = AFMT_S16_LE;
+        (int)*(void **)arg = AF_FORMAT_S16_LE;
         return(TVI_CONTROL_TRUE);
         }
     case TVI_CONTROL_AUD_GET_CHANNELS:

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tvi_v4l.c	1 May 2004 18:15:29 -0000	1.72
+++ tvi_v4l.c	27 Dec 2004 17:30:14 -0000	1.73
@@ -41,7 +41,7 @@
 #endif
 
 #include "mp_msg.h"
-#include "../libao2/afmt.h"
+#include "../libaf/af_format.h"
 #include "../libvo/img_format.h"
 #include "../libvo/fastmemcpy.h"
 #include "../libvo/videodev_mjpeg.h"
@@ -1285,7 +1285,7 @@
 	/* ========== AUDIO controls =========== */
 	case TVI_CONTROL_AUD_GET_FORMAT:
 	{
-	    *(int *)arg = AFMT_S16_LE;
+	    *(int *)arg = AF_FORMAT_S16_LE;
 	    return(TVI_CONTROL_TRUE);
 	}
 	case TVI_CONTROL_AUD_GET_CHANNELS:

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tvi_v4l2.c	22 Dec 2004 13:19:30 -0000	1.18
+++ tvi_v4l2.c	27 Dec 2004 17:30:15 -0000	1.19
@@ -43,7 +43,7 @@
 #include "videodev2.h"
 #include "../mp_msg.h"
 #include "../libvo/img_format.h"
-#include "../libao2/afmt.h"
+#include "../libaf/af_format.h"
 #include "tv.h"
 #include "audio_in.h"
 
@@ -731,7 +731,7 @@
 	}
 	return TVI_CONTROL_TRUE;
     case TVI_CONTROL_AUD_GET_FORMAT:
-	*(int *)arg = AFMT_S16_LE;
+	*(int *)arg = AF_FORMAT_S16_LE;
 	mp_msg(MSGT_TV, MSGL_V, "%s: get audio format: %d\n",
 	       info.short_name, *(int *)arg);
 	return TVI_CONTROL_TRUE;