allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

NO-OP: whitespace

Browse Source
This commit is contained in:
Robin Gareus
2019-12-08 15:20:26 +01:00
parent dec355e83d
commit dca3f7dd97
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/mp3fileimportable.h
View File

@@ -67,7 +67,7 @@ private:
mp3dec_frame_info_t _info; mp3dec_frame_info_t _info;
samplecnt_t _length; samplecnt_t _length;
int _fd; int _fd;
const uint8_t* _map_addr; const uint8_t* _map_addr;
size_t _map_length; size_t _map_length;

12
libs/ardour/mp3fileimportable.cc
View File

@@ -119,7 +119,7 @@ Mp3FileImportableSource::unmap_mem ()
UnmapViewOfFile (_map_addr); UnmapViewOfFile (_map_addr);
} }
#else #else
munmap ((void*) _map_addr, _map_length); munmap ((void*)_map_addr, _map_length);
#endif #endif
close (_fd); close (_fd);
_map_addr = 0; _map_addr = 0;
@@ -130,7 +130,7 @@ Mp3FileImportableSource::decode_mp3 (bool parse_only)
{ {
_pcm_off = 0; _pcm_off = 0;
do { do {
_n_frames = mp3dec_decode_frame (&_mp3d, _buffer, _remain, parse_only ? NULL :_pcm, &_info); _n_frames = mp3dec_decode_frame (&_mp3d, _buffer, _remain, parse_only ? NULL : _pcm, &_info);
_buffer += _info.frame_bytes; _buffer += _info.frame_bytes;
_remain -= _info.frame_bytes; _remain -= _info.frame_bytes;
if (_n_frames) { if (_n_frames) {
@@ -149,10 +149,10 @@ Mp3FileImportableSource::seek (samplepos_t pos)
/* rewind, then decode to pos */ /* rewind, then decode to pos */
if (pos < _read_position) { if (pos < _read_position) {
_buffer = _map_addr; _buffer = _map_addr;
_remain = _map_length; _remain = _map_length;
_read_position = 0; _read_position = 0;
_pcm_off = 0; _pcm_off = 0;
mp3dec_init (&_mp3d); mp3dec_init (&_mp3d);
decode_mp3 (); decode_mp3 ();
} }
@@ -212,7 +212,7 @@ Mp3FileImportableSource::read_unlocked (Sample* dst, samplepos_t start, samplecn
seek (start); seek (start);
} }
size_t dst_off = 0; size_t dst_off = 0;
samplecnt_t remain = cnt; samplecnt_t remain = cnt;
while (remain > 0) { while (remain > 0) {