diff options
Diffstat (limited to 'audio/mp3encode')
| -rw-r--r-- | audio/mp3encode/files/patch-ab | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/audio/mp3encode/files/patch-ab b/audio/mp3encode/files/patch-ab index 37abff2eae6f..d1013f8324d5 100644 --- a/audio/mp3encode/files/patch-ab +++ b/audio/mp3encode/files/patch-ab @@ -1,5 +1,5 @@ -*** musicin.c.orig Wed May 20 22:09:24 1998 ---- musicin.c Wed May 20 22:15:02 1998 +*** musicin.c.orig Wed Jan 22 18:43:17 1997 +--- musicin.c Sun Apr 11 01:44:39 1999 *************** *** 161,167 **** @@ -9,31 +9,35 @@ if (original_file_name[0] == NULL_CHAR) printf("PCM input file name is required.\n"); } while (original_file_name[0] == NULL_CHAR); ---- 161,167 ---- +--- 161,168 ---- do { printf("Enter PCM input file name <required>: "); ! fgets(original_file_name,255,stdin); +! original_file_name[strlen(original_file_name) - 1] = NULL_CHAR; if (original_file_name[0] == NULL_CHAR) printf("PCM input file name is required.\n"); } while (original_file_name[0] == NULL_CHAR); *************** -*** 182,188 **** +*** 182,189 **** original_file_name, DFLT_EXT); #endif ! gets(encoded_file_name); - +! if (encoded_file_name[0] == NULL_CHAR) { #ifdef MS_DOS ---- 182,188 ---- + strcpy(encoded_file_name, temp_str); +--- 183,191 ---- original_file_name, DFLT_EXT); #endif ! fgets(encoded_file_name,255,stdin); - +! encoded_file_name[strlen(encoded_file_name) - 1] = NULL_CHAR; +! if (encoded_file_name[0] == NULL_CHAR) { #ifdef MS_DOS + strcpy(encoded_file_name, temp_str); *************** *** 227,233 **** else { /* Not using Audio IFF sound file headers. */ @@ -43,11 +47,12 @@ freq = atol(t); switch (freq) { case 48000 : info->sampling_frequency = 1; ---- 227,233 ---- +--- 229,236 ---- else { /* Not using Audio IFF sound file headers. */ printf("What is the sampling frequency? <44100>[Hz]: "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; freq = atol(t); switch (freq) { case 48000 : info->sampling_frequency = 1; @@ -60,11 +65,12 @@ switch(*t){ case '1': info->lay = 1; printf(">>> Using Layer %s\n",t); break; case '2': info->lay = 2; printf(">>> Using Layer %s\n",t); break; ---- 268,274 ---- +--- 271,278 ---- printf("Which layer do you want to use?\n"); printf("Available: Layer (1), Layer (<2>), Layer (3): "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; switch(*t){ case '1': info->lay = 1; printf(">>> Using Layer %s\n",t); break; case '2': info->lay = 2; printf(">>> Using Layer %s\n",t); break; @@ -77,11 +83,12 @@ switch(*t){ case 's': case 'S': ---- 279,285 ---- +--- 283,290 ---- printf("Which mode do you want?\n"); printf("Available: (<s>)tereo, (j)oint stereo, "); printf("(d)ual channel, s(i)ngle Channel: "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; switch(*t){ case 's': case 'S': @@ -94,11 +101,12 @@ model = atoi(t); if (model > 2 || model < 1) { printf(">>> Default model 1 selected\n"); ---- 308,314 ---- +--- 313,320 ---- } printf("Which psychoacoustic model do you want to use? <1>: "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; model = atoi(t); if (model > 2 || model < 1) { printf(">>> Default model 1 selected\n"); @@ -111,11 +119,12 @@ brt = atoi( t ); if ( brt == 0 ) j = 15; ---- 322,328 ---- +--- 328,335 ---- /* set default bitrate to highest allowed, which is index 14 */ brt = bitrate[info->version][info->lay-1][14]; printf( "What is the total bitrate? <%u>[kbps]: ", brt ); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; brt = atoi( t ); if ( brt == 0 ) j = 15; @@ -128,11 +137,12 @@ if (*t != 'n' && *t != '5' && *t != 'c') { printf(">>> Using default no de-emphasis\n"); info->emphasis = 0; ---- 348,354 ---- +--- 355,362 ---- printf("What type of de-emphasis should the decoder use?\n"); printf("Available: (<n>)one, (5)0/15 microseconds, (c)citt j.17: "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; if (*t != 'n' && *t != '5' && *t != 'c') { printf(">>> Using default no de-emphasis\n"); info->emphasis = 0; @@ -145,11 +155,12 @@ if (*t == 'y' || *t == 'Y') info->extension = 1; else info->extension = 0; if(info->extension) printf(">>> Private bit set\n"); ---- 363,369 ---- +--- 371,378 ---- /* Start 2. Part changes for CD Ver 3.2; jsp; 22-Aug-1991 */ printf("Do you want to set the private bit? (y/<n>): "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; if (*t == 'y' || *t == 'Y') info->extension = 1; else info->extension = 0; if(info->extension) printf(">>> Private bit set\n"); @@ -183,11 +194,13 @@ if (*t == 'y' || *t == 'Y') exit(0); } ---- 372,399 ---- +--- 381,413 ---- /* End changes for CD Ver 3.2; jsp; 22-Aug-1991 */ printf("Do you want error protection? (y/<n>): "); ! fgets(t,255,stdin); +! +! t[strlen(t) - 1] = NULL_CHAR; if (*t == 'y' || *t == 'Y') info->error_protection = TRUE; else info->error_protection = FALSE; if(info->error_protection) printf(">>> Error protection used\n"); @@ -195,6 +208,7 @@ printf("Is the material copyrighted? (y/<n>): "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; if (*t == 'y' || *t == 'Y') info->copyright = 1; else info->copyright = 0; if(info->copyright) printf(">>> Copyrighted material\n"); @@ -202,6 +216,7 @@ printf("Is this the original? (y/<n>): "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; if (*t == 'y' || *t == 'Y') info->original = 1; else info->original = 0; if(info->original) printf(">>> Original material\n"); @@ -209,6 +224,7 @@ printf("Do you wish to exit (last chance before encoding)? (y/<n>): "); ! fgets(t,255,stdin); +! t[strlen(t) - 1] = NULL_CHAR; if (*t == 'y' || *t == 'Y') exit(0); } |