RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use new config headers and types. 

Remove unneeded dupendency on mconfig


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9757 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-03-30 17:23:13 +00:00
parent 90a3d11031
commit 83e30adc4d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvo/vo_aa.c
View File

@ -33,7 +33,7 @@
#include "osdep/keycodes.h" #include "osdep/keycodes.h"
#include <aalib.h> #include <aalib.h>
#include "cfgparser.h" #include "m_option.h"
#include "mp_msg.h" #include "mp_msg.h"
@ -80,7 +80,6 @@ int aaconfigmode=1;
font_desc_t* vo_font_save = NULL; font_desc_t* vo_font_save = NULL;
#endif #endif
static struct SwsContext *sws=NULL; static struct SwsContext *sws=NULL;
extern m_config_t *mconfig;
/* our version of the playmodes :) */ /* our version of the playmodes :) */
@ -514,7 +513,6 @@ uninit(void) {
if (strstr(c->driver->name,"Curses") || strstr(c->driver->name,"Linux")){ if (strstr(c->driver->name,"Curses") || strstr(c->driver->name,"Linux")){
freopen("/dev/tty", "w", stderr); freopen("/dev/tty", "w", stderr);
m_config_set_option(mconfig,"quiet",NULL); /* enable mplayer outputs */
} }
#ifdef USE_OSD #ifdef USE_OSD
if(vo_font_save) { if(vo_font_save) {
@ -590,7 +588,7 @@ getcolor(char * s){
} }
int int
vo_aa_parseoption(struct config * conf, char *opt, char *param){ vo_aa_parseoption(m_option_t * conf, char *opt, char *param){
/* got an option starting with aa */ /* got an option starting with aa */
char *pseudoargv[4]; char *pseudoargv[4];
int pseudoargc; int pseudoargc;
@ -598,12 +596,12 @@ vo_aa_parseoption(struct config * conf, char *opt, char *param){
int i; int i;
/* do WE need it ? */ /* do WE need it ? */
if (!strcasecmp(opt, "aaosdcolor")){ if (!strcasecmp(opt, "aaosdcolor")){
if (param==NULL) return ERR_MISSING_PARAM; if (param==NULL) return M_OPT_MISSING_PARAM;
if ((i=getcolor(param))==-1) return ERR_OUT_OF_RANGE; if ((i=getcolor(param))==-1) return M_OPT_OUT_OF_RANGE;
aaopt_osdcolor=i; aaopt_osdcolor=i;
return 1; return 1;
}else if (!strcasecmp(opt, "aasubcolor")){ }else if (!strcasecmp(opt, "aasubcolor")){
if ((i=getcolor(param))==-1) return ERR_OUT_OF_RANGE; if ((i=getcolor(param))==-1) return M_OPT_OUT_OF_RANGE;
aaopt_subcolor=i; aaopt_subcolor=i;
return 1; return 1;
}else if (!strcasecmp(opt, "aahelp")){ }else if (!strcasecmp(opt, "aahelp")){
@ -656,7 +654,7 @@ vo_aa_parseoption(struct config * conf, char *opt, char *param){
fprintf(stderr,"VO: [aa] "); fprintf(stderr,"VO: [aa] ");
i=aa_parseoptions(&aa_defparams, &aa_defrenderparams, &pseudoargc, pseudoargv); i=aa_parseoptions(&aa_defparams, &aa_defrenderparams, &pseudoargc, pseudoargv);
if (i!=1){ if (i!=1){
return ERR_MISSING_PARAM; return M_OPT_MISSING_PARAM;
} }
if (pseudoargv[1]!=NULL){ if (pseudoargv[1]!=NULL){
/* aalib has given param back */ /* aalib has given param back */
@ -667,12 +665,12 @@ vo_aa_parseoption(struct config * conf, char *opt, char *param){
return 1; /* all opt & params accepted */ return 1; /* all opt & params accepted */
} }
return ERR_NOT_AN_OPTION; return M_OPT_UNKNOW;
} }
void void
vo_aa_revertoption(config_t* opt,char* param) { vo_aa_revertoption(m_option_t* opt,char* param) {
if (!strcasecmp(param, "aaosdcolor")) if (!strcasecmp(param, "aaosdcolor"))
aaopt_osdcolor= AA_SPECIAL; aaopt_osdcolor= AA_SPECIAL;
else if (!strcasecmp(param, "aasubcolor")) else if (!strcasecmp(param, "aasubcolor"))
@ -733,7 +731,6 @@ static uint32_t preinit(const char *arg)
if ((strstr(c->driver->name,"Curses")) || (strstr(c->driver->name,"Linux"))){ if ((strstr(c->driver->name,"Curses")) || (strstr(c->driver->name,"Linux"))){
freopen("/dev/null", "w", stderr); freopen("/dev/null", "w", stderr);
m_config_set_option(mconfig,"noquiet",NULL); /* disable mplayer outputs */
/* disable console blanking */ /* disable console blanking */
printf("\033[9;0]"); printf("\033[9;0]");
} }