summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-06-11 19:03:14 +0000
committerphintuka <phintuka>2007-06-11 19:03:14 +0000
commit056e3b33aeca2d8859379f20790699a0d050d99c (patch)
tree066db8ab53513329c31ac6b2a6eeaf05503d5a04
parent6268fd35bd376547f685ef9ee9e4680b8b20d0f8 (diff)
downloadxineliboutput-056e3b33aeca2d8859379f20790699a0d050d99c.tar.gz
xineliboutput-056e3b33aeca2d8859379f20790699a0d050d99c.tar.bz2
use_remote_keyboard --> remote_keyboard
-rw-r--r--config.c6
-rw-r--r--config.h4
-rw-r--r--frontend_svr.c4
-rw-r--r--setup_menu.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/config.c b/config.c
index d7c78ec6..d5ed27f8 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c,v 1.36 2007-06-11 17:27:51 phintuka Exp $
+ * $Id: config.c,v 1.37 2007-06-11 19:03:14 phintuka Exp $
*
*/
@@ -336,7 +336,7 @@ config_t::config_t() {
remote_mode = 0;
listen_port = LISTEN_PORT;
- use_remote_keyboard = 1;
+ remote_keyboard = 1;
remote_usetcp = 1;
remote_useudp = 1;
remote_usertp = 1;
@@ -532,7 +532,7 @@ bool config_t::SetupParse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "RemoteMode")) remote_mode = atoi(Value);
else if (!strcasecmp(Name, "Remote.ListenPort")) listen_port = atoi(Value);
- else if (!strcasecmp(Name, "Remote.Keyboard")) use_remote_keyboard = atoi(Value);
+ else if (!strcasecmp(Name, "Remote.Keyboard")) remote_keyboard = atoi(Value);
else if (!strcasecmp(Name, "Remote.UseTcp")) remote_usetcp = atoi(Value);
else if (!strcasecmp(Name, "Remote.UseUdp")) remote_useudp = atoi(Value);
else if (!strcasecmp(Name, "Remote.UseRtp")) remote_usertp = atoi(Value);
diff --git a/config.h b/config.h
index 9b272bab..dc7ed2f7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h,v 1.23 2007-05-17 16:09:49 phintuka Exp $
+ * $Id: config.h,v 1.24 2007-06-11 19:03:14 phintuka Exp $
*
*/
@@ -229,7 +229,7 @@ class config_t {
int remote_mode;
int listen_port;
- int use_remote_keyboard;
+ int remote_keyboard;
int remote_usetcp, remote_useudp, remote_usertp, remote_usepipe;
int remote_http_files; /* allow http streaming of media files to xineliboutput clients
* (currently replayed media file from xineliboutput media player)
diff --git a/frontend_svr.c b/frontend_svr.c
index eb7a2d0e..6f64d31f 100644
--- a/frontend_svr.c
+++ b/frontend_svr.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_svr.c,v 1.40 2007-05-17 17:04:20 phintuka Exp $
+ * $Id: frontend_svr.c,v 1.41 2007-06-11 19:03:14 phintuka Exp $
*
*/
@@ -1107,7 +1107,7 @@ void cXinelibServer::Handle_Control_KEY(int cli, const char *arg)
{
TRACE("cXinelibServer received KEY " << buf);
- if(!xc.use_remote_keyboard) {
+ if(!xc.remote_keyboard) {
LOGMSG("Handle_Control_KEY(%s): Remote keyboard disabled in config", arg);
return;
}
diff --git a/setup_menu.c b/setup_menu.c
index d91a9de7..48e81d64 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: setup_menu.c,v 1.28 2007-06-11 17:27:51 phintuka Exp $
+ * $Id: setup_menu.c,v 1.29 2007-06-11 19:03:14 phintuka Exp $
*
*/
@@ -1349,7 +1349,7 @@ void cMenuSetupRemote::Set(void)
&newconfig.listen_port,
0, 0xffff));
Add(new cMenuEditBoolItem(tr(" Remote keyboard"),
- &newconfig.use_remote_keyboard));
+ &newconfig.remote_keyboard));
Add(new cMenuEditBoolItem(tr(" PIPE transport"),
&newconfig.remote_usepipe));
@@ -1450,7 +1450,7 @@ void cMenuSetupRemote::Store(void)
SetupStore("RemoteMode", xc.remote_mode);
SetupStore("Remote.ListenPort", xc.listen_port);
- SetupStore("Remote.Keyboard", xc.use_remote_keyboard);
+ SetupStore("Remote.Keyboard", xc.remote_keyboard);
SetupStore("Remote.UsePipe",xc.remote_usepipe);
SetupStore("Remote.UseTcp", xc.remote_usetcp);