From 365205ed16abe59e477ceffadce60b572cb3d665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 16 Apr 2008 16:19:34 +0000 Subject: [PATCH] Reload the DVB mux list when a new mux is created --- ajaxui/ajaxui_config_dvb.c | 8 ++++---- ajaxui/ajaxui_mailbox.c | 30 ++++++++++++++++++++++++++++++ ajaxui/ajaxui_mailbox.h | 2 ++ dvb.c | Bin 12780 -> 12807 bytes notify.c | 7 +++++++ notify.h | 2 ++ 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c index 50f437ac..1e20f4f1 100644 --- a/ajaxui/ajaxui_config_dvb.c +++ b/ajaxui/ajaxui_config_dvb.c @@ -218,11 +218,11 @@ ajax_adaptereditor(http_connection_t *hc, http_reply_t *hr, ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, "Multiplexes"); - tcp_qprintf(tq, "
", + tcp_qprintf(tq, "
", tda->tda_identifier); ajax_js(tq, - "new Ajax.Updater('dvbmuxlist%s', " + "new Ajax.Updater('dvbmuxlist_%s', " "'/ajax/dvbadaptermuxlist/%s', {method: 'get', evalScripts: true})", tda->tda_identifier, tda->tda_identifier); @@ -515,7 +515,7 @@ ajax_adaptercreatemux(http_connection_t *hc, http_reply_t *hr, dvb_make_add_link(tq, tda, "Successfully created"); ajax_js(tq, - "new Ajax.Updater('dvbmuxlist%s', " + "new Ajax.Updater('dvbmuxlist_%s', " "'/ajax/dvbadaptermuxlist/%s', {method: 'get', evalScripts: true})", tda->tda_identifier, tda->tda_identifier); @@ -569,7 +569,7 @@ ajax_adaptermuxlist(http_connection_t *hc, http_reply_t *hr, if(nmuxes < displines) v = nmuxes; - tcp_qprintf(tq, "
", tda->tda_identifier, v * 14); diff --git a/ajaxui/ajaxui_mailbox.c b/ajaxui/ajaxui_mailbox.c index 27bcd292..a4bdee7c 100644 --- a/ajaxui/ajaxui_mailbox.c +++ b/ajaxui/ajaxui_mailbox.c @@ -270,6 +270,21 @@ ajax_mailbox_update_div(const char *subscription, const char *prefix, +static void +ajax_mailbox_reload_div(const char *subscription, const char *prefix, + const char *postfix, const char *url) +{ + char buf[1000]; + + snprintf(buf, sizeof(buf), "new Ajax.Updater('%s_%s', '%s', " + "{method: 'get', evalScripts: true});\r\n", + prefix, postfix, url); + + ajax_mailbox_add_to_subscription(subscription, buf); +} + + + void ajax_mailbox_tdmi_state_change(th_dvb_mux_instance_t *tdmi) { @@ -304,3 +319,18 @@ ajax_mailbox_tdmi_status_change(th_dvb_mux_instance_t *tdmi) "status", tdmi->tdmi_identifier, tdmi->tdmi_last_status); } + + + +void +ajax_mailbox_tda_change(th_dvb_adapter_t *tda) +{ + char buf[500]; + + snprintf(buf, sizeof(buf), "/ajax/dvbadaptermuxlist/%s", + tda->tda_identifier); + + ajax_mailbox_reload_div(tda->tda_identifier, + "dvbmuxlist", tda->tda_identifier, + buf); +} diff --git a/ajaxui/ajaxui_mailbox.h b/ajaxui/ajaxui_mailbox.h index 661c9337..2a0ba5e5 100644 --- a/ajaxui/ajaxui_mailbox.h +++ b/ajaxui/ajaxui_mailbox.h @@ -25,4 +25,6 @@ void ajax_mailbox_tdmi_name_change(th_dvb_mux_instance_t *tdmi); void ajax_mailbox_tdmi_status_change(th_dvb_mux_instance_t *tdmi); +void ajax_mailbox_tda_change(th_dvb_adapter_t *tda); + #endif /* AJAXUI_MAILBOX_H_ */ diff --git a/dvb.c b/dvb.c index 34d6b5b4a9c986bda7d35769299bd4c4150d2c35..5a8de521ac0756441b297ef231b46d45663f2be0 100644 GIT binary patch delta 34 ocmaEp+@7)_US2dWza%rQGQK1wF+MpXF)uw;1IXMQDL+{V0R0{fr2qf` delta 12 TcmZoqd6T>$UVd|xe6J7yCn5z@ diff --git a/notify.c b/notify.c index c181e6d7..d6d11043 100644 --- a/notify.c +++ b/notify.c @@ -45,3 +45,10 @@ notify_tdmi_status_change(th_dvb_mux_instance_t *tdmi) { ajax_mailbox_tdmi_status_change(tdmi); } + + +void +notify_tda_change(th_dvb_adapter_t *tda) +{ + ajax_mailbox_tda_change(tda); +} diff --git a/notify.h b/notify.h index 70fe7164..ad92bd94 100644 --- a/notify.h +++ b/notify.h @@ -25,4 +25,6 @@ void notify_tdmi_name_change(th_dvb_mux_instance_t *tdmi); void notify_tdmi_status_change(th_dvb_mux_instance_t *tdmi); +void notify_tda_change(th_dvb_adapter_t *tda); + #endif /* NOTIFY_H_ */