From ae8760ee08832e95db440ee348e9b5dfa66caf1d Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 23 Nov 2017 14:07:46 +0100 Subject: [PATCH] Changed default track selection ordering for VoD files back to previous ordering, live is still reversed. --- src/output/output.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/output/output.cpp b/src/output/output.cpp index d9869b21..5f4290da 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -322,11 +322,21 @@ namespace Mist{ if (!found){ jsonForEach((*itb), itc){ if (found){break;} - for (std::map::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){ - if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){ - selectedTracks.insert(trit->first); - found = true; - if ((*itc).asStringRef() != "*"){break;} + if (myMeta.live){ + for (std::map::reverse_iterator trit = myMeta.tracks.rbegin(); trit != myMeta.tracks.rend(); trit++){ + if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){ + selectedTracks.insert(trit->first); + found = true; + if ((*itc).asStringRef() != "*"){break;} + } + } + }else{ + for (std::map::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){ + if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){ + selectedTracks.insert(trit->first); + found = true; + if ((*itc).asStringRef() != "*"){break;} + } } } }