stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Store transport stream network name in config

Browse source
This commit is contained in:
Andreas Öman 2008-04-19 20:19:38 +00:00
parent d042b9d420
commit 009b09655b
6 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ajaxui/ajaxui_config_dvb.c
View file

@ -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"),

BIN
dvb.c
View file

Binary file not shown.

3
dvb.h
View file

@ -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);

6
dvb_muxconfig.c
View file

@ -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;
}

1
dvb_muxconfig.h
View file

@ -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,

5
dvb_tables.c
View file

@ -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;
}