Skip to content

Commit

Permalink
Merge pull request #36 from lars18th/fix-quiet
Browse files Browse the repository at this point in the history 
Print output using LOG functions & Fix quiet mode
  • Loading branch information
@gfto
gfto authored Mar 13, 2024
2 parents 4db0d3f + be84159 commit 4189c5b
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 27 deletions.
47 changes: 25 additions & 22 deletions config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,14 @@ static void config_channel_init_epg(CONFIG *conf, CHANNEL *c, EPG_ENTRY *now, EP
int updated = 0;

if (epg_changed(now, c->epg_now)) {
LOGf("EPG : %s | Now data changed\n", c->id);
if(!conf->quiet)
LOGf("EPG : %s | Now data changed\n", c->id);
updated++;
}

if (epg_changed(next, c->epg_next)) {
LOGf("EPG : %s | Next data changed\n", c->id);
if(!conf->quiet)
LOGf("EPG : %s | Next data changed\n", c->id);
updated++;
}

Expand Down Expand Up @@ -608,39 +610,40 @@ void config_load(CONFIG *conf, int argc, char **argv) {
init_server_socket(conf->server_addr, conf->server_port, &conf->server, &conf->server_socket);

if (!conf->quiet) {
printf("Configuration:\n");
printf("\tServer ident : %s\n", conf->ident);
printf("\tGlobal config : %s\n", conf->global_conf);
printf("\tChannels config : %s\n", conf->channels_conf);
printf("\tNIT config : %s\n", conf->nit_conf);
LOGf("Configuration:\n");
LOGf("\tServer ident : %s\n", conf->ident);
LOGf("\tGlobal config : %s\n", conf->global_conf);
LOGf("\tChannels config : %s\n", conf->channels_conf);
LOGf("\tNIT config : %s\n", conf->nit_conf);
if (conf->write_output_network)
printf("\tOutput addr : %s://%s:%d\n", (conf->output->rtp_ssrc != 0 ? "rtp" : "udp"), inet_ntoa(conf->output->out_host), conf->output->out_port);
LOGf("\tOutput addr : %s://%s:%d\n", (conf->output->rtp_ssrc != 0 ? "rtp" : "udp"), inet_ntoa(conf->output->out_host), conf->output->out_port);
else
printf("\tOutput addr : disabled\n");
LOGf("\tOutput addr : disabled\n");
if (conf->output_intf.s_addr)
printf("\tOutput iface addr : %s\n", inet_ntoa(conf->output_intf));
printf("\tMulticast ttl : %d\n", conf->multicast_ttl);
printf("\tRTP SSRC : %u\n", conf->output->rtp_ssrc);
LOGf("\tOutput iface addr : %s\n", inet_ntoa(conf->output_intf));
LOGf("\tMulticast ttl : %d\n", conf->multicast_ttl);
LOGf("\tRTP SSRC : %u\n", conf->output->rtp_ssrc);
if (conf->syslog_active) {
printf("\tSyslog host : %s\n", conf->loghost);
printf("\tSyslog port : %d\n", conf->logport);
LOGf("\tSyslog host : %s\n", conf->loghost);
LOGf("\tSyslog port : %d\n", conf->logport);
} else {
printf("\tSyslog : disabled\n");
LOGf("\tSyslog : disabled\n");
}
printf("\tOutput bitrate : %.0f bps, %.2f Kbps, %.2f Mbps\n", conf->output_bitrate, conf->output_bitrate / 1000, conf->output_bitrate / 1000000);
printf("\tOutput pkt tmout : %ld us\n", conf->output_tmout);
printf("\tPackets per second: %ld\n", conf->output_packets_per_sec);
printf("\tPCR mode : %s\n",
LOGf("\tOutput bitrate : %.0f bps, %.2f Kbps, %.2f Mbps\n", conf->output_bitrate, conf->output_bitrate / 1000, conf->output_bitrate / 1000000);
LOGf("\tOutput pkt tmout : %ld us\n", conf->output_tmout);
LOGf("\tPackets per second: %ld\n", conf->output_packets_per_sec);
LOGf("\tPCR mode : %s\n",
conf->pcr_mode == 0 ? "Do not touch PCRs" :
conf->pcr_mode == 1 ? "Move PCRs to their calculated place" :
conf->pcr_mode == 2 ? "Rewrite PCRs using output bitrate" :
conf->pcr_mode == 3 ? "Move PCRs and rewrite them" : "???"
);
if (conf->write_output_file)
printf("\tWrite output file : %s\n", conf->output_filename);
LOGf("\tWrite output file : %s\n", conf->output_filename);
if (conf->write_input_file)
printf("\tWrite input file(s)\n");
}
LOGf("\tWrite input file(s)\n");
} else
LOGf("Quiet mode enabled.\n");

pthread_t sleepthread;
if (pthread_create(&sleepthread, NULL, &calibrate_sleep, conf) == 0) {
Expand Down
13 changes: 8 additions & 5 deletions data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,12 @@ void output_buffer_alloc(OUTPUT *o, double output_bitrate) {
o->obuf[1].buf = malloc(o->obuf[0].size);
obuf_reset(&o->obuf[1]);

LOGf("\tOutput buf size : %ld * 2 = %ld\n", obuf_size, obuf_size * 2);
LOGf("\tOutput buf packets: %ld (188 bytes)\n", obuf_size / 188);
LOGf("\tOutput buf frames : %ld (1316 bytes)\n", obuf_size / 1316);
LOGf("\tOutput buf ms : %u ms\n", o->obuf_ms);
if (!config->quiet) {
LOGf("\tOutput buf size : %ld * 2 = %ld\n", obuf_size, obuf_size * 2);
LOGf("\tOutput buf packets: %ld (188 bytes)\n", obuf_size / 188);
LOGf("\tOutput buf frames : %ld (1316 bytes)\n", obuf_size / 1316);
LOGf("\tOutput buf ms : %u ms\n", o->obuf_ms);
}
}

void output_free(OUTPUT **po) {
Expand Down Expand Up @@ -421,7 +423,8 @@ void nit_free(NIT **pn) {
}

void proxy_log(INPUT *r, char *msg) {
LOGf("INPUT : [%-12s] %s fd: %d src: %s\n", r->channel->id, msg, r->sock, r->channel->source);
if (!config->quiet)
LOGf("INPUT : [%-12s] %s fd: %d src: %s\n", r->channel->id, msg, r->sock, r->channel->source);
}

void proxy_close(LIST *inputs, INPUT **input) {
Expand Down

0 comments on commit 4189c5b

Please sign in to comment.