[MPlayer-cvslog] CVS: main Makefile, 1.311, 1.312 mencoder.c, 1.258, 1.259 mplayer.c, 1.822, 1.823

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

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

Modified Files:
	Makefile mencoder.c mplayer.c 
Log Message:
removing AFMT_ dependancy

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- Makefile	5 Nov 2004 14:02:40 -0000	1.311
+++ Makefile	27 Dec 2004 17:30:12 -0000	1.312
@@ -20,7 +20,7 @@
 endif
 
 SRCS_COMMON = cpudetect.c codec-cfg.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c m_config.c m_option.c parser-cfg.c m_struct.c edl.c
-SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c parser-mecmd.c
+SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c parser-mecmd.c
 SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c parser-mpcmd.c
 
 ifeq ($(UNRARLIB),yes)

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- mencoder.c	25 Nov 2004 22:23:59 -0000	1.258
+++ mencoder.c	27 Dec 2004 17:30:12 -0000	1.259
@@ -54,7 +54,7 @@
 
 #include "libvo/video_out.h"
 
-#include "libao2/afmt.h"
+#include "libaf/af_format.h"
 
 #include "libmpcodecs/mp_image.h"
 #include "libmpcodecs/dec_audio.h"
@@ -809,7 +809,7 @@
         sh_audio->samplerate,
 	sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
 	mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
-	(mux_a->wf->wBitsPerSample==8)?	AFMT_U8:AFMT_S16_LE,
+	(mux_a->wf->wBitsPerSample==8)?	AF_FORMAT_U8:AF_FORMAT_S16_LE,
 	mux_a->wf->wBitsPerSample/8,
 	16384, mux_a->wf->nAvgBytesPerSec)){
       mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
@@ -842,11 +842,7 @@
         sh_audio->samplerate,
 	sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
 	mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
-#ifdef WORDS_BIGENDIAN
-	AFMT_S16_BE, 2,
-#else
-	AFMT_S16_LE, 2,
-#endif
+	AF_FORMAT_S16_NE, 2,
 	4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)){
       mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
     }
@@ -983,7 +979,7 @@
 	sh_audio->samplerate, sh_audio->channels,
 	sh_audio->sample_format, sh_audio->samplesize,
 	mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
-	AFMT_S16_NE, 2,
+	AF_FORMAT_S16_NE, 2,
 	mux_a->h.dwSuggestedBufferSize,
 	mux_a->h.dwSuggestedBufferSize*2)) {
 	mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter);
@@ -1048,7 +1044,7 @@
 	sh_audio->samplerate, sh_audio->channels,
 	sh_audio->sample_format, sh_audio->samplesize,
 	mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels,
-	AFMT_S16_NE, 2,
+	AF_FORMAT_S16_NE, 2,
 	mux_a->h.dwSuggestedBufferSize,
 	mux_a->h.dwSuggestedBufferSize*2)) {
 	mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't find matching filter / ao format!\n");

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- mplayer.c	26 Dec 2004 10:46:39 -0000	1.822
+++ mplayer.c	27 Dec 2004 17:30:12 -0000	1.823
@@ -942,7 +942,7 @@
   result =  init_audio_filters(sh_audio, new_srate,
            sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
            ao_data->samplerate, ao_data->channels, ao_data->format,
-           audio_out_format_bits(ao_data->format) / 8, /* ao_data.bps, */
+           af_fmt2bits(ao_data->format) / 8, /* ao_data.bps, */
            ao_data->outburst * 4, ao_data->buffersize);
   mixer.afilter = sh_audio->afilter;
   return result;
@@ -2094,12 +2094,13 @@
 	sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
 	// output:
 	&ao_data.samplerate, &ao_data.channels, &ao_data.format,
-	audio_out_format_bits(ao_data.format)/8)){
+	af_fmt2bits(ao_data.format)/8)){
       mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
   } else {
+    char buf[128];
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AF_pre: %dHz %dch %s\n",
       ao_data.samplerate, ao_data.channels,
-      audio_out_format_name(ao_data.format));
+      af_fmt2str(ao_data.format,&buf,128));
   }
 #endif  
   current_module="ao2_init";
@@ -2114,12 +2115,13 @@
     sh_audio=d_audio->sh=NULL; // -> nosound
   } else {
     // SUCCESS:
+    char buf[128];
     inited_flags|=INITED_AO;
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bps)\n",
       audio_out->info->short_name,
       ao_data.samplerate, ao_data.channels,
-      audio_out_format_name(ao_data.format),
-      audio_out_format_bits(ao_data.format)/8 );
+      af_fmt2str(ao_data.format, &buf, 128),
+      af_fmt2bits(ao_data.format)/8 );
     mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
       audio_out->info->name, audio_out->info->author);
     if(strlen(audio_out->info->comment) > 0)