Merge pull request #852 from mad-max/lookupfoldernames

added ability to use folder names for music video lookup

1 files changed, 22 insertions, 4 deletions

diff --git a/xbmc/settings/GUIDialogContentSettings.cpp b/xbmc/settings/GUIDialogContentSettings.cpp
index f669f2a0b6..e2bef8f80b 100644
--- a/xbmc/settings/GUIDialogContentSettings.cpp
+++ b/xbmc/settings/GUIDialogContentSettings.cpp
@@ -179,7 +179,10 @@ void CGUIDialogContentSettings::CreateSettings()
   case CONTENT_MUSICVIDEOS:
     {
       AddBool(1,20346,&m_bScanRecursive, m_bShowScanSettings);
-      AddBool(2,20432,&m_bNoUpdate, m_bShowScanSettings);
+      AddBool(2,20330,&m_bUseDirNames, m_bShowScanSettings);
+      AddBool(3,20346,&m_bScanRecursive, m_bShowScanSettings && ((m_bUseDirNames && !m_bSingleItem) || !m_bUseDirNames)
+      AddBool(4,20383,&m_bSingleItem, m_bShowScanSettings && (m_bUseDirNames && !m_bScanRecursive));
+      AddBool(5,20432,&m_bNoUpdate, m_bShowScanSettings);
     }
     break;
   case CONTENT_ALBUMS:
@@ -449,9 +452,24 @@ bool CGUIDialogContentSettings::Show(ADDON::ScraperPtr& scraper, VIDEO::SScanSet
       }
       else if (content == CONTENT_MUSICVIDEOS)
       {
-        settings.parent_name = false;
-        settings.parent_name_root = false;
-        settings.recurse = dialog->m_bScanRecursive ? INT_MAX : 0;
+        if (dialog->m_bUseDirNames)
+        {
+          settings.parent_name = true;
+          settings.parent_name_root = false;
+          settings.recurse = dialog->m_bScanRecursive ? INT_MAX : 1;
+
+          if (dialog->m_bSingleItem)
+          {
+            settings.parent_name_root = true;
+            settings.recurse = 0;
+          }
+        }
+        else
+         {
+           settings.parent_name = false;
+           settings.parent_name_root = false;
+           settings.recurse = dialog->m_bScanRecursive ? INT_MAX : 0;
+         }
       }
     }
   }