[MPlayer-cvslog] r36212 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h input/input.c input/input.h

cigaes subversion at mplayerhq.hu
Fri May 3 20:52:54 CEST 2013


Author: cigaes
Date: Fri May  3 20:52:54 2013
New Revision: 36212

Log:
input: add an option to set the default pausing mode.

Modified:
   trunk/cfg-mplayer.h
   trunk/input/input.c
   trunk/input/input.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Fri May  3 15:20:27 2013	(r36211)
+++ trunk/cfg-mplayer.h	Fri May  3 20:52:54 2013	(r36212)
@@ -339,6 +339,7 @@ const m_option_t mplayer_opts[]={
     {"mouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
     {"nomouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
     {"doubleclick-time", &doubleclick_time, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL},
+    {"pausing", &pausing_default, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
 #ifdef CONFIG_TV
     {"tvscan", tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #else

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	Fri May  3 15:20:27 2013	(r36211)
+++ trunk/input/input.c	Fri May  3 20:52:54 2013	(r36212)
@@ -577,6 +577,8 @@ int (*mp_input_key_cb)(int code) = NULL;
 
 int async_quit_request;
 
+int pausing_default = 0;
+
 static mp_input_fd_t key_fds[MP_MAX_KEY_FD];
 static unsigned int num_key_fd = 0;
 static mp_input_fd_t cmd_fds[MP_MAX_CMD_FD];
@@ -836,7 +838,7 @@ mp_input_parse_cmd(char* str) {
       case MP_CMD_SET_MOUSE_POS:
         pausing = 4; break;
       default:
-        pausing = 0; break;
+        pausing = pausing_default; break;
     }
   }
   cmd->pausing = pausing;

Modified: trunk/input/input.h
==============================================================================
--- trunk/input/input.h	Fri May  3 15:20:27 2013	(r36211)
+++ trunk/input/input.h	Fri May  3 20:52:54 2013	(r36212)
@@ -334,4 +334,6 @@ mp_input_check_interrupt(int time);
 
 extern int async_quit_request;
 
+extern int pausing_default;
+
 #endif /* MPLAYER_INPUT_H */


More information about the MPlayer-cvslog mailing list