From cb088f68b03ffb8f46949863ee07323e9b5d012f Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 9 Dec 2014 14:48:04 +0100 Subject: [PATCH] Fixed MistIn conversion mode. --- src/input/input.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/input/input.cpp b/src/input/input.cpp index 1ef12932..d80e21e5 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -205,6 +205,21 @@ namespace Mist { void Input::parseHeader(){ DEBUG_MSG(DLVL_DONTEVEN,"Parsing the header"); + selectedTracks.clear(); + std::stringstream trackSpec; + for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ + DEBUG_MSG(DLVL_VERYHIGH, "Track %d encountered", it->first); + if (trackSpec.str() != ""){ + trackSpec << " "; + } + trackSpec << it->first; + DEBUG_MSG(DLVL_VERYHIGH, "Trackspec now %s", trackSpec.str().c_str()); + for (std::deque::iterator it2 = it->second.keys.begin(); it2 != it->second.keys.end(); it2++){ + keyTimes[it->first].insert(it2->getTime()); + } + } + trackSelect(trackSpec.str()); + bool hasKeySizes = true; for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ if (!it->second.keySizes.size()){ @@ -233,21 +248,6 @@ namespace Mist { } } }else{ - selectedTracks.clear(); - std::stringstream trackSpec; - for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ - DEBUG_MSG(DLVL_VERYHIGH, "Track %d encountered", it->first); - if (trackSpec.str() != ""){ - trackSpec << " "; - } - trackSpec << it->first; - DEBUG_MSG(DLVL_VERYHIGH, "Trackspec now %s", trackSpec.str().c_str()); - for (std::deque::iterator it2 = it->second.keys.begin(); it2 != it->second.keys.end(); it2++){ - keyTimes[it->first].insert(it2->getTime()); - } - } - trackSelect(trackSpec.str()); - std::map curData; std::map bookKeeping;