X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=interface.c;h=f1cb3f2b96a51a11fb23e1dffd1633f52f4f113f;hp=7619294c752bbf0c28d0a65007222de53be491e0;hb=5566f74eb29be75da44e29ba72ee6f015249ce61;hpb=155d3b5a1d18ea9563226b833b5099a2f4f153e0 diff --git a/interface.c b/interface.c index 7619294..f1cb3f2 100644 --- a/interface.c +++ b/interface.c @@ -880,18 +880,12 @@ static int inter_dialmax(struct interface *interface, char *filename, int line, } static int inter_tones_dir(struct interface *interface, char *filename, int line, char *parameter, char *value) { - struct interface_port *ifport; - - /* port in chain ? */ - if (!interface->ifport) { - SPRINT(interface_error, "Error in %s (line %d): parameter '%s' expects previous 'port' definition.\n", filename, line, parameter); + if (!value || !value[0]) { + SPRINT(interface_error, "Error in %s (line %d): Missing tones directory.\n", filename, line); return(-1); } - /* goto end of chain */ - ifport = interface->ifport; - while(ifport->next) - ifport = ifport->next; - SCPY(ifport->tones_dir, value); + SCPY(interface->tones_dir, value); + return(0); } static int inter_gsm(struct interface *interface, char *filename, int line, char *parameter, char *value) @@ -1354,6 +1348,9 @@ struct interface_param interface_param[] = { {"tones_dir", &inter_tones_dir, "", "Overrides the given tone_dir in options.conf.\n" "To used kernel tones in mISDN_dsp.ko, say 'american', 'german', or 'oldgerman'."}, + {"tones-dir", &inter_tones_dir, "", + "Overrides the given tone_dir in options.conf.\n" + "To used kernel tones in mISDN_dsp.ko, say 'american', 'german', or 'oldgerman'."}, {"gsm", &inter_gsm, "", ""},