OSDN Git Service

BuildSystem: darwin
[handbrake-jp/handbrake-jp-git.git] / macosx / PictureController.mm
index a4785ab..30409d9 100644 (file)
@@ -4,20 +4,15 @@
    Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include "PictureController.h"
+#import "PictureController.h"
+#import "Controller.h"
+#import "HBPreviewController.h"
+#import "HBFilterController.h"
 
-@interface PictureController (Private)
-
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize;
-- (void)resizeSheetForViewSize: (NSSize)viewSize;
-- (void)setViewSize: (NSSize)viewSize;
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize;
-
-@end
 
 @implementation PictureController
 
-- (id)initWithDelegate:(id)del
+- (id)init
 {
        if (self = [super initWithWindowNibName:@"PictureSettings"])
        {
         // If/when we switch a lot of this stuff to bindings, this can probably
         // go away.
         [self window];
-
-               delegate = del;
-        fPicturePreviews = [[NSMutableDictionary dictionaryWithCapacity: HB_NUM_HBLIB_PICTURES] retain];
-       }
+        
+       fPreviewController = [[PreviewController alloc] init];
+    //fPictureFilterController = [[PictureFilterController alloc] init];
+    }
        return self;
 }
 
+//------------------------------------------------------------------------------------
+// Displays and brings the picture window to the front
+//------------------------------------------------------------------------------------
+- (IBAction) showPictureWindow: (id)sender
+{
+    if ([[self window] isVisible])
+    {
+        [[self window] close];
+    }
+    else
+    {
+        [self showWindow:sender];
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+        if ([fPreviewController fullScreen] == YES)
+        {
+            [self setToFullScreenMode];
+        }
+        else
+        {
+            [self setToWindowedMode];
+        }
+    }
+}
+
+- (BOOL) previewFullScreenMode
+{
+    return [fPreviewController fullScreen];
+}
+
+- (IBAction) previewGoWindowed: (id)sender
+{
+    [fPreviewController goWindowedScreen:self];
+}
+
+- (IBAction) showPreviewWindow: (id)sender
+{
+    [fPreviewController showWindow:sender];
+}
+
+- (IBAction) showFilterWindow: (id)sender
+{
+    [fHBController showFiltersPanel:sender];
+}
+
+
+- (void) setToFullScreenMode
+{
+    int32_t shieldLevel = CGShieldingWindowLevel(); 
+    
+    [fPictureWindow setLevel:shieldLevel + 1]; 
+    // Show the window. 
+    [fPictureWindow makeKeyAndOrderFront:self];
+}
+
+- (void) setToWindowedMode
+{
+    /* Set the window back to regular level */
+    [[self window] setLevel:NSNormalWindowLevel];
+}
+
+- (void)setHBController: (HBController *)controller
+{
+    fHBController = controller;
+    //[fPictureFilterController   setHBController: controller];
+    [fPreviewController   setHBController: controller];
+    
+}
+
+- (void)awakeFromNib
+{
+    [fPictureWindow setDelegate:self];
+    if( ![[self window] setFrameUsingName:@"PictureSizing"] )
+        [[self window] center];
+    [self setWindowFrameAutosaveName:@"PictureSizing"];
+    [[self window] setExcludedFromWindowsMenu:YES];
+}
+
+
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
+}
+
+- (BOOL)windowShouldClose:(id)fPictureWindow
+{
+    return YES;
+}
+
 - (void) dealloc
 {
-    [fPicturePreviews release];
+    [fPictureFilterController release];
+    [fPreviewController release];
     [super dealloc];
 }
 
 - (void) SetHandle: (hb_handle_t *) handle
 {
     fHandle = handle;
-
+    
     [fWidthStepper  setValueWraps: NO];
     [fWidthStepper  setIncrement: 16];
     [fWidthStepper  setMinValue: 64];
     [fHeightStepper setValueWraps: NO];
     [fHeightStepper setIncrement: 16];
     [fHeightStepper setMinValue: 64];
-
+    
     [fCropTopStepper    setIncrement: 2];
     [fCropTopStepper    setMinValue:  0];
     [fCropBottomStepper setIncrement: 2];
     [fCropLeftStepper   setMinValue:  0];
     [fCropRightStepper  setIncrement: 2];
     [fCropRightStepper  setMinValue:  0];
+    
+    [fPreviewController SetHandle: fHandle];
+    [fPictureFilterController SetHandle: fHandle];
+    
+
 }
 
 - (void) SetTitle: (hb_title_t *) title
     hb_job_t * job = title->job;
 
     fTitle = title;
