Pretty print muxname

diff --git a/dvb_fe.c b/dvb_fe.c
index 639e8eee9730cf2bb47f107f739490290a1c82a7..832dc227f4b127f2bed44cddbf6fcc7b050eec20 100644 (file)
--- a/dvb_fe.c
+++ b/dvb_fe.c
@@ -62,6 +62,7 @@ dvb_fe_manager(void *aux)
   fe_status_t fe_status;
   th_dvb_table_t *tdt;
   struct dvb_frontend_parameters p;
+  char buf[100];
 
   while(1) {
     ts.tv_sec = time(NULL) + 1;
@@ -108,10 +109,10 @@ dvb_fe_manager(void *aux)
  
       i = ioctl(tda->tda_fe_fd, FE_SET_FRONTEND, &p);
       if(i != 0) {
-       syslog(LOG_ERR, "\"%s\" tuning to %dHz"
+       dvb_mux_nicename(buf, sizeof(buf), tdmi);
+       syslog(LOG_ERR, "\"%s\" tuning to \"%s\""
               " -- Front configuration failed -- %s",
-              tda->tda_rootpath, tdmi->tdmi_fe_params->frequency,
-              strerror(errno));
+              tda->tda_rootpath, buf, strerror(errno));
       }
       free(c);
 
@@ -211,6 +212,7 @@ dvb_tune_tdmi(th_dvb_mux_instance_t *tdmi, int maylog, tdmi_state_t state)
 {
   dvb_fe_cmd_t *c;
   th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
+  char buf[100];
 
   tdmi->tdmi_state = state;
 
@@ -222,10 +224,10 @@ dvb_tune_tdmi(th_dvb_mux_instance_t *tdmi, int maylog, tdmi_state_t state)
 
   tda->tda_mux_current = tdmi;
 
-  if(maylog)
-    syslog(LOG_DEBUG, "\"%s\" tuning to mux \"%s\"", 
-          tda->tda_rootpath, "FIXME");
-
+  if(maylog) {
+    dvb_mux_nicename(buf, sizeof(buf), tdmi);
+    syslog(LOG_DEBUG, "\"%s\" tuning to mux \"%s\"", tda->tda_rootpath, buf);
+  }
   /* Add tables which will be activated once the tuning is completed */
 
   dvb_table_add_default(tdmi);

diff --git a/dvb_support.c b/dvb_support.c
index 3fea3799b673ee6a5ab8bc1945a1f8417246c1c8..2c70b767dc1c56c5c218c83273f238de02da97cd 100644 (file)
--- a/dvb_support.c
+++ b/dvb_support.c
@@ -235,6 +235,15 @@ dvb_polarisation_to_str(int pol)
   }
 }
 
+static const char *
+dvb_polarisation_to_str_long(int pol)
+{
+  switch(pol) {
+  case POLARISATION_VERTICAL:   return "Vertical";
+  case POLARISATION_HORIZONTAL: return "Horizontal";
+  default:                      return "??";
+  }
+}
 
 
 th_dvb_mux_instance_t *
@@ -288,3 +297,17 @@ dvb_mux_status(th_dvb_mux_instance_t *tdmi)
 
   return txt;
 }
+
+/**
+ * 
+ */
+void
+dvb_mux_nicename(char *buf, size_t size, th_dvb_mux_instance_t *tdmi)
+{
+  if(tdmi->tdmi_adapter->tda_fe_info->type == FE_QPSK)
+    snprintf(buf, size, "%dkHz %s port %d", tdmi->tdmi_fe_params->frequency,
+            dvb_polarisation_to_str_long(tdmi->tdmi_polarisation),
+            tdmi->tdmi_switchport);
+  else 
+    snprintf(buf, size, "%dHz", tdmi->tdmi_fe_params->frequency);
+}

diff --git a/dvb_support.h b/dvb_support.h
index 3d0c3ade871bdb3fb77e00299d577ee3bf7c993f..3e179bf731b27a370084bf1f7ded309e561267ff 100644 (file)
--- a/dvb_support.h
+++ b/dvb_support.h
@@ -58,5 +58,6 @@ const char *dvb_polarisation_to_str(int pol);
 th_dvb_adapter_t *dvb_adapter_find_by_identifier(const char *identifier);
 th_dvb_mux_instance_t *dvb_mux_find_by_identifier(const char *identifier);
 const char *dvb_mux_status(th_dvb_mux_instance_t *tdmi);
+void dvb_mux_nicename(char *buf, size_t size, th_dvb_mux_instance_t *tdmi);
 
 #endif /* DVB_SUPPORT_H */