MacGui: Queue allow proper deleting of encoding queue items and proper deleting of previously cancelled items. Also fixed Pause.

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

2 files changed, 61 insertions, 8 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 198439013..483dc8523 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1536,8 +1536,15 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 - (void) removeQueueFileItem:(int) queueItemToRemove
 {
    
-   // FIX ME: WE NEED TO IDENTIFY AN ENCODING ITEM AND CALL 
-   
+   // NSMutableDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
+   if ([[[QueueFileArray objectAtIndex:queueItemToRemove] objectForKey:@"Status"] intValue] == 3) //<-- Find out if the item we are removing is a cancelled item
+    {
+    /* Since we are removing a cancelled item, WE need to decrement the currentQueueEncodeIndex
+     * by one to keep in sync with the queue array
+     */
+    currentQueueEncodeIndex--;
+    [self writeToActivityLog: "removeQueueFileItem: Removing a cancelled encode, decrement currentQueueEncodeIndex to %d", currentQueueEncodeIndex];
+    }
     [QueueFileArray removeObjectAtIndex:queueItemToRemove];
     [self saveQueueFileItem];
 
@@ -3000,15 +3007,15 @@ fWorkingCount = 0;
 - (IBAction) Pause: (id) sender
 {
     hb_state_t s;
-    hb_get_state2( fHandle, &s );
+    hb_get_state2( fQueueEncodeLibhb, &s );
 
     if( s.state == HB_STATE_PAUSED )
     {
-        hb_resume( fHandle );
+        hb_resume( fQueueEncodeLibhb );
     }
     else
     {
-        hb_pause( fHandle );
+        hb_pause( fQueueEncodeLibhb );
     }
 }
 
diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 42674b550..cb8be2351 100644
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -463,13 +463,59 @@ if (fWorkingCount > 0)
 
 #pragma mark Queue Item Controls
 //------------------------------------------------------------------------------------
-// Delete pending or cancelled item from the queue window and accompanying array
+// Delete encodes from the queue window and accompanying array
+// Also handling first cancelling the encode if in fact its currently encoding.
 //------------------------------------------------------------------------------------
 - (IBAction)removeSelectedQueueItem: (id)sender
 {
-   NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
+    NSIndexSet * selectedRows = [fOutlineView selectedRowIndexes];
     int row = [selectedRows firstIndex];
-    [fHBController removeQueueFileItem:row];
+    /* if this is a currently encoding job, we need to be sure to alert the user,
+     * to let them decide to cancel it first, then if they do, we can come back and
+     * remove it */
+    if (row == fEncodingQueueItem)
+    {
+        NSString * alertTitle = [NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It ?", nil)];
+        // Which window to attach the sheet to?
+        NSWindow * docWindow;
+        if ([sender respondsToSelector: @selector(window)])
+            docWindow = [sender window];
+        
+        
+        NSBeginCriticalAlertSheet(
+                                  alertTitle,
+                                  NSLocalizedString(@"Keep Encoding", nil),
+                                  nil,
+                                  NSLocalizedString(@"Stop Encoding and Delete", nil),
+                                  docWindow, self,
+                                  nil, @selector(didDimissCancelCurrentJob:returnCode:contextInfo:), nil,
+                                  NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", nil));
+        
+        // didDimissCancelCurrentJob:returnCode:contextInfo: will be called when the dialog is dismissed
+    }
+    else
+    { 
+    /* since we are not a currently encoding item, we can just be cancelled */
+            [fHBController removeQueueFileItem:row];
+    }
+}
+
+- (void) didDimissCancelCurrentJob: (NSWindow *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo
+{
+    if (returnCode == NSAlertOtherReturn)
+    {
+    /* We need to save the currently encoding item number first */
+    int encodingItemToRemove = fEncodingQueueItem;
+    /* Since we are encoding, we need to let fHBController Cancel this job
+     * upon which it will move to the next one if there is one
+     */
+    [fHBController doCancelCurrentJob];
+    /* Now, we can go ahead and remove the job we just cancelled since
+     * we have its item number from above
+     */
+    [fHBController removeQueueFileItem:encodingItemToRemove];
+    }
+    
 }
 
 //------------------------------------------------------------------------------------