28
28
#include <sndfile.h>
29
29
#include <zlib.h>
30
30
31
- typedef uint16_t sample_t ; // CDDA 16-bit sample (single channel)
32
- typedef uint32_t frame_t ; // CDDA stereo frame (a pair of 16-bit samples)
31
+ typedef uint16_t Sample ; // CDDA 16-bit sample (single channel)
32
+ typedef uint32_t Frame ; // CDDA stereo frame (a pair of 16-bit samples)
33
33
34
34
// A pair of AccurateRip checksums
35
- typedef struct accuraterip_t {
35
+ typedef struct AccurateRip {
36
36
uint32_t v1 ;
37
37
uint32_t v2 ;
38
- } accuraterip_t ;
38
+ } AccurateRip ;
39
39
40
40
static int check_format (SF_INFO info )
41
41
{
@@ -59,10 +59,10 @@ static int check_format(SF_INFO info)
59
59
return 0 ;
60
60
}
61
61
62
- static sample_t * load_audio_data (SNDFILE * file , SF_INFO info , size_t * size )
62
+ static Sample * load_audio_data (SNDFILE * file , SF_INFO info , size_t * size )
63
63
{
64
64
size_t nsamples = info .frames * info .channels ;
65
- sample_t * data = calloc (nsamples , sizeof (sample_t ));
65
+ Sample * data = calloc (nsamples , sizeof (Sample ));
66
66
67
67
if (data == NULL ) {
68
68
return NULL ;
@@ -85,9 +85,9 @@ static sample_t *load_audio_data(SNDFILE *file, SF_INFO info, size_t *size)
85
85
return data ;
86
86
}
87
87
88
- static accuraterip_t accuraterip (const sample_t * data , size_t size , unsigned track , unsigned total_tracks )
88
+ static AccurateRip accuraterip (const Sample * data , size_t size , unsigned track , unsigned total_tracks )
89
89
{
90
- const frame_t * frames = (const frame_t * )data ;
90
+ const Frame * frames = (const Frame * )data ;
91
91
const size_t nframes = size / 2 ; // 2 samples per CDDA frame
92
92
const size_t skip_frames = 5 * 588 ; // 5 CDDA sectors * 588 audio frames per sector
93
93
@@ -117,7 +117,7 @@ static accuraterip_t accuraterip(const sample_t *data, size_t size, unsigned tra
117
117
v1 = csum_lo ;
118
118
v2 = csum_lo + csum_hi ;
119
119
120
- return (accuraterip_t ){.v1 = v1 , .v2 = v2 };
120
+ return (AccurateRip ){.v1 = v1 , .v2 = v2 };
121
121
}
122
122
123
123
static PyObject * checksums (PyObject * self , PyObject * args )
@@ -158,7 +158,7 @@ static PyObject *checksums(PyObject *self, PyObject *args)
158
158
}
159
159
160
160
size_t size = 0 ;
161
- sample_t * data = load_audio_data (file , info , & size );
161
+ Sample * data = load_audio_data (file , info , & size );
162
162
sf_close (file );
163
163
164
164
if (data == NULL ) {
@@ -168,7 +168,7 @@ static PyObject *checksums(PyObject *self, PyObject *args)
168
168
169
169
uint32_t crc = crc32 (0L , Z_NULL , 0 );
170
170
crc = crc32 (crc , (uint8_t * )data , 2 * size ); // 2 bytes per CDDA sample
171
- accuraterip_t ar = accuraterip (data , size , track , total_tracks );
171
+ AccurateRip ar = accuraterip (data , size , track , total_tracks );
172
172
free (data );
173
173
174
174
return Py_BuildValue ("III" , ar .v1 , ar .v2 , crc );
0 commit comments