From 1848be363ecbd18b5c579dc6ef041a0510500f88 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 30 Jul 2013 16:06:59 +0200
Subject: stream: remove inactive URL option fields

The URL option parser only accesses certain fields. Remove the fields
that are not accessed, and thus are completely unused and inaccessible.

Historically, these fields were supposed to be settable using an extra
list of options passed to open_stream(). Commit f518cf7 removed these
extra options. Apparently nothing ever actually used this facility.
---
 stream/stream_cdda.c | 15 ---------------
 stream/stream_dvb.c  |  5 -----
 stream/stream_vcd.c  |  3 ---
 3 files changed, 23 deletions(-)

diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index f245a6fe94..1c8e2ca2d6 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -79,21 +79,6 @@ static struct cdda_params {
 
 #define ST_OFF(f) M_ST_OFF(struct cdda_params, f)
 static const m_option_t cdda_params_fields[] = {
-    {"speed", ST_OFF(speed), CONF_TYPE_INT, M_OPT_RANGE, 0, 100, NULL},
-    {"paranoia", ST_OFF(paranoia_mode), CONF_TYPE_INT, M_OPT_RANGE, 0, 2,
-     NULL},
-    {"generic-dev", ST_OFF(generic_dev), CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"sector-size", ST_OFF(sector_size), CONF_TYPE_INT, M_OPT_RANGE, 1, 100,
-     NULL},
-    {"overlap", ST_OFF(search_overlap), CONF_TYPE_INT, M_OPT_RANGE, -1, 75,
-     NULL},
-    {"toc-bias", ST_OFF(toc_bias), CONF_TYPE_INT, 0, 0, 0, NULL},
-    {"toc-offset", ST_OFF(toc_offset), CONF_TYPE_INT, 0, 0, 0, NULL},
-    {"noskip", ST_OFF(no_skip), CONF_TYPE_FLAG, 0, 0, 1, NULL},
-    {"skip", ST_OFF(no_skip), CONF_TYPE_FLAG, 0, 1, 0, NULL},
-    {"device", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"span", ST_OFF(span), CONF_TYPE_INT_PAIR, 0, 0, 0, NULL},
-    /// For url parsing
     {"hostname", ST_OFF(span), CONF_TYPE_INT_PAIR, 0, 0, 0, NULL},
     {"port", ST_OFF(speed), CONF_TYPE_INT, M_OPT_RANGE, 1, 100, NULL},
     {"filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0, 0, NULL},
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 53761e8f60..bd2b174807 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -74,11 +74,6 @@ stream_defaults =
 
 /// URL definition
 static const m_option_t stream_params[] = {
-	{"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
-	{"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
-	{"timeout",ST_OFF(timeout),  CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL},
-	{"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
-
 	{"hostname", 	ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
 	{"username", 	ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 229d78bfc2..38f6953b11 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -70,9 +70,6 @@ static struct stream_priv_s {
 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
 /// URL definition
 static const m_option_t stream_opts_fields[] = {
-  { "track", ST_OFF(track), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL },
-  { "device", ST_OFF(device), CONF_TYPE_STRING, 0, 0 ,0, NULL},
-  /// For url parsing
   { "hostname", ST_OFF(track), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL },
   { "filename", ST_OFF(device), CONF_TYPE_STRING, 0, 0 ,0, NULL},
   { NULL, NULL, 0, 0, 0, 0,  NULL }
-- 
cgit v1.2.3