From 009b09655bf29e9661888cea32bd73bdd5adcacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sat, 19 Apr 2008 20:19:38 +0000 Subject: [PATCH] Store transport stream network name in config --- ajaxui/ajaxui_config_dvb.c | 1 + dvb.c | Bin 13343 -> 13496 bytes dvb.h | 3 ++- dvb_muxconfig.c | 6 +++++- dvb_muxconfig.h | 1 + dvb_tables.c | 5 +++-- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c index 222b4183..d1ad877b 100644 --- a/ajaxui/ajaxui_config_dvb.c +++ b/ajaxui/ajaxui_config_dvb.c @@ -499,6 +499,7 @@ ajax_adaptercreatemux(http_connection_t *hc, http_reply_t *hr, v = dvb_mux_create_str(tda, "65535", + NULL, http_arg_get(&hc->hc_req_args, "freq"), http_arg_get(&hc->hc_req_args, "symrate"), http_arg_get(&hc->hc_req_args, "const"), diff --git a/dvb.c b/dvb.c index f556076901250674e4879deb441d85b2e3e4ce4b..16c1f7dd5b198407ae9c3480b69a5bdaad79f397 100644 GIT binary patch delta 131 zcmbQAu_JSXoRq8%7pDRQBBo--X<)xOC=NDy94pdOx>@4+#(Mmy~BqcXf z*A7I+LuD0g6<{oTh2oN;l+pqXsDP$|m4aWWkB>DM*JL{psm(z$=h)d{h8|S4*{q=Q GpC14a^DHF* delta 26 icmdmyIX`2AoYdt1Mv9wbq<%1N?v;7TzImt0e|`X?+zbK$ diff --git a/dvb.h b/dvb.h index f47918b7..dc773015 100644 --- a/dvb.h +++ b/dvb.h @@ -53,7 +53,8 @@ th_transport_t *dvb_find_transport(th_dvb_mux_instance_t *tdmi, th_dvb_mux_instance_t *dvb_mux_create(th_dvb_adapter_t *tda, struct dvb_frontend_parameters *fe_param, int polarisation, int switchport, - int save, uint16_t tsid); + int save, uint16_t tsid, + const char *network); void dvb_tdmi_save(th_dvb_mux_instance_t *tdmi); diff --git a/dvb_muxconfig.c b/dvb_muxconfig.c index cbafde35..20ab97ad 100644 --- a/dvb_muxconfig.c +++ b/dvb_muxconfig.c @@ -99,6 +99,8 @@ dvb_mux_store(FILE *fp, th_dvb_mux_instance_t *tdmi) struct dvb_frontend_parameters *f = tdmi->tdmi_fe_params; fprintf(fp, "\ttransportstreamid = %d\n", tdmi->tdmi_transport_stream_id); + if(tdmi->tdmi_network != NULL) + fprintf(fp, "\tnetwork = %s\n", tdmi->tdmi_network); fprintf(fp, "\tfrequency = %d\n", f->frequency); @@ -159,6 +161,7 @@ dvb_mux_store(FILE *fp, th_dvb_mux_instance_t *tdmi) const char * dvb_mux_create_str(th_dvb_adapter_t *tda, const char *tsidstr, + const char *network, const char *freqstr, const char *symratestr, const char *qamstr, @@ -250,7 +253,8 @@ dvb_mux_create_str(th_dvb_adapter_t *tda, break; } - dvb_mux_create(tda, &f, polarisation, switchport, save, atoi(tsidstr)); + dvb_mux_create(tda, &f, polarisation, switchport, save, atoi(tsidstr), + network); return NULL; } diff --git a/dvb_muxconfig.h b/dvb_muxconfig.h index 37d457dc..d689cc18 100644 --- a/dvb_muxconfig.h +++ b/dvb_muxconfig.h @@ -23,6 +23,7 @@ void dvb_mux_store(FILE *fp, th_dvb_mux_instance_t *tdmi); const char *dvb_mux_create_str(th_dvb_adapter_t *tda, const char *tsidstr, + const char *network, const char *freqstr, const char *symratestr, const char *qamstr, diff --git a/dvb_tables.c b/dvb_tables.c index f2f331e3..45d61b72 100644 --- a/dvb_tables.c +++ b/dvb_tables.c @@ -563,7 +563,7 @@ dvb_table_cable_delivery(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, fe_param.u.qam.fec_inner = fec_tab[ptr[10] & 0x07]; - dvb_mux_create(tdmi->tdmi_adapter, &fe_param, 0, 0, 1, tsid); + dvb_mux_create(tdmi->tdmi_adapter, &fe_param, 0, 0, 1, tsid, NULL); } /** @@ -597,7 +597,7 @@ dvb_table_sat_delivery(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, pol = (ptr[6] >> 5) & 0x03; dvb_mux_create(tdmi->tdmi_adapter, &fe_param, pol, tdmi->tdmi_switchport, 1, - tsid); + tsid, NULL); } @@ -641,6 +641,7 @@ dvb_nit_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len, free((void *)tdmi->tdmi_network); tdmi->tdmi_network = strdup(networkname); notify_tdmi_name_change(tdmi); + dvb_tda_save(tdmi->tdmi_adapter); } break; }