From: Andreas Öman <andreas@lonelycoder.com>
Date: Mon, 7 Apr 2008 20:43:42 +0000 (+0000)
Subject: Remove one of the adapter statuses
X-Git-Tag: 2.12~1157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2324265ee75b1c876759986cdc96b313f8460850;p=thirdparty%2Ftvheadend.git

Remove one of the adapter statuses
---

diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c
index cdaee9850..6c66bc301 100644
--- a/ajaxui/ajaxui_config_dvb.c
+++ b/ajaxui/ajaxui_config_dvb.c
@@ -39,9 +39,8 @@
 
 
 static struct strtab adapterstatus[] = {
-  { "Unconfigured",                   TDA_STATE_UNCONFIGURED },
-  { "Running",                        TDA_STATE_RUNNING },
-  { "Zombie",                         TDA_STATE_ZOMBIE },
+  { "Hardware detected",    TDA_STATE_RUNNING },
+  { "Hardware not found",   TDA_STATE_ZOMBIE },
 };
 
 static void
@@ -92,8 +91,6 @@ ajax_adaptersummary(http_connection_t *hc, const char *remain, void *opaque)
 	      "<div>%s</div>", 
 	      dvb_adaptertype_to_str(tda->tda_fe_info->type));
  
-  tcp_qprintf(&tq, "<div class=\"infoprefix\">Tuner:</div>"
-	      "<div>...</div>");
   tcp_qprintf(&tq, "<div style=\"text-align: center\">"
 	      "<a href=\"javascript:void(0);\" "
 	      "onClick=\"new Ajax.Updater('dvbadaptereditor', "
diff --git a/dvb.c b/dvb.c
index 1b7c724e4..ed2ef28a3 100644
Binary files a/dvb.c and b/dvb.c differ
diff --git a/tvhead.h b/tvhead.h
index c0fbbea5b..9c8034a3b 100644
--- a/tvhead.h
+++ b/tvhead.h
@@ -208,8 +208,7 @@ typedef struct th_dvb_adapter {
   LIST_ENTRY(th_dvb_adapter) tda_global_link;
 
   enum {
-    TDA_STATE_UNCONFIGURED,    /* Found but not configured */
-    TDA_STATE_RUNNING,         /* Configured */
+    TDA_STATE_RUNNING,         /* Running */
     TDA_STATE_ZOMBIE,          /* Configured but not found */
   } tda_state;