MacGui: Fixed a crash when dismissing the open window.

[handbrake-jp/handbrake-jp-git.git] / macosx / HBQueueController.h

diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h
index a2e5b99..9fa4d67 100644 (file)
--- a/macosx/HBQueueController.h
+++ b/macosx/HBQueueController.h
@@ -1,7 +1,7 @@
 /* HBQueueController
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
 
@@ -105,7 +105,10 @@ BOOL                        fIsDragging;
     int                         h264_level;
     int                         crf;
     NSString                    *x264opts;
-
+    /* Used to concatenate audio list values into a string for display */
+    NSString                    *audioinfo_codecs;
+    NSString                    *audioinfo_summary;
+    
     int                         audio_mixdowns[8];
     int                         acodec;
     int                         abitrate;
@@ -161,8 +164,8 @@ BOOL                        fIsDragging;
     NSMutableArray               *fJobs;   // array of HBJob
     NSMutableAttributedString    *fDescription;
     BOOL                         fNeedsDescription;
-    float                        fLastDescriptionHeight;
-    float                        fLastDescriptionWidth;
+    CGFloat                        fLastDescriptionHeight;
+    CGFloat                        fLastDescriptionWidth;
     HBQueueJobGroupStatus        fStatus;
     NSString                     *fPresetName;
 }
@@ -188,14 +191,14 @@ BOOL                        fIsDragging;
 // Creating a description
 - (void)               setNeedsDescription: (BOOL)flag;
 - (NSMutableAttributedString *) attributedDescription;
-- (float)              heightOfDescriptionForWidth:(float)width;
-- (float)              lastDescriptionHeight;
+- (CGFloat)              heightOfDescriptionForWidth:(CGFloat)width;
+- (CGFloat)              lastDescriptionHeight;
 
 @end
 
 //------------------------------------------------------------------------------------
 
-@interface HBQueueController : NSObject
+@interface HBQueueController : NSWindowController
 {
     hb_handle_t                  *fHandle;              // reference to libhb
     HBController                 *fHBController;        // reference to HBController
@@ -218,8 +221,8 @@ BOOL                        fIsDragging;
 #endif
     NSTimer                      *fAnimationTimer;      // animates the icon of the current job in the queue outline view
     int                          fAnimationIndex;       // used to generate name of image used to animate the current job in the queue outline view
-    
-    //  +---------------fQueueWindow----------------+
+
+    //  +------------------window-------------------+
     //  |+-------------fCurrentJobPane-------------+|
     //  ||                                         ||
     //  ||                                         ||
@@ -235,8 +238,6 @@ BOOL                        fIsDragging;
     //  ||                                         ||
     //  |+-----------------------------------------+|
     //  +-------------------------------------------+
-    
-    IBOutlet NSWindow            *fQueueWindow;
 
     // fCurrentJobPane - visible only when processing a job
     IBOutlet NSView              *fCurrentJobPane;