-
+    
+    
+    
     [fWidthStepper      setMaxValue: title->width];
     [fWidthStepper      setIntValue: job->width];
     [fWidthField        setIntValue: job->width];
     {
     [fAnamorphicPopUp addItemWithTitle: @"Loose"];
     }
-    [fAnamorphicPopUp selectItemAtIndex: job->pixel_ratio];
+    [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
     
     /* We initially set the previous state of keep ar to on */
     keepAspectRatioPreviousState = 1;
        }
        
        /* Set filters widgets according to the filters struct */
-       [fVFRCheck setState:fPictureFilterSettings.vfr];
-    [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+    /* this has now been movied to the filters controller */
+    /*
+       [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
     [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
     [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     [fDeblockCheck setState: fPictureFilterSettings.deblock];
+    [fDecombCheck setState: fPictureFilterSettings.decomb];
+    */
     
     fPicture = 0;
     MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
     MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
+    
     [self SettingsChanged: nil];
 }
 
-/* we use this to setup the initial picture filters upon first launch, after that their states
-are maintained across different sources */
-- (void) setInitialPictureFilters
-{
-       /* we use a popup to show the deinterlace settings */
-       [fDeinterlacePopUp removeAllItems];
-    [fDeinterlacePopUp addItemWithTitle: @"None"];
-    [fDeinterlacePopUp addItemWithTitle: @"Fast"];
-    [fDeinterlacePopUp addItemWithTitle: @"Slow"];
-       [fDeinterlacePopUp addItemWithTitle: @"Slower"];
     
-       /* Set deinterlaces level according to the integer in the main window */
-       [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-
-       /* we use a popup to show the denoise settings */
-       [fDenoisePopUp removeAllItems];
-    [fDenoisePopUp addItemWithTitle: @"None"];
-    [fDenoisePopUp addItemWithTitle: @"Weak"];
-       [fDenoisePopUp addItemWithTitle: @"Medium"];
-    [fDenoisePopUp addItemWithTitle: @"Strong"];
-       /* Set denoises level according to the integer in the main window */
-       [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
-    
-    /* we use a popup to show the decomb settings */
-       [fDecombPopUp removeAllItems];
-    [fDecombPopUp addItemWithTitle: @"None"];
-    [fDecombPopUp addItemWithTitle: @"Default"];
-    [fDecombPopUp addItemWithTitle: @"Custom"];
-       /* Set denoises level according to the integer in the main window */
-       [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
-
-}
 
-// Adjusts the window to draw the current picture (fPicture) adjusting its size as
-// necessary to display as much of the picture as possible.
-- (void) displayPreview
+- (IBAction) SettingsChanged: (id) sender
 {
-    [fPictureView setImage: [self imageForPicture: fPicture]];
-       
-       NSSize displaySize = NSMakeSize( (float)fTitle->width, (float)fTitle->height );
-    /* Set the picture size display fields below the Preview Picture*/
-    if( fTitle->job->pixel_ratio == 1 ) // Original PAR Implementation
-    {
-        output_width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
-        output_height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
-        display_width = output_width * fTitle->job->pixel_aspect_width / fTitle->job->pixel_aspect_height;
-        [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
-                                    fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
-        displaySize.width *= ((float)fTitle->job->pixel_aspect_width) / ((float)fTitle->job->pixel_aspect_height);   
-    }
-    else if (fTitle->job->pixel_ratio == 2) // Loose Anamorphic
-    {
-        display_width = output_width * output_par_width / output_par_height;
-        [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
-                                    fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
-        
-        /* FIXME: needs to be fixed so that the picture window does not resize itself on the first
-         anamorphic width drop
-         */
-        if (fTitle->width - 8 < output_width)
-        {
-            displaySize.width *= ((float)output_par_width) / ((float)output_par_height);
-        }
-    }
-    else // No Anamorphic
-    {
-        [fInfoField setStringValue: [NSString stringWithFormat:
-                                     @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
-                                     fTitle->job->width, fTitle->job->height]];
-    }
+    hb_job_t * job = fTitle->job;
     
-    NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
-    if( [self viewNeedsToResizeToSize:viewSize] )
+    autoCrop = ( [fCropMatrix selectedRow] == 0 );
+    [fCropTopStepper    setEnabled: !autoCrop];
+    [fCropBottomStepper setEnabled: !autoCrop];
+    [fCropLeftStepper   setEnabled: !autoCrop];
+    [fCropRightStepper  setEnabled: !autoCrop];
+
+    if( autoCrop )
     {
-        [self resizeSheetForViewSize:viewSize];
-        [self setViewSize:viewSize];
+        memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
     }
-    
-    // Show the scaled text (use the height to check since the width can vary
-    // with anamorphic video).
-    if( ((int)viewSize.height) != fTitle->height )
+    else
     {
-        float scale = viewSize.width / ((float)fTitle->width);
-        NSString *scaleString = [NSString stringWithFormat:
-                                 NSLocalizedString( @" (Preview scaled to %.0f%% actual size)",
-                                                   @"String shown when a preview is scaled" ),
-                                 scale * 100.0];
-        [fInfoField setStringValue:
-         [[fInfoField stringValue] stringByAppendingString:scaleString]];
+        job->crop[0] = [fCropTopStepper    intValue];
+        job->crop[1] = [fCropBottomStepper intValue];
+        job->crop[2] = [fCropLeftStepper   intValue];
+        job->crop[3] = [fCropRightStepper  intValue];
     }
     
-    [fPrevButton setEnabled: ( fPicture > 0 )];
-    [fNextButton setEnabled: ( fPicture < 9 )];
-}
-
-- (IBAction) SettingsChanged: (id) sender
-{
-    hb_job_t * job = fTitle->job;
-    
        if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
        {
         if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
         {
-            job->pixel_ratio = 2;
+            job->anamorphic.mode = 2;
             [fWidthStepper setEnabled: YES];
             [fWidthField setEnabled: YES];
             /* We set job->width and call hb_set_anamorphic_size in libhb to do a "dry run" to get
              * the values to be used by libhb for loose anamorphic
              */
+            /* if the sender is the anamorphic popup, then we know that loose anamorphic has just
+             * been turned on, so snap the width to full width for the source.
+             */
+            if (sender == fAnamorphicPopUp)
+            {
+                [fWidthStepper      setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+                [fWidthField        setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+            }
             job->width       = [fWidthStepper  intValue];
             hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
             [fHeightStepper      setIntValue: output_height];
@@ -255,7 +281,7 @@ are maintained across different sources */
             job->width       = [fWidthStepper  intValue];
             job->height      = [fHeightStepper intValue];
             
-            job->pixel_ratio = 1;
+            job->anamorphic.mode = 1;
             [fWidthStepper setEnabled: NO];
             [fWidthField setEnabled: NO];
         }
@@ -278,7 +304,7 @@ are maintained across different sources */
        {
         job->width       = [fWidthStepper  intValue];
         job->height      = [fHeightStepper intValue];
-        job->pixel_ratio = 0;
+        job->anamorphic.mode = 0;
         [fWidthStepper setEnabled: YES];
         [fWidthField setEnabled: YES];
         [fHeightStepper setEnabled: YES];
@@ -293,55 +319,8 @@ are maintained across different sources */
         
        }
        
-    
     job->keep_ratio  = ( [fRatioCheck state] == NSOnState );
-    
-       fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
-    /* if the gui deinterlace settings are fast through slowest, the job->deinterlace
-     value needs to be set to one, for the job as well as the previews showing deinterlacing
-     otherwise set job->deinterlace to 0 or "off" */
-    if (fPictureFilterSettings.deinterlace > 0)
-    {
-        job->deinterlace  = 1;
-    }
-    else
-    {
-        job->deinterlace  = 0;
-    }
-    fPictureFilterSettings.denoise     = [fDenoisePopUp indexOfSelectedItem];
-    fPictureFilterSettings.vfr  = [fVFRCheck state];
-    if (fPictureFilterSettings.vfr > 0)
-    {
-        [fDetelecineCheck setState:NSOnState];
-        [fDetelecineCheck setEnabled: NO];
-    }
-    else
-    {
-        [fDetelecineCheck setEnabled: YES];
-    }
-    fPictureFilterSettings.detelecine  = [fDetelecineCheck state];
-    fPictureFilterSettings.deblock  = [fDeblockCheck state];
-    
-    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
-       
-    autoCrop = ( [fCropMatrix selectedRow] == 0 );
-    [fCropTopStepper    setEnabled: !autoCrop];
-    [fCropBottomStepper setEnabled: !autoCrop];
-    [fCropLeftStepper   setEnabled: !autoCrop];
-    [fCropRightStepper  setEnabled: !autoCrop];
-    
-    if( autoCrop )
-    {
-        memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
-    }
-    else
-    {
-        job->crop[0] = [fCropTopStepper    intValue];
-        job->crop[1] = [fCropBottomStepper intValue];
-        job->crop[2] = [fCropLeftStepper   intValue];
-        job->crop[3] = [fCropRightStepper  intValue];
-    }
-    
+
     if( job->keep_ratio )
     {
         if( sender == fWidthStepper || sender == fRatioCheck ||
@@ -363,8 +342,15 @@ are maintained across different sources */
                 hb_fix_aspect( job, HB_KEEP_WIDTH );
             }
         }
+        // hb_get_preview can't handle sizes that are larger than the original title
+        // dimensions
+        if( job->width > fTitle->width )
+            job->width = fTitle->width;
+
+        if( job->height > fTitle->height )
+            job->height = fTitle->height;
     }
-    
+
     [fWidthStepper      setIntValue: job->width];
     [fWidthField        setIntValue: job->width];
     if( [fAnamorphicPopUp indexOfSelectedItem] < 2 )
@@ -380,47 +366,67 @@ are maintained across different sources */
     [fCropLeftField     setIntValue: job->crop[2]];
     [fCropRightStepper  setIntValue: job->crop[3]];
     [fCropRightField    setIntValue: job->crop[3]];
+    
+    [fPreviewController SetTitle:fTitle];
     /* Sanity Check Here for < 16 px preview to avoid
      crashing hb_get_preview. In fact, just for kicks
      lets getting previews at a min limit of 32, since
      no human can see any meaningful detail below that */
     if (job->width >= 64 && job->height >= 64)
     {
-        // Purge the existing picture previews so they get recreated the next time
+       
+         // Purge the existing picture previews so they get recreated the next time
         // they are needed.
-        [self purgeImageCache];
-        [self displayPreview];
+        [fPreviewController purgeImageCache];
+        /* We actually call displayPreview now from pictureSliderChanged which keeps
+         * our picture preview slider in sync with the previews being shown
+         */
+
+    //[fPreviewController pictureSliderChanged:nil];
+    [self reloadStillPreview];
     }
-}
 
-- (IBAction) PreviousPicture: (id) sender
-{   
-    if( fPicture <= 0 )
+    /* we get the sizing info to display from fPreviewController */
+    [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
+
+    if (sender != nil)
     {
-        return;
-    }
-    fPicture--;
-    [self displayPreview];
+        [fHBController pictureSettingsDidChange];
+    }   
+    
 }
 
-- (IBAction) NextPicture: (id) sender
+- (NSString*) getPictureSizeInfoString
 {
-    if( fPicture >= 9 )
+    return [fSizeInfoField stringValue];
+}
+
+- (void)reloadStillPreview
+{ 
+   hb_job_t * job = fTitle->job; 
+   
+   [fPreviewController SetTitle:fTitle];
+    /* Sanity Check Here for < 16 px preview to avoid
+     crashing hb_get_preview. In fact, just for kicks
+     lets getting previews at a min limit of 32, since
+     no human can see any meaningful detail below that */
+    if (job->width >= 64 && job->height >= 64)
     {
-        return;
+       
+         // Purge the existing picture previews so they get recreated the next time
+        // they are needed.
+        [fPreviewController purgeImageCache];
+        /* We actually call displayPreview now from pictureSliderChanged which keeps
+         * our picture preview slider in sync with the previews being shown
+         */
+
+    [fPreviewController pictureSliderChanged:nil];
     }
-    fPicture++;
-    [self displayPreview];
+    
 }
 
-- (IBAction) ClosePanel: (id) sender
-{
-    if ([delegate respondsToSelector:@selector(pictureSettingsDidChange)])
-        [delegate pictureSettingsDidChange];
 
-    [NSApp endSheet:[self window]];
-    [[self window] orderOut:self];
-}
+#pragma mark -
 
 - (BOOL) autoCrop
 {
@@ -441,359 +447,12 @@ are maintained across different sources */
     allowLooseAnamorphic = setting;
 }
 
-- (int) detelecine
-{
-    return fPictureFilterSettings.detelecine;
-}
-
-- (void) setDetelecine: (int) setting
-{
-    fPictureFilterSettings.detelecine = setting;
-}
-
-- (int) vfr
-{
-    return fPictureFilterSettings.vfr;
-}
-
-- (void) setVFR: (int) setting
-{
-    fPictureFilterSettings.vfr = setting;
-}
-
-- (int) deinterlace
-{
-    return fPictureFilterSettings.deinterlace;
-}
-
-- (void) setDeinterlace: (int) setting {
-    fPictureFilterSettings.deinterlace = setting;
-}
-- (int) decomb
-{
-    return fPictureFilterSettings.decomb;
-}
-
-- (void) setDecomb: (int) setting {
-    fPictureFilterSettings.decomb = setting;
-}
-- (int) denoise
-{
-    return fPictureFilterSettings.denoise;
-}
-
-- (void) setDenoise: (int) setting
-{
-    fPictureFilterSettings.denoise = setting;
-}
-
-- (int) deblock
-{
-    return fPictureFilterSettings.deblock;
-}
-
-- (void) setDeblock: (int) setting
-{
-    fPictureFilterSettings.deblock = setting;
-}
-
-- (void)showPanelInWindow: (NSWindow *)fWindow forTitle: (hb_title_t *)title
+- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
 {
     [self SetTitle:title];
+    [self showWindow:sender];
 
-    [NSApp beginSheet:[self window]
-       modalForWindow:fWindow
-        modalDelegate:nil
-       didEndSelector:nil
-          contextInfo:NULL];
-}
-
-
-// This function converts an image created by libhb (specified via pictureIndex) into
-// an NSImage suitable for the GUI code to use. If removeBorders is YES,
-// makeImageForPicture crops the image generated by libhb stripping off the gray
-// border around the content. This is the low-level method that generates the image.
-// -imageForPicture calls this function whenever it can't find an image in its cache.
-+ (NSImage *) makeImageForPicture: (int)pictureIndex
-                libhb:(hb_handle_t*)handle
-                title:(hb_title_t*)title
-                removeBorders:(BOOL)removeBorders
-{
-    if (removeBorders)
-    {
-        //     |<---------- title->width ----------->|
-        //     |   |<---- title->job->width ---->|   |
-        //     |   |                             |   |
-        //     .......................................
-        //     ....+-----------------------------+....
-        //     ....|                             |....<-- gray border
-        //     ....|                             |....
-        //     ....|                             |....
-        //     ....|                             |<------- image
-        //     ....|                             |....
-        //     ....|                             |....
-        //     ....|                             |....
-        //     ....|                             |....
-        //     ....|                             |....
-        //     ....+-----------------------------+....
-        //     .......................................
-
-        static uint8_t * buffer;
-        static int bufferSize;
-
-        // Make sure we have a big enough buffer to receive the image from libhb. libhb
-        // creates images with a one-pixel border around the original content. Hence we
-        // add 2 pixels horizontally and vertically to the buffer size.
-        int srcWidth = title->width + 2;
-        int srcHeight= title->height + 2;
-        int newSize;
-        newSize = srcWidth * srcHeight * 4;
-        if( bufferSize < newSize )
-        {
-            bufferSize = newSize;
-            buffer     = (uint8_t *) realloc( buffer, bufferSize );
-        }
-
-        hb_get_preview( handle, title, pictureIndex, buffer );
-
-        // Create an NSBitmapImageRep and copy the libhb image into it, converting it from
-        // libhb's format to one suitable for NSImage. Along the way, we'll strip off the
-        // border around libhb's image.
-        
-        // The image data returned by hb_get_preview is 4 bytes per pixel, BGRA format.
-        // Alpha is ignored.
-        
-        int dstWidth = title->job->width;
-        int dstHeight = title->job->height;
-        NSBitmapFormat bitmapFormat = (NSBitmapFormat)NSAlphaFirstBitmapFormat;
-        NSBitmapImageRep * imgrep = [[[NSBitmapImageRep alloc]
-                initWithBitmapDataPlanes:nil
-                pixelsWide:dstWidth
-                pixelsHigh:dstHeight
-                bitsPerSample:8
-                samplesPerPixel:3   // ignore alpha
-                hasAlpha:NO
-                isPlanar:NO
-                colorSpaceName:NSCalibratedRGBColorSpace
-                bitmapFormat:bitmapFormat
-                bytesPerRow:dstWidth * 4
-                bitsPerPixel:32] autorelease];
-
-        int borderTop = (srcHeight - dstHeight) / 2;
-        int borderLeft = (srcWidth - dstWidth) / 2;
-        
-        UInt32 * src = (UInt32 *)buffer;
-        UInt32 * dst = (UInt32 *)[imgrep bitmapData];
-        src += borderTop * srcWidth;    // skip top rows in src to get to first row of dst
-        src += borderLeft;              // skip left pixels in src to get to first pixel of dst
-        for (int r = 0; r < dstHeight; r++)
-        {
-            for (int c = 0; c < dstWidth; c++)
-#if TARGET_RT_LITTLE_ENDIAN
-                *dst++ = Endian32_Swap(*src++);
-#else
-                *dst++ = *src++;
-#endif
-            src += (srcWidth - dstWidth);   // skip to next row in src
-        }
-
-        NSImage * img = [[[NSImage alloc] initWithSize: NSMakeSize(dstWidth, dstHeight)] autorelease];
-        [img addRepresentation:imgrep];
-
-        return img;
-    }
-    else
-    {
-        // Make sure we have big enough buffer
-        static uint8_t * buffer;
-        static int bufferSize;
-
-        int newSize;
-        newSize = ( title->width + 2 ) * (title->height + 2 ) * 4;
-        if( bufferSize < newSize )
-        {
-            bufferSize = newSize;
-            buffer     = (uint8_t *) realloc( buffer, bufferSize );
-        }
-
-        hb_get_preview( handle, title, pictureIndex, buffer );
-
-        // The image data returned by hb_get_preview is 4 bytes per pixel, BGRA format.
-        // We'll copy that into an NSImage swapping it to ARGB in the process. Alpha is
-        // ignored.
-        int width = title->width + 2;      // hblib adds a one-pixel border to the image
-        int height = title->height + 2;
-        int numPixels = width * height;
-        NSBitmapFormat bitmapFormat = (NSBitmapFormat)NSAlphaFirstBitmapFormat;
-        NSBitmapImageRep * imgrep = [[[NSBitmapImageRep alloc]
-                initWithBitmapDataPlanes:nil
-                pixelsWide:width
-                pixelsHigh:height
-                bitsPerSample:8
-                samplesPerPixel:3   // ignore alpha
-                hasAlpha:NO
-                isPlanar:NO
-                colorSpaceName:NSCalibratedRGBColorSpace
-                bitmapFormat:bitmapFormat
-                bytesPerRow:width * 4
-                bitsPerPixel:32] autorelease];
-
-        UInt32 * src = (UInt32 *)buffer;
-        UInt32 * dst = (UInt32 *)[imgrep bitmapData];
-        for (int i = 0; i < numPixels; i++)
-#if TARGET_RT_LITTLE_ENDIAN
-            *dst++ = Endian32_Swap(*src++);
-#else
-            *dst++ = *src++;
-#endif
-
-        NSImage * img = [[[NSImage alloc] initWithSize: NSMakeSize(width, height)] autorelease];
-        [img addRepresentation:imgrep];
-
-        return img;
-    }
-}
-
-// Returns the preview image for the specified index, retrieving it from its internal
-// cache or by calling makeImageForPicture if it is not cached. Generally, you should
-// use imageForPicture so that images are cached. Calling makeImageForPicture will
-// always generate a new copy of the image.
-- (NSImage *) imageForPicture: (int) pictureIndex
-{
-    // The preview for the specified index may not currently exist, so this method
-    // generates it if necessary.
-    NSString * key = [NSString stringWithFormat:@"%d", pictureIndex];
-    NSImage * theImage = [fPicturePreviews objectForKey:key];
-    if (!theImage)
-    {
-        theImage = [PictureController makeImageForPicture:pictureIndex libhb:fHandle title:fTitle removeBorders: NO];
-        [fPicturePreviews setObject:theImage forKey:key];
-    }
-    return theImage;
-}
-
-// Purges all images from the cache. The next call to imageForPicture will cause a new
-// image to be generated.
-- (void) purgeImageCache
-{
-    [fPicturePreviews removeAllObjects];
 }
 
 @end
 
-@implementation PictureController (Private)
-
-//
-// -[PictureController(Private) optimalViewSizeForImageSize:]
-//
-// Given the size of the preview image to be shown, returns the best possible
-// size for the OpenGL view.
-//
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize
-{
-    // The min size is 320x240
-    float minWidth = 320.0;
-    float minHeight = 240.0;
-
-    // The max size of the view is when the sheet is taking up 85% of the screen.
-    NSSize screenSize = [[NSScreen mainScreen] frame].size;
-    NSSize sheetSize = [[self window] frame].size;
-    NSSize viewAreaSize = [fPictureViewArea frame].size;
-    float paddingX = sheetSize.width - viewAreaSize.width;
-    float paddingY = sheetSize.height - viewAreaSize.height;
-    float maxWidth = (0.85 * screenSize.width) - paddingX;
-    float maxHeight = (0.85 * screenSize.height) - paddingY;
-    
-    NSSize resultSize = imageSize;
-    
-    // Its better to have a view that's too small than a view that's too big, so
-    // apply the maximum constraints last.
-    if( resultSize.width < minWidth )
-    {
-        resultSize.height *= (minWidth / resultSize.width);
-        resultSize.width = minWidth;
-    }
-    if( resultSize.height < minHeight )
-    {
-        resultSize.width *= (minHeight / resultSize.height);
-        resultSize.height = minHeight;
-    }
-    if( resultSize.width > maxWidth )
-    {
-        resultSize.height *= (maxWidth / resultSize.width);
-        resultSize.width = maxWidth;
-    }
-    if( resultSize.height > maxHeight )
-    {
-        resultSize.width *= (maxHeight / resultSize.height);
-        resultSize.height = maxHeight;
-    }
-    
-    return resultSize;
-}
-
-//
-// -[PictureController(Private) resizePanelForViewSize:animate:]
-//
-// Resizes the entire sheet to accomodate an OpenGL view of a particular size.
-//
-- (void)resizeSheetForViewSize: (NSSize)viewSize
-{
-    // Figure out the deltas for the new frame area
-    NSSize currentSize = [fPictureViewArea frame].size;
-    float deltaX = viewSize.width - currentSize.width;
-    float deltaY = viewSize.height - currentSize.height;
-
-    // Now resize the whole panel by those same deltas, but don't exceed the min
-    NSRect frame = [[self window] frame];
-    NSSize maxSize = [[self window] maxSize];
-    NSSize minSize = [[self window] minSize];
-    frame.size.width += deltaX;
-    frame.size.height += deltaY;
-    if( frame.size.width < minSize.width )
-    {
-        frame.size.width = minSize.width;
-    }
-    if( frame.size.height < minSize.height )
-    {
-        frame.size.height = minSize.height;
-    }
-
-    // But now the sheet is off-center, so also shift the origin to center it and
-    // keep the top aligned.
-    frame.origin.x -= (deltaX / 2.0);
-    frame.origin.y -= deltaY;
-
-    [[self window] setFrame:frame display:YES animate:YES];
-}
-
-//
-// -[PictureController(Private) setViewSize:]
-//
-// Changes the OpenGL view's size and centers it vertially inside of its area.
-// Assumes resizeSheetForViewSize: has already been called.
-//
-- (void)setViewSize: (NSSize)viewSize
-{
-    [fPictureView setFrameSize:viewSize];
-    
-    // center it vertically
-    NSPoint origin = [fPictureViewArea frame].origin;
-    origin.y += ([fPictureViewArea frame].size.height -
-                 [fPictureView frame].size.height) / 2.0;
-    [fPictureView setFrameOrigin:origin];
-}
-
-//
-// -[PictureController(Private) viewNeedsToResizeToSize:]
-//
-// Returns YES if the view will need to resize to match the given size.
-//
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize
-{
-    NSSize viewSize = [fPictureView frame].size;
-    return (newSize.width != viewSize.width || newSize.height != viewSize.height);
-}
-
-
-@end