remote_addr -> remote_local_ip

remote_iface -> remote_local_if

3 files changed, 15 insertions, 16 deletions

diff --git a/config.c b/config.c
index d5ed27f8..72c0f8d9 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.37 2007-06-11 19:03:14 phintuka Exp $
+ * $Id: config.c,v 1.38 2007-06-11 19:12:18 phintuka Exp $
  *
  */
 
@@ -352,13 +352,13 @@ config_t::config_t() {
   remote_rtp_always_on = 0;
   remote_rtp_sap = 1;
 
-  remote_use_rtsp      = 1; /* allow generic rtsp for primary device. needs enabled udp or rtp */
-  remote_use_rtsp_ctrl = 0; /* allow rtsp to control primary device (play/pause/seek...) */
-  remote_use_http      = 1; /* allow generic http streaming (primary device output) */
-  remote_use_http_ctrl = 0; /* allow http to control primary device (play/pause/seek...) */
+  remote_use_rtsp      = 1; // allow generic rtsp for primary device. needs enabled udp or rtp
+  remote_use_rtsp_ctrl = 0; // allow rtsp to control primary device (play/pause/seek...)
+  remote_use_http      = 1; // allow generic http streaming (primary device output)
+  remote_use_http_ctrl = 0; // allow http to control primary device (play/pause/seek...)
 
-  remote_iface[0] = 0;   /* use only this interface - undefined -> any/all */
-  remote_address[0] = 0; /* bind locally to this IP - undefined -> any/all */
+  remote_local_if[0] = 0;   // use only this interface - undefined -> any/all
+  remote_local_ip[0] = 0;   // bind locally to this IP - undefined -> any/all
 
   use_x_keyboard = 1;
 
@@ -551,8 +551,8 @@ bool config_t::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "Remote.AllowHttp"))     remote_use_http = atoi(Value);
   else if (!strcasecmp(Name, "Remote.AllowHttpCtrl")) remote_use_http_ctrl = atoi(Value);
 
-  else if (!strcasecmp(Name, "Remote.Iface"))     STRN0CPY(remote_iface,   Value);
-  else if (!strcasecmp(Name, "Remote.LocalIP"))   STRN0CPY(remote_address, Value);
+  else if (!strcasecmp(Name, "Remote.Iface"))     STRN0CPY(remote_local_if, Value);
+  else if (!strcasecmp(Name, "Remote.LocalIP"))   STRN0CPY(remote_local_ip, Value);
 
   else if (!strcasecmp(Name, "Decoder.PesBuffers"))  pes_buffers=atoi(Value);
 
diff --git a/config.h b/config.h
index dc7ed2f7..80ba1a21 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.24 2007-06-11 19:03:14 phintuka Exp $
+ * $Id: config.h,v 1.25 2007-06-11 19:12:18 phintuka Exp $
  *
  */
 
@@ -247,8 +247,8 @@ class config_t {
     int  remote_use_http;      /* allow generic http streaming (primary device output) */
     int  remote_use_http_ctrl; /* allow http to control primary device (play/pause/seek...) */
 
-    char remote_iface[32];   /* use only this interface */
-    char remote_address[32]; /* bind locally to this IP */
+    char remote_local_if[32];  /* use only this interface */
+    char remote_local_ip[32];  /* bind locally to this IP */
 
     int  use_x_keyboard;
 
diff --git a/setup_menu.c b/setup_menu.c
index 48e81d64..db03d69b 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.29 2007-06-11 19:03:14 phintuka Exp $
+ * $Id: setup_menu.c,v 1.30 2007-06-11 19:12:18 phintuka Exp $
  *
  */
 
@@ -1450,6 +1450,8 @@ void cMenuSetupRemote::Store(void)
 
   SetupStore("RemoteMode",        xc.remote_mode);
   SetupStore("Remote.ListenPort", xc.listen_port);
+  SetupStore("Remote.Iface",      xc.remote_local_if);
+  SetupStore("Remote.LocalIP",    xc.remote_local_ip);
   SetupStore("Remote.Keyboard",   xc.remote_keyboard);
 
   SetupStore("Remote.UsePipe",xc.remote_usepipe);
@@ -1471,9 +1473,6 @@ void cMenuSetupRemote::Store(void)
   SetupStore("Remote.AllowHttp", xc.remote_use_http);
   SetupStore("Remote.AllowHttpCtrl", xc.remote_use_http_ctrl);
 
-  SetupStore("Remote.Iface",   xc.remote_iface);
-  SetupStore("Remote.LocalIP", xc.remote_address);
-
   cXinelibDevice::Instance().Listen(xc.remote_mode, xc.listen_port);
 }