code cleanup, move inits to function

This commit is contained in:
Fabian Kurz 2013-01-27 15:33:13 +00:00
parent aebb450d2c
commit 40bf46a9a4
1 changed files with 57 additions and 49 deletions

View File

@ -159,6 +159,7 @@ typedef struct {
/* functions */
void init_cw (CWP *cw);
void init_cwp (CWP *cw);
void init_encoder (CWP *cw);
void encode_buffer (int length, CWP *cw);
void ogg_encode_and_write (CWP *cw);
@ -205,7 +206,7 @@ int main (int argc, char** argv) {
FILE *infile;
#ifdef CGI
char * querystring;
char *querystring;
static char text[10000];
static char cgi_outfilename[1024];
#endif
@ -216,54 +217,9 @@ int main (int argc, char** argv) {
/* initializing the CW parameter struct with standard values */
CWP cw;
cw.wpm = 25;
cw.freq = 600;
cw.rt = 50;
cw.ft = 50;
cw.qrq = 0;
cw.reset = 1;
cw.farnsworth = 0;
cw.ews = 0.0;
cw.pBT = 1;
cw.waveform = SINE;
init_cwp(&cw);
cw.bandpassbw = 500;
cw.bandpassfc = 800;
cw.addnoise = 0;
cw.snr = 0;
#ifdef LAME
cw.encoder = MP3;
#else
cw.encoder = OGG;
#endif
cw.samplerate = 11025;
cw.brate = 16;
cw.quality = 5;
cw.inpcm_size = PCMBUFFER;
cw.noisebuf_size = NOISEBUFFER;
cw.mp3buffer_size = MP3BUFFER;
cw.ditlen = 0;
strcpy(cw.chapterstr, "CHAPTER");
strcpy(cw.chapterfilename, "Chapter");
cw.chaptertime = 0;
cw.chapterwords = 0;
cw.encoding = ISO8859;
cw.use_isomapping = cw.use_utf8mapping = 0;
strcpy(cw.configfile, "ebook2cw.conf");
strcpy(cw.id3_author, "CW audio book");
strcpy(cw.id3_title, "");
strcpy(cw.id3_comment, "Generated by ebook2cw");
strcpy(cw.id3_year, "");
infile = stdin;
cw.outfile_length = 0;
start_time = time(NULL);
srand((unsigned int) start_time);
@ -490,8 +446,6 @@ int main (int argc, char** argv) {
add_silence(500, &cw);
#endif
#ifndef CGI
closefile(chapter, chw, chms, &cw);
end_time = time(NULL);
@ -1929,5 +1883,59 @@ void signalhandler (int signal) {
}
#endif
/* Initialisation of cw parameter struct */
void init_cwp (CWP *cw) {
cw->wpm = 25;
cw->freq = 600;
cw->rt = 50;
cw->ft = 50;
cw->qrq = 0;
cw->reset = 1;
cw->farnsworth = 0;
cw->ews = 0.0;
cw->pBT = 1;
cw->waveform = SINE;
cw->bandpassbw = 500;
cw->bandpassfc = 800;
cw->addnoise = 0;
cw->snr = 0;
#ifdef LAME
cw->encoder = MP3;
#else
cw->encoder = OGG;
#endif
cw->samplerate = 11025;
cw->brate = 16;
cw->quality = 5;
cw->inpcm_size = PCMBUFFER;
cw->noisebuf_size = NOISEBUFFER;
cw->mp3buffer_size = MP3BUFFER;
cw->ditlen = 0;
strcpy(cw->chapterstr, "CHAPTER");
strcpy(cw->chapterfilename, "Chapter");
cw->chaptertime = 0;
cw->chapterwords = 0;
cw->encoding = ISO8859;
cw->use_isomapping = cw->use_utf8mapping = 0;
strcpy(cw->configfile, "ebook2cw.conf");
strcpy(cw->id3_author, "CW audio book");
strcpy(cw->id3_title, "");
strcpy(cw->id3_comment, "Generated by ebook2cw");
strcpy(cw->id3_year, "");
cw->outfile_length = 0;
}
/* vim: noai:ts=4:sw=4
* */