From 74e433e29801036847250f24d7b9e2d18145308f Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 22 Nov 2016 09:56:37 +0100
Subject: [PATCH] Fixed track autoselect to not be so prejudiced against MP3

---
 src/output/output.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/output/output.cpp b/src/output/output.cpp
index b52dc721..a65dd1da 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -248,14 +248,14 @@ namespace Mist{
                   break;
                 }
               }
-              if (!found){
-                for (std::map<unsigned int,DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
+            }
+            if (!found){
+              jsonForEach(*itb, itc){
+                for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
                   if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){
                     genCounter++;
                     found = true;
-                    if ((*itc).asStringRef() != "*"){
-                      break;
-                    }
+                    if ((*itc).asStringRef() != "*"){break;}
                   }
                 }
               }
@@ -266,7 +266,7 @@ namespace Mist{
           if (selCounter + genCounter > bestSoFarCount){
             bestSoFarCount = selCounter + genCounter;
             bestSoFar = index;
-            HIGH_MSG("Match (%u/%u): %s", selCounter, selCounter+genCounter, (*it).toString().c_str());
+            HIGH_MSG("Match (%u/%u): %s", selCounter, selCounter + genCounter, (*it).toString().c_str());
           }
         }else{
           VERYHIGH_MSG("Not a match for currently selected tracks: %s", (*it).toString().c_str());
@@ -282,23 +282,21 @@ namespace Mist{
         if ((*itb).size() && myMeta.tracks.size()){
           bool found = false;
           jsonForEach((*itb), itc){
-            if (found){
-              break;
-            }
             for (std::set<unsigned long>::iterator itd = selectedTracks.begin(); itd != selectedTracks.end(); itd++){
               if (myMeta.tracks[*itd].codec == (*itc).asStringRef()){
                 found = true;
                 break;
               }
             }
-            if (!found){
-              for (std::map<unsigned int,DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
+          }
+          if (!found){
+            jsonForEach((*itb), itc){
+              if (found){break;}
+              for (std::map<unsigned int, DTSC::Track>::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 ((*itc).asStringRef() != "*"){break;}
                 }
               }
             }