Mercurial > mplayer.hg
changeset 1149:6a0f937b52e6
- new config option -lircconfig (config file for lirc)
- new config option -(no)double (disable/enable doublebuffering in libvo)
| author | acki2 |
|---|---|
| date | Sun, 17 Jun 2001 20:38:02 +0000 |
| parents | 93a9a0ca5fb0 |
| children | 8682a16321db |
| files | cfg-mplayer.h libvo/video_out.c lirc_mp.c |
| diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Sun Jun 17 18:33:05 2001 +0000 +++ b/cfg-mplayer.h Sun Jun 17 20:38:02 2001 +0000 @@ -23,6 +23,11 @@ extern int fakemono; // defined in dec_audio.c #endif +#ifdef HAVE_LIRC +extern char *lirc_configfile; +#endif + +extern int vo_doublebuffering; extern int vo_dbpp; extern int osd_level; extern int sub_unicode; @@ -150,6 +155,11 @@ {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0}, {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, + {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1}, + {"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0}, +#ifdef HAVE_LIRC + {"lircconf", &lirc_configfile, CONF_TYPE_STRING, 0, 0, 0}, +#endif {"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0}, {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1},
--- a/libvo/video_out.c Sun Jun 17 18:33:05 2001 +0000 +++ b/libvo/video_out.c Sun Jun 17 20:38:02 2001 +0000 @@ -40,7 +40,7 @@ int vo_dwidth=0; int vo_dheight=0; int vo_dbpp=0; - +int vo_doublebuffering = 0; // // Externally visible list of all vo drivers
--- a/lirc_mp.c Sun Jun 17 18:33:05 2001 +0000 +++ b/lirc_mp.c Sun Jun 17 20:38:02 2001 +0000 @@ -28,6 +28,7 @@ static struct lirc_config *lirc_config; static int lirc_is_setup = 0; +char *lirc_configfile = NULL; // setup routine --------------------------------------------------- @@ -57,8 +58,9 @@ } - if(lirc_readconfig( NULL,&lirc_config,NULL )!=0 ){ - printf("Failed to read standard config (~/.lircrc)!\n" ); + if(lirc_readconfig( lirc_configfile,&lirc_config,NULL )!=0 ){ + printf("Failed to read config file %s !\n", + lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile); printf("You won't be able to use your remote control\n"); lirc_deinit(); return;