Change a number of places where size_t or off_t were still used to count samples in order to now use (sox_)uint64_t. Also use PRIu64 where such numbers are output. Some function prototypes and data structures from sox.h are also affected. This breaks ABI compatibility; the library version number has been incremented for 14.4.0 already in commit e9a66b7c, so no change necessary here.
Showing the changes to src/spectrogram.c (1 of 17 files). Show all
Unified · Split
| @@ -56,7 +56,7 @@ typedef struct { · 55 unmodified lines | |||
| 56 | 56 | ||
| 57 | /* Per-channel work area */ | 57 | /* Per-channel work area */ |
| 58 | int WORK; /* Start of work area is marked by this dummy variable. */ | 58 | int WORK; /* Start of work area is marked by this dummy variable. */ |
| 59 | size_t skip; | 59 | uint64_t skip; |
| 60 | int dft_size, step_size, block_steps, block_num, rows, cols, read; | 60 | int dft_size, step_size, block_steps, block_num, rows, cols, read; |
| 61 | int x_size, end, end_min, last_end; | 61 | int x_size, end, end_min, last_end; |
| 62 | sox_bool truncated; | 62 | sox_bool truncated; |
| @@ -92,7 +92,7 @@ static unsigned char const alt_palette[] = · 29 unmodified lines | |||
| 92 | static int getopts(sox_effect_t * effp, int argc, char **argv) | 92 | static int getopts(sox_effect_t * effp, int argc, char **argv) |
| 93 | { | 93 | { |
| 94 | priv_t * p = (priv_t *)effp->priv; | 94 | priv_t * p = (priv_t *)effp->priv; |
| 95 | size_t duration; | 95 | uint64_t duration; |
| 96 | char const * next; | 96 | char const * next; |
| 97 | int c; | 97 | int c; |
| 98 | lsx_getopt_t optstate; | 98 | lsx_getopt_t optstate; |