[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[311] mplayerxp

[<nic...@us...>]

Revision: 311
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=311&view=rev
Author:   nickols_k
Date:     2012-11-09 12:29:58 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
use more MPXP_Rc

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_audio.c
    mplayerxp/libmpcodecs/dec_audio.h
    mplayerxp/mplayerxp.c
    mplayerxp/postproc/af.c
    mplayerxp/postproc/af.h

Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c	2012-11-09 11:43:47 UTC (rev 310)
+++ mplayerxp/libmpcodecs/dec_audio.c	2012-11-09 12:29:58 UTC (rev 311)
@@ -38,7 +38,7 @@
     return NULL;
 }
 
-int mpca_init(sh_audio_t *sh_audio)
+MPXP_Rc mpca_init(sh_audio_t *sh_audio)
 {
     unsigned i;
     for (i=0; mpcodecs_ad_drivers[i] != NULL; i++)
@@ -47,7 +47,7 @@
 	}
     if(!mpadec){
 	MSG_ERR(MSGTR_CODEC_BAD_AFAMILY,sh_audio->codec->codec_name, sh_audio->codec->driver_name);
-	return 0; // no such driver
+	return MPXP_False; // no such driver
     }
 
     /* reset in/out buffer size/pointer: */
@@ -72,7 +72,7 @@
 
     if(mpadec->preinit(sh_audio)!=MPXP_Ok) {
 	MSG_ERR(MSGTR_CODEC_CANT_PREINITA);
-	return 0;
+	return MPXP_False;
     }
 
     /* allocate audio in buffer: */
@@ -93,14 +93,14 @@
     sh_audio->a_buffer=mp_mallocz(sh_audio->a_buffer_size);
     if(!sh_audio->a_buffer) {
 	MSG_ERR(MSGTR_CantAllocAudioBuf);
-	return 0;
+	return MPXP_False;
     }
     sh_audio->a_buffer_len=0;
 
     if(mpadec->init(sh_audio)!=MPXP_Ok){
 	MSG_WARN(MSGTR_CODEC_CANT_INITA);
 	mpca_uninit(sh_audio); /* mp_free buffers */
-	return 0;
+	return MPXP_False;
     }
 
     sh_audio->inited=1;
@@ -108,7 +108,7 @@
     if(!sh_audio->nch || !sh_audio->rate) {
 	MSG_WARN(MSGTR_UnknownAudio);
 	mpca_uninit(sh_audio); /* mp_free buffers */
-	return 0;
+	return MPXP_False;
     }
 
     if(!sh_audio->o_bps)
@@ -128,7 +128,7 @@
 	,mpadec->info->driver_name
 	,sh_audio->codec->dll_name
 	,sh_audio->i_bps,sh_audio->o_bps);
-    return 1;
+    return MPXP_Ok;
 }
 
 void mpca_uninit(sh_audio_t *sh_audio)
@@ -152,7 +152,7 @@
 }
 
  /* Init audio filters */
-int mpca_preinit_filters(sh_audio_t *sh_audio,
+MPXP_Rc mpca_preinit_filters(sh_audio_t *sh_audio,
 	unsigned in_samplerate, unsigned in_channels, unsigned in_format,
 	unsigned* out_samplerate, unsigned* out_channels, unsigned* out_format){
     char strbuf[200];
@@ -176,9 +176,9 @@
 	afs->input.rate,afs->input.nch,(afs->input.format&MPAF_BPS_MASK)*8);
 
     // let's autoprobe it!
-    if(0 != af_init(afs,0)){
+    if(MPXP_Ok != af_init(afs,0)){
 	mp_free(afs);
-	return 0; // failed :(
+	return MPXP_False; // failed :(
     }
 
     *out_samplerate=afs->output.rate;
@@ -193,11 +193,11 @@
 	sh_audio->af_bps);
 
     sh_audio->afilter=(any_t*)afs;
-    return 1;
+    return MPXP_Ok;
 }
 
  /* Init audio filters */
