MacGui: Disable DVD Drive Auto-Detect option in preferences.

- this feature allows you to use other dvd aware apps (mactheripper, dvd player, etc.) while using HB to encode a folder on your hard drive.
- checkbox in prefs nib to disable dvd drive auto detect
- when checked, hb does not poll for available drives at all.
- can still manually navigate to a dvd and select it though.
- is unchecked by default.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@622 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/DriveDetector.m b/macosx/DriveDetector.m
index 61f7229601123d5d961e41f64bdede887715ee5b..b79e969dec6a23d4fbb6f8951cf6d5d7d7bd24d9 100644 (file)
--- a/macosx/DriveDetector.m
+++ b/macosx/DriveDetector.m
@@ -40,14 +40,17 @@
 
 - (void) run
 {
-    /* Set up a timer to check devices every second */
-    fTimer = [NSTimer scheduledTimerWithTimeInterval: 1.0 target: self
-        selector: @selector( detectTimer: ) userInfo: nil repeats: YES];
-    [[NSRunLoop currentRunLoop] addTimer: fTimer forMode:
-        NSModalPanelRunLoopMode];
-
-    /* Do a first update right away */
-    [fTimer fire];
+       if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0)
+       {
+               /* Set up a timer to check devices every second */
+               fTimer = [NSTimer scheduledTimerWithTimeInterval: 1.0 target: self
+                                                                                               selector: @selector( detectTimer: ) userInfo: nil repeats: YES];
+               [[NSRunLoop currentRunLoop] addTimer: fTimer forMode:
+                       NSModalPanelRunLoopMode];
+               
+               /* Do a first update right away */
+               [fTimer fire];
+       }
 }
 
 - (void) stop

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 5734329b917e066a43b1a3d3d14443eeb7b7c914..f582e6f452de89d48b7a838fee54cdd71323f0e7 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,8 +19,8 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
                <integer>29</integer>
+               <integer>1162</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8P2137</string>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index e450ce219e6752d166e6b799fa2d46223fce44da..79978bf847b190152838d7280465a01c138312f9 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/macosx/English.lproj/Preferences.nib/info.nib b/macosx/English.lproj/Preferences.nib/info.nib
index 5555c9b51d24d4c3710150797fd6ccf5af89dd81..59db7cce57b4e6f239ac5f6c41229931657a0bfb 100644 (file)
--- a/macosx/English.lproj/Preferences.nib/info.nib
+++ b/macosx/English.lproj/Preferences.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>90 269 674 609 0 0 1440 878 </string>
+       <string>84 122 674 609 0 0 1440 878 </string>
        <key>IBFramework Version</key>
        <string>446.1</string>
        <key>IBOpenObjects</key>

diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index 79d30633d3d16906c8d24d352d30fb9530f42c23..13dbbefd0e1fd605073d87d8c7d533c38505739d 100644 (file)
Binary files a/macosx/English.lproj/Preferences.nib/keyedobjects.nib and b/macosx/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 2bb38bfc0fb3c877c1169b83a5746512cd4005a7..5afe02bacef36be92b38b1bd50ebb1cdd030eb10 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -41,6 +41,7 @@
         @"NO",              @"DefaultChapterMarkers",
         @"NO",              @"ShowVerboseOutput",
                @"NO",              @"AllowLargeFiles",
+               @"NO",              @"DisableDvdAutoDetect",
         nil]];
 }
 

diff --git a/macosx/ScanController.mm b/macosx/ScanController.mm
index f352cb57b655a2604f327957d790021db01c7754..a88ff40e74e7497a5b5831f5641da7e7a3a9d867 100644 (file)
--- a/macosx/ScanController.mm
+++ b/macosx/ScanController.mm
@@ -40,9 +40,24 @@
 
 - (void) Show
 {
- 
-    fDriveDetector = [[DriveDetector alloc] initWithCallback:self selector:@selector(openUpdateDrives:)];
-       [fDriveDetector run];
+       if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0)
+       {
+       [fSelectString setStringValue:@"Select a DVD Source:"];
+               fDriveDetector = [[DriveDetector alloc] initWithCallback:self selector:@selector(openUpdateDrives:)];
+               [fDriveDetector run];
+       }
+       else
+       {
+       [fSelectString setStringValue:@"Select a DVD Source: (DVD drive auto-detect is disabled)"];
+
+       [fDetectedCell  setEnabled: 0];
+       [fDetectedPopUp setEnabled: 0];
+    [fFolderField   setEnabled: 1];
+    [fBrowseButton  setEnabled: 1];
+       [fOpenButton    setEnabled: 0];
+       [fBrowseButton  setEnabled: 1];
+       [fMatrix selectCell: fFolderCell];
+       }
        [NSApp beginSheet:fPanel modalForWindow:fWindow modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
 }
 
@@ -140,25 +155,36 @@
 
 - (IBAction) MatrixChanged: (id) sender
 {
-    /* Do we have detected drives */
+    /* Do we have detected drives  and is "Disable DVD Drive Auto Scan" off in prefs*/
 
-    if( [fDetectedPopUp numberOfItems] > 0 )
+    if( [fDetectedPopUp numberOfItems] > 0  && [[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0)
     {
         [fDetectedCell setEnabled: YES];
+               //[fMatrix selectCellAtRow:0 column:0];
+               
     }
     else
     {
-       [fMatrix selectCell: fFolderCell];
+       //[fMatrix selectCell: fFolderCell];
         [fDetectedCell setEnabled: NO];
-               [fMatrix selectCellAtRow:1 column:0];
+               
     }
 
     /* Enable controls related to the current choice */
-    bool foo;
-    foo = ( [fMatrix selectedRow] == 0 );
-    [fDetectedPopUp setEnabled:  foo];
-    [fFolderField   setEnabled: !foo];
-    [fBrowseButton  setEnabled: !foo];
+       /* If Detected Volume is selected */
+    if ( [fMatrix selectedRow] == 0 )
+       {
+       [fDetectedPopUp setEnabled: YES];
+    [fFolderField   setEnabled: NO];
+    [fBrowseButton  setEnabled: NO];
+       }
+       else
+       {
+       [fDetectedPopUp setEnabled: NO];
+    [fFolderField   setEnabled: YES];
+    [fBrowseButton  setEnabled: YES];
+       }
+
 
 }