smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

amend e1f94bbb4a (32/64bit int64 compat)

Browse source
This commit is contained in:
Robin Gareus 2018-04-19 18:32:33 +02:00
parent e1f94bbb4a
commit baba08c264
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ptformat/ptfformat.cc
View file

@ -874,7 +874,7 @@ PTFFormat::parsemidi(void) {
midiregionname, midiregionname,
regionnumber++, regionnumber++,
//(int64_t)mc.zero, //(int64_t)mc.zero,
(int64_t)0xe8d4a51000ull, (int64_t)0xe8d4a51000ULL,
(int64_t)(0), (int64_t)(0),
//(int64_t)(max_pos*sessionrate*60/(960000*120)), //(int64_t)(max_pos*sessionrate*60/(960000*120)),
(int64_t)mc.maxlen, (int64_t)mc.maxlen,
@ -1076,7 +1076,7 @@ PTFFormat::parsemidi12(void) {
midiregionname, midiregionname,
regionnumber++, regionnumber++,
//(int64_t)mc.zero, //(int64_t)mc.zero,
(int64_t)0xe8d4a51000ull, (int64_t)0xe8d4a51000ULL,
(int64_t)(0), (int64_t)(0),
//(int64_t)(max_pos*sessionrate*60/(960000*120)), //(int64_t)(max_pos*sessionrate*60/(960000*120)),
(int64_t)mc.maxlen, (int64_t)mc.maxlen,
@ -1760,9 +1760,9 @@ nocustom:
j+=startbytes; j+=startbytes;
if (offsetbytes == 5) if (offsetbytes == 5)
sampleoffset -= 1000000000000; sampleoffset -= 1000000000000ULL;
if (startbytes == 5) if (startbytes == 5)
start -= 1000000000000; start -= 1000000000000ULL;
std::string filename = string(name); std::string filename = string(name);
wav_t f = { wav_t f = {
@ -1873,8 +1873,8 @@ nocustom:
} }
m+=8; m+=8;
findex3 = ptfunxored[m] | (ptfunxored[m+1] << 8); findex3 = ptfunxored[m] | (ptfunxored[m+1] << 8);
sampleoffset -= 1000000000000; sampleoffset -= 1000000000000ULL;
start -= 1000000000000; start -= 1000000000000ULL;
/* /*
// Find wav with correct findex // Find wav with correct findex
@ -2031,9 +2031,9 @@ nocustom:
j+=startbytes; j+=startbytes;
if (offsetbytes == 5) if (offsetbytes == 5)
sampleoffset -= 1000000000000; sampleoffset -= 1000000000000ULL;
if (startbytes == 5) if (startbytes == 5)
start -= 1000000000000; start -= 1000000000000ULL;
std::string filename = string(name); std::string filename = string(name);
wav_t f = { wav_t f = {