amend e1f94bbb4a (32/64bit int64 compat)
authorRobin Gareus <robin@gareus.org>
Thu, 19 Apr 2018 16:32:33 +0000 (18:32 +0200)
committerRobin Gareus <robin@gareus.org>
Thu, 19 Apr 2018 16:32:33 +0000 (18:32 +0200)
libs/ptformat/ptfformat.cc

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