diff options
| author | Damien Zammit <damien@zamaudio.com> | 2016-02-02 16:49:12 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-02-13 09:50:52 +0100 |
| commit | 81a9f7a956f3cf3c353f72e6d80e4d7bec0271c7 (patch) | |
| tree | 11138665a17f7438a2499f752e6ce1d9ba0f6633 /libs/ptformat/ptfformat.cc | |
| parent | 255fbe7b5500271537390f94b38ab65337378479 (diff) | |
Unjumble the PT5 wav ordering in regions/tracks
by sorting alphanumerically and case insensitively
Signed-off-by: Damien Zammit <damien@zamaudio.com>
Diffstat (limited to 'libs/ptformat/ptfformat.cc')
| -rw-r--r-- | libs/ptformat/ptfformat.cc | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/libs/ptformat/ptfformat.cc b/libs/ptformat/ptfformat.cc index f233f51dfa..99c89510dc 100644 --- a/libs/ptformat/ptfformat.cc +++ b/libs/ptformat/ptfformat.cc @@ -631,6 +631,17 @@ PTFFormat::parserest5(void) { } void +PTFFormat::resort(std::vector<wav_t> *ws) { + int j = 0; + std::sort((*ws).begin(), (*ws).end()); + for (std::vector<wav_t>::iterator i = (*ws).begin(); + i != (*ws).end(); ++i) { + (*i).index = j; + j++; + } +} + +void PTFFormat::parseaudio5(void) { int i,k,l; int lengthofname, wavnumber; @@ -670,6 +681,7 @@ PTFFormat::parseaudio5(void) { wavnumber = 0; i+=16; + char ext[5]; while (i < len && numberofwavs > 0) { i++; if ( (ptfunxored[i ] == 0x5a) && @@ -684,11 +696,19 @@ PTFFormat::parseaudio5(void) { wavname[l] = ptfunxored[i+l]; l++; } - i+=lengthofname + 4; + i+=lengthofname; + ext[0] = ptfunxored[i++]; + ext[1] = ptfunxored[i++]; + ext[2] = ptfunxored[i++]; + ext[3] = ptfunxored[i++]; + ext[4] = '\0'; + wavname[l] = 0; - if (foundin(wavname, ".wav")) { + if (foundin(wavname, ".L") || foundin(wavname, ".R")) { + extension = string(""); + } else if (foundin(wavname, ".wav") || foundin(ext, "WAVE")) { extension = string(".wav"); - } else if (foundin(wavname, ".aif")) { + } else if (foundin(wavname, ".aif") || foundin(ext, "AIFF")) { extension = string(".aif"); } else { extension = string(""); @@ -707,6 +727,8 @@ PTFFormat::parseaudio5(void) { numberofwavs--; i += 7; } + resort(&actualwavs); + resort(&audiofiles); } void |