Mercurial > audlegacy-plugins
comparison src/timidity/libtimidity/timidity.c @ 2038:04155ce9e72e
Automated merge with file:/home/ccr/audacious/plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 13 Oct 2007 21:53:47 +0300 |
| parents | fa9f85cebade |
| children |
comparison
equal
deleted
inserted
replaced
| 2037:33d6f1dc7cfb | 2038:04155ce9e72e |
|---|---|
| 49 int num_read = 0; | 49 int num_read = 0; |
| 50 int newline = 0; | 50 int newline = 0; |
| 51 | 51 |
| 52 while (num_read < size && !newline) | 52 while (num_read < size && !newline) |
| 53 { | 53 { |
| 54 if (vfs_fread(&s[num_read], 1, 1, fp) != 1) | 54 if (aud_vfs_fread(&s[num_read], 1, 1, fp) != 1) |
| 55 break; | 55 break; |
| 56 | 56 |
| 57 /* Unlike fgets(), don't store newline. Under Windows/DOS we'll | 57 /* Unlike fgets(), don't store newline. Under Windows/DOS we'll |
| 58 * probably get an extra blank line for every line that's being | 58 * probably get an extra blank line for every line that's being |
| 59 * read, but that should be ok. | 59 * read, but that should be ok. |
| 385 return -2; | 385 return -2; |
| 386 } | 386 } |
| 387 } | 387 } |
| 388 } | 388 } |
| 389 } | 389 } |
| 390 vfs_fclose(fp); | 390 aud_vfs_fclose(fp); |
| 391 return 0; | 391 return 0; |
| 392 } | 392 } |
| 393 | 393 |
| 394 int mid_init_no_config() | 394 int mid_init_no_config() |
| 395 { | 395 { |
