Ticket #2744: patch.diff

mythmusic/mythmusic/globalsettings.cpp

@@ -118 +118 @@
     return gc;
 };
 
+static HostCheckBox *BuildDbAfterRip()
+{
+    HostCheckBox *gc = new HostCheckBox("BuildDbAfterRip");
+    gc->setLabel(QObject::tr("Rebuild music tree after cd rip."));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("If this setting is unchecked you will need to manually scan for new music."));
+    return gc;
+};
+
+
+
 static HostCheckBox *AutoLookupCD()
 {
     HostCheckBox *gc = new HostCheckBox("AutoLookupCD");
@@ -578 +589 @@
     rippersettings->addChild(NoWhitespace());
     rippersettings->addChild(PostCDRipScript());
     rippersettings->addChild(EjectCD());
-    rippersettings->addChild(OnlyImportNewMusic());
     addChild(rippersettings);
 
     VerticalConfigurationGroup* encodersettings = new VerticalConfigurationGroup(false);
@@ -586 +596 @@
     encodersettings->addChild(EncoderType());
     encodersettings->addChild(DefaultRipQuality());
     encodersettings->addChild(Mp3UseVBR());
+    encodersettings->addChild(OnlyImportNewMusic());
+    encodersettings->addChild(BuildDbAfterRip());
     addChild(encodersettings);
 }
 

mythmusic/mythmusic/main.cpp

@@ -684 +684 @@
 
     gContext->addCurrentLocation("ripcd");
     preMusic(&mdata);
-    if (startRipper())
+
+    
+    if ((startRipper()) && (gContext->GetNumSetting("BuildDbAfterRip",1)))
     {
         // if startRipper returns true, then new files should be present
         // so we should look for them.
-        SearchDir(mdata.startdir);
+
+        SearchDir(mdata.startdir);
         RebuildMusicTree(&mdata);
     }
     postMusic(&mdata);