mirror of
https://github.com/mpv-player/mpv
synced 2025-02-24 08:57:00 +00:00
- new config option -lircconfig (config file for lirc)
- new config option -(no)double (disable/enable doublebuffering in libvo) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1150 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e3e885d7cd
commit
8493d8711b
@ -23,6 +23,11 @@ extern char *sdl_adriver;
|
||||
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 @@ struct config conf[]={
|
||||
{"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},
|
||||
|
@ -40,7 +40,7 @@ int vo_screenheight=0;
|
||||
int vo_dwidth=0;
|
||||
int vo_dheight=0;
|
||||
int vo_dbpp=0;
|
||||
|
||||
int vo_doublebuffering = 0;
|
||||
|
||||
//
|
||||
// Externally visible list of all vo drivers
|
||||
|
@ -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 @@ void lirc_mp_setup(void){
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user