wav_header parameter global

dump
Zilog80 2014-12-28 20:50:38 +01:00
rodzic 7a103dc730
commit 1478eb21ab
1 zmienionych plików z 6 dodań i 6 usunięć

Wyświetl plik

@ -82,7 +82,7 @@ int findstr(char *buff, char *str, long pos) {
return i; return i;
} }
int read_wav_header(FILE *fp, int *sr, int *bs, int *ch) { int read_wav_header(FILE *fp) {
char txt[5] = "\0\0\0\0"; char txt[5] = "\0\0\0\0";
char buff[4]; char buff[4];
int byte, num, i; int byte, num, i;
@ -111,7 +111,7 @@ int read_wav_header(FILE *fp, int *sr, int *bs, int *ch) {
if ( (byte=fgetc(fp)) == EOF ) return -1; if ( (byte=fgetc(fp)) == EOF ) return -1;
num |= (byte << (8*i)); num |= (byte << (8*i));
} }
*ch = num; channels = num;
// if (fseek(fp, pos_fmt+12L, SEEK_SET)) return -1; // 24L // if (fseek(fp, pos_fmt+12L, SEEK_SET)) return -1; // 24L
num = 0; num = 0;
@ -119,7 +119,7 @@ int read_wav_header(FILE *fp, int *sr, int *bs, int *ch) {
if ( (byte=fgetc(fp)) == EOF ) return -1; if ( (byte=fgetc(fp)) == EOF ) return -1;
num |= (byte << (8*i)); num |= (byte << (8*i));
} }
*sr = num; sample_rate = num;
if (fseek(fp, pos_fmt+22, SEEK_SET)) return -1; // 34L if (fseek(fp, pos_fmt+22, SEEK_SET)) return -1; // 34L
num = 0; num = 0;
@ -127,7 +127,7 @@ int read_wav_header(FILE *fp, int *sr, int *bs, int *ch) {
if ( (byte=fgetc(fp)) == EOF ) return -1; if ( (byte=fgetc(fp)) == EOF ) return -1;
num |= (byte << (8*i)); num |= (byte << (8*i));
} }
*bs = num; bits_sample = num;
// pos_dat = 36L // pos_dat = 36L
for ( ; ; ) { for ( ; ; ) {
@ -522,7 +522,7 @@ int main(int argc, char *argv[]) {
++argv; ++argv;
} }
if (!wavloaded) { if (!wavloaded) {
fprintf(stderr, "%s [options] <rs41_audio.wav>\n", argv[0]); fprintf(stderr, "rs41sg [options] <rs41_audio.wav>\n");
fprintf(stderr, " options:\n"); fprintf(stderr, " options:\n");
fprintf(stderr, " -v, --verbose\n"); fprintf(stderr, " -v, --verbose\n");
fprintf(stderr, " -r, --raw\n"); fprintf(stderr, " -r, --raw\n");
@ -530,7 +530,7 @@ int main(int argc, char *argv[]) {
} }
i = read_wav_header(fp, &sample_rate, &bits_sample, &channels); i = read_wav_header(fp);
if (i) { if (i) {
fclose(fp); fclose(fp);
return -1; return -1;