-int mpca_init_filters(sh_audio_t *sh_audio,
+MPXP_Rc mpca_init_filters(sh_audio_t *sh_audio,
 	unsigned in_samplerate, unsigned in_channels, mpaf_format_e in_format,
 	unsigned out_samplerate, unsigned out_channels, mpaf_format_e out_format,
 	unsigned out_minsize, unsigned out_maxsize){
@@ -223,10 +223,10 @@
 	afs->output.rate,afs->output.nch,(afs->output.format&MPAF_BPS_MASK)*8,ao_format_name(mpaf_format_encode(afs->output.format)));
 
     // let's autoprobe it!
-    if(0 != af_init(afs,1)){
+    if(MPXP_Ok != af_init(afs,1)){
 	sh_audio->afilter=NULL;
 	mp_free(afs);
-	return 0; // failed :(
+	return MPXP_False; // failed :(
     }
 
     // allocate the a_out_* buffers:
@@ -247,11 +247,11 @@
     af_showconf(afs->first);
     sh_audio->afilter=(any_t*)afs;
     sh_audio->afilter_inited=1;
-    return 1;
+    return MPXP_Ok;
 }
 
  /* Init audio filters */
-int mpca_reinit_filters(sh_audio_t *sh_audio,
+MPXP_Rc mpca_reinit_filters(sh_audio_t *sh_audio,
 	unsigned in_samplerate, unsigned in_channels, mpaf_format_e in_format,
 	unsigned out_samplerate, unsigned out_channels, mpaf_format_e out_format,
 	unsigned out_minsize, unsigned out_maxsize)

Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h	2012-11-09 11:43:47 UTC (rev 310)
+++ mplayerxp/libmpcodecs/dec_audio.h	2012-11-09 12:29:58 UTC (rev 311)
@@ -2,10 +2,11 @@
 #define DEC_AUDIO_H_INCLUDED 1
 #include "ad.h"
 #include "xmpcore/mp_aframe.h"
+#include "xmpcore/xmp_enums.h"
 
 // dec_audio.c:
 extern const ad_functions_t* __FASTCALL__ mpca_find_driver(const char *name);
-extern int __FASTCALL__ mpca_init(sh_audio_t *sh_audio);
+extern MPXP_Rc __FASTCALL__ mpca_init(sh_audio_t *sh_audio);
 extern void __FASTCALL__ mpca_uninit(sh_audio_t *sh_audio);
 extern unsigned __FASTCALL__ mpca_decode(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,unsigned buflen,float *pts);
 extern void __FASTCALL__ mpca_resync_stream(sh_audio_t *sh_audio);
@@ -13,14 +14,14 @@
 struct codecs_st;
 extern struct codecs_st* __FASTCALL__ find_ffmpeg_audio(sh_audio_t*);
 
-extern int mpca_init_filters(sh_audio_t *sh_audio,
+extern MPXP_Rc mpca_init_filters(sh_audio_t *sh_audio,
 	unsigned in_samplerate, unsigned in_channels, mpaf_format_e in_format,
 	unsigned out_samplerate, unsigned out_channels,mpaf_format_e out_format,
 	unsigned out_minsize, unsigned out_maxsize);
-extern int mpca_preinit_filters(sh_audio_t *sh_audio,
+extern MPXP_Rc mpca_preinit_filters(sh_audio_t *sh_audio,
         unsigned in_samplerate, unsigned in_channels, unsigned in_format,
         unsigned* out_samplerate, unsigned* out_channels, unsigned* out_format);
-extern int mpca_reinit_filters(sh_audio_t *sh_audio,
+extern MPXP_Rc mpca_reinit_filters(sh_audio_t *sh_audio,
 	unsigned in_samplerate, unsigned in_channels, mpaf_format_e in_format,
 	unsigned out_samplerate, unsigned out_channels, mpaf_format_e out_format,
 	unsigned out_minsize, unsigned out_maxsize);

Modified: mplayerxp/mplayerxp.c
===================================================================
--- mplayerxp/mplayerxp.c	2012-11-09 11:43:47 UTC (rev 310)
+++ mplayerxp/mplayerxp.c	2012-11-09 12:29:58 UTC (rev 311)
@@ -1236,12 +1236,12 @@
     ao_data->channels=mp_conf.ao_channels?mp_conf.ao_channels:sh_audio->nch;
     ao_data->format=sh_audio->afmt;
 #if 1
-    if(!mpca_preinit_filters(sh_audio,
+    if(mpca_preinit_filters(sh_audio,
 	    // input:
 	    (int)(sh_audio->rate),
 	    sh_audio->nch, sh_audio->afmt,
 	    // output:
-	    &ao_data->samplerate, &ao_data->channels, &ao_data->format)){
+	    &ao_data->samplerate, &ao_data->channels, &ao_data->format)!=MPXP_Ok){
 	    MSG_ERR("Audio filter chain preinit failed\n");
     } else {
 	MSG_V("AF_pre: %dHz %dch (%s) afmt=%08X sh_audio_min=%i\n",
@@ -1258,11 +1258,11 @@
     } else {
 	priv->inited_flags|=INITED_AO;
 	MP_UNIT("af_init");
-	if(!mpca_init_filters(sh_audio,
+	if(mpca_init_filters(sh_audio,
 	    sh_audio->rate,
 	    sh_audio->nch, sh_audio->afmt,
 	    ao_data->samplerate, ao_data->channels, ao_data->format,
-	    ao_data->outburst*4, ao_data->buffersize)) {
+	    ao_data->outburst*4, ao_data->buffersize)!=MPXP_Ok) {
 		MSG_ERR("No matching audio filter found!\n");
 	    }
     }
@@ -1870,7 +1870,7 @@
 
     if(sh_audio){
 	MSG_V("Initializing audio codec...\n");
-	if(!mpca_init(sh_audio)){
+	if(mpca_init(sh_audio)!=MPXP_Ok){
 	    MSG_ERR(MSGTR_CouldntInitAudioCodec);
 	    sh_audio=d_audio->sh=NULL;
 	} else {

Modified: mplayerxp/postproc/af.c
===================================================================
--- mplayerxp/postproc/af.c	2012-11-09 11:43:47 UTC (rev 310)
+++ mplayerxp/postproc/af.c	2012-11-09 12:29:58 UTC (rev 311)
@@ -351,11 +351,11 @@
    format given in "s", otherwise the output fromat in the last filter
    will be copied "s". The return value is 0 if success and -1 if
    failure */
-int af_init(af_stream_t* s, int force_output)
+MPXP_Rc af_init(af_stream_t* s, int force_output)
 {
   char *af_name,*af_next;
   // Sanity check
-  if(!s) return -1;
+  if(!s) return MPXP_False;
 
   // Precaution in case caller is misbehaving
   s->input.audio  = s->output.audio  = NULL;
@@ -370,7 +370,7 @@
     // Add all filters in the list (if there are any)
     if(!s->cfg.list){      // To make automatic format conversion work
       if(!af_append(s,s->first,"ao2"))
-	return -1;
+	return MPXP_False;
     }
     else{
       af_name=s->cfg.list;
@@ -378,21 +378,21 @@
 	af_next=strchr(af_name,',');
 	if(af_next) { *af_next=0; af_next++; }
 	if(!af_append(s,s->last,af_name))
-	    return -1;
+	    return MPXP_False;
 	af_name=af_next;
       }
     }
   }
-  if(strcmp(s->last->info->name,"ao2")!=0) if(!af_append(s,s->last,"ao2")) return -1;
+  if(strcmp(s->last->info->name,"ao2")!=0) if(!af_append(s,s->last,"ao2")) return MPXP_False;
 
   // Init filters
   if(MPXP_Ok != af_reinit(s,s->first))
-    return -1;
+    return MPXP_False;
 
   // If force_output isn't set do not compensate for output format
   if(!force_output){
     memcpy(&s->output, s->last->data, sizeof(mp_aframe_t));
-    return 0;
+    return MPXP_Ok;
   }
 
   // Check output format
@@ -417,7 +417,7 @@
       // Init the new filter
       if(!af || (MPXP_Ok != af->control(af,AF_CONTROL_RESAMPLE_RATE,
 				      &(s->output.rate))))
-	return -1;
+	return MPXP_False;
       // Use lin int if the user wants fast
       if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) {
         char args[32];
@@ -425,7 +425,7 @@
 	af->control(af, AF_CONTROL_COMMAND_LINE, args);
       }
       if(MPXP_Ok != af_reinit(s,af))
-	return -1;
+	return MPXP_False;
     }
 
     // Check number of output channels fix if not OK
@@ -437,9 +437,9 @@
 	af = af_append(s,s->last,"channels");
       // Init the new filter
       if(!af || (MPXP_Ok != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch))))
-	return -1;
+	return MPXP_False;
       if(MPXP_Ok != af_reinit(s,af))
-	return -1;
+	return MPXP_False;
     }
 
     // Check output format fix if not OK
@@ -450,14 +450,14 @@
 	af = s->last;
       // Init the new filter
       if(!af ||(MPXP_Ok != af->control(af,AF_CONTROL_FORMAT,&s->output.format)))
-	return -1;
+	return MPXP_False;
       if(MPXP_Ok != af_reinit(s,af))
-	return -1;
+	return MPXP_False;
     }
 
     // Re init again just in case
     if(MPXP_Ok != af_reinit(s,s->first))
-      return -1;
+      return MPXP_False;
 
     if((s->last->data->format != s->output.format) ||
        (s->last->data->nch    != s->output.nch)    ||
@@ -466,10 +466,10 @@
       MSG_ERR("[libaf] Unable to setup filter system can not"
 	     " meet sound-card demands, please send bugreport. \n");
       af_uninit(s);
-      return -1;
+      return MPXP_False;
     }
   }
-  return 0;
+  return MPXP_Ok;
 }
 
 /* Add filter during execution. This function adds the filter "name"

Modified: mplayerxp/postproc/af.h
===================================================================
--- mplayerxp/postproc/af.h	2012-11-09 11:43:47 UTC (rev 310)
+++ mplayerxp/postproc/af.h	2012-11-09 12:29:58 UTC (rev 311)
@@ -111,7 +111,7 @@
    format given in "s", otherwise the output format in the last filter
    will be copied "s". The return value is 0 if success and -1 if
    failure */
-int af_init(af_stream_t* s, int force_output);
+MPXP_Rc af_init(af_stream_t* s, int force_output);
 
 // Uninit and remove all filters
 void af_uninit(af_stream_t* s);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.