From 407b849b3196deb11656a44e3052daeac8631de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 9 Apr 2008 19:31:20 +0000 Subject: [PATCH] Use table code for rendering services in a mux --- ajaxui/ajaxui.c | 2 +- ajaxui/ajaxui.h | 5 +- ajaxui/ajaxui_config_dvb.c | 7 ++- ajaxui/ajaxui_config_transport.c | 95 ++++++++++++++++---------------- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/ajaxui/ajaxui.c b/ajaxui/ajaxui.c index f452694a..72652986 100644 --- a/ajaxui/ajaxui.c +++ b/ajaxui/ajaxui.c @@ -80,7 +80,7 @@ ajax_table_header(http_connection_t *hc, tcp_queue_t *tq, for(i = 0; i < n; i++) tcp_qprintf(tq, "
%s
", - columnsizes[i], names[i] ?: " "); + columnsizes[i], *names[i] ? names[i]: " "); tcp_qprintf(tq, ""); if(scrollbar) diff --git a/ajaxui/ajaxui.h b/ajaxui/ajaxui.h index ac33df54..42fe3c64 100644 --- a/ajaxui/ajaxui.h +++ b/ajaxui/ajaxui.h @@ -64,8 +64,9 @@ int ajax_config_dvb_tab(http_connection_t *hc); void ajax_config_dvb_init(void); void ajax_config_transport_init(void); -int ajax_transport_build_list(tcp_queue_t *tq, - struct th_transport_list *tlist); +int ajax_transport_build_list(http_connection_t *hc, tcp_queue_t *tq, + struct th_transport_list *tlist, + int ntransports); void ajax_table_header(http_connection_t *hc, tcp_queue_t *tq, diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c index 06f7bee8..3c8a8413 100644 --- a/ajaxui/ajaxui_config_dvb.c +++ b/ajaxui/ajaxui_config_dvb.c @@ -649,6 +649,7 @@ ajax_dvbmuxeditor(http_connection_t *hc, const char *remain, void *opaque) char buf[1000]; th_transport_t *t; struct th_transport_list head; + int n = 0; if(remain == NULL || (tdmi = dvb_mux_find_by_identifier(remain)) == NULL) return HTTP_STATUS_NOT_FOUND; @@ -660,12 +661,14 @@ ajax_dvbmuxeditor(http_connection_t *hc, const char *remain, void *opaque) LIST_INIT(&head); LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) { - if(transport_is_available(t)) + if(transport_is_available(t)) { LIST_INSERT_SORTED(&head, t, tht_tmp_link, dvbsvccmp); + n++; + } } ajax_box_begin(&tq, AJAX_BOX_SIDEBOX, NULL, NULL, buf); - ajax_transport_build_list(&tq, &head); + ajax_transport_build_list(hc, &tq, &head, n); ajax_box_end(&tq, AJAX_BOX_SIDEBOX); http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0); diff --git a/ajaxui/ajaxui_config_transport.c b/ajaxui/ajaxui_config_transport.c index 4dba17a6..33d165af 100644 --- a/ajaxui/ajaxui_config_transport.c +++ b/ajaxui/ajaxui_config_transport.c @@ -39,7 +39,8 @@ * */ int -ajax_transport_build_list(tcp_queue_t *tq, struct th_transport_list *tlist) +ajax_transport_build_list(http_connection_t *hc, tcp_queue_t *tq, + struct th_transport_list *tlist, int numtransports) { char buf[1000]; th_transport_t *t; @@ -47,7 +48,8 @@ ajax_transport_build_list(tcp_queue_t *tq, struct th_transport_list *tlist) int o = 1; th_stream_t *st; const char *extra; - + int displines = 21; + int csize[10]; tcp_qprintf(tq, "