X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FController.h;h=07a027231276073b31a7e4effd5c9578f7365c4e;hb=f35d39f9adca67471b72f3e47398855d51481f87;hp=cfabdda437e8014056f4ae6e4fd54afa20bb10cc;hpb=4c3425016762f89a8170d77cfe36e90beafcb4d3;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/Controller.h b/macosx/Controller.h index cfabdda4..07a02723 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -10,8 +10,8 @@ #include "hb.h" #import "ChapterTitles.h" +#import "HBSubtitles.h" #import "PictureController.h" -#import "HBFilterController.h" #import "HBPreviewController.h" #import "HBQueueController.h" #import "HBAdvancedController.h" @@ -19,7 +19,6 @@ #import "HBPresets.h" @class HBOutputPanelController; -@class PictureFilterController; /* We subclass NSView so that our drags show both the icon as well as PresetName columns */ @interface HBPresetsOutlineView : NSOutlineView @@ -32,6 +31,7 @@ BOOL fIsDragging; @interface HBController : NSObject { + NSImage * fApplicationIcon; IBOutlet NSWindow * fWindow; /* Main Menu Outlets */ @@ -44,11 +44,11 @@ BOOL fIsDragging; IBOutlet NSTextField * fScanSrcTitleNumField; IBOutlet NSButton * fScanSrcTitleCancelButton; IBOutlet NSButton * fScanSrcTitleOpenButton; + /* Picture Settings */ PictureController * fPictureController; - /* Picture Filters */ - PictureFilterController * fPictureFilterController; + /* Picture Preview */ PreviewController * fPreviewController; @@ -71,6 +71,12 @@ BOOL fIsDragging; IBOutlet NSTextField * fSrcDVD2Field; IBOutlet NSTextField * fSrcTitleField; IBOutlet NSPopUpButton * fSrcTitlePopUp; + + + /* lib dvd nav specific */ + IBOutlet NSTextField * fSrcAngleLabel; + IBOutlet NSPopUpButton * fSrcAnglePopUp; + IBOutlet NSTextField * fSrcChapterField; IBOutlet NSPopUpButton * fSrcChapterStartPopUp; IBOutlet NSTextField * fSrcChapterToField; @@ -99,6 +105,8 @@ BOOL fIsDragging; IBOutlet NSTextField * fVidEncoderField; IBOutlet NSPopUpButton * fVidEncoderPopUp; IBOutlet NSTextField * fVidQualityField; + IBOutlet NSTextField * fVidQualityRFLabel; + IBOutlet NSTextField * fVidQualityRFField; IBOutlet NSMatrix * fVidQualityMatrix; IBOutlet NSButtonCell * fVidTargetCell; IBOutlet NSTextField * fVidTargetSizeField; @@ -109,32 +117,12 @@ BOOL fIsDragging; IBOutlet NSButton * fVidTwoPassCheck; IBOutlet NSButton * fVidTurboPassCheck; - /* Picture Settings box */ - IBOutlet NSTextField * fPicLabelSettings; - IBOutlet NSTextField * fPicLabelSrc; - IBOutlet NSTextField * fPicSettingsSrc; - IBOutlet NSTextField * fPicLabelOutp; - IBOutlet NSTextField * fPicSettingsOutp; - IBOutlet NSTextField * fPicLabelAnamorphic; - IBOutlet NSTextField * fPicSettingsAnamorphic; - - IBOutlet NSTextField * fPicLabelAr; - IBOutlet NSTextField * fPicLabelAutoCrop; - IBOutlet NSTextField * fPicLabelDetelecine; - IBOutlet NSTextField * fPicLabelDeinterlace; - IBOutlet NSTextField * fPicLabelDecomb; - IBOutlet NSTextField * fPicLabelDenoise; - IBOutlet NSTextField * fPicLabelDeblock; - IBOutlet NSTextField * fPicSettingDeinterlace; - IBOutlet NSTextField * fPicSettingDecomb; - IBOutlet NSTextField * fPicSettingARkeep; - IBOutlet NSTextField * fPicSettingPAR; - IBOutlet NSTextField * fPicSettingAutoCrop; - IBOutlet NSTextField * fPicSettingDetelecine; - IBOutlet NSTextField * fPicSettingDenoise; - IBOutlet NSTextField * fPicSettingDeblock; - IBOutlet NSTextField * fPicLabelGrayscale; - IBOutlet NSTextField * fPicSettingGrayscale; + /* Status read out fileds for picture sizing */ + IBOutlet NSTextField * fPictureSizeField; + IBOutlet NSTextField * fPictureCroppingField; + + /* Status read out fileds for video filters */ + IBOutlet NSTextField * fVideoFiltersField; /* Picture variables */ int PicOrigOutputWidth; @@ -147,6 +135,12 @@ BOOL fIsDragging; IBOutlet NSTextField * fSubField; IBOutlet NSPopUpButton * fSubPopUp; IBOutlet NSButton * fSubForcedCheck; + + + IBOutlet NSTableView * fSubtitlesTable; + HBSubtitles * fSubtitlesDelegate; + IBOutlet NSButton * fBrowseSrtFileButton; + /* Audio box */ /* Track Labels */ @@ -240,7 +234,8 @@ BOOL fIsDragging; NSMutableDictionary *presetUserDefaultParentParent; int presetCurrentBuiltInCount; // keeps track of the current number of built in presets IBOutlet NSPanel * fAddPresetPanel; - /* new NSOutline View for the presets */ + + /* NSOutline View for the presets */ NSArray *fDraggedNodes; IBOutlet HBPresetsOutlineView * fPresetsOutlineView; IBOutlet NSButton * fPresetsAdd; @@ -249,6 +244,7 @@ BOOL fIsDragging; hb_handle_t * fHandle; + /* Queue variables */ hb_handle_t * fQueueEncodeLibhb; // libhb for HB Encoding hb_title_t * fTitle; hb_title_t * fQueueEncodeTitle; @@ -268,8 +264,13 @@ BOOL fIsDragging; BOOL applyQueueToScan; NSString * currentSource; NSString * browsedSourceDisplayName; + + double dockIconProgress; } -- (void) writeToActivityLog:(char *) format, ...; + +- (IBAction) showAboutPanel:(id)sender; + +- (void) writeToActivityLog:(const char *) format, ...; - (IBAction) browseSources: (id) sender; - (void) browseSourcesDone: (NSOpenPanel *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo; @@ -297,20 +298,24 @@ BOOL fIsDragging; - (IBAction) audioTrackPopUpChanged: (id) sender; - (IBAction) audioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse; - (IBAction) audioTrackMixdownChanged: (id) sender; -- (IBAction) subtitleSelectionChanged: (id) sender; - (void) prepareJob; - (IBAction) browseFile: (id) sender; - (void) browseFileDone: (NSSavePanel *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo; - (IBAction) videoMatrixChanged: (id) sender; + - (IBAction) qualitySliderChanged: (id) sender; +- (void) setupQualitySlider; + - (IBAction) audioDRCSliderChanged: (id) sender; +- (IBAction) browseImportSrtFile: (id) sender; +- (void) browseImportSrtFileDone: (NSSavePanel *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; - (IBAction) showPicturePanel: (id) sender; - (void) picturePanelFullScreen; - (void) picturePanelWindowed; -- (IBAction) showFiltersPanel: (id) sender; - (IBAction) showPreviewWindow: (id) sender; - (void)pictureSettingsDidChange; - (IBAction) calculatePictureSizing: (id) sender; @@ -327,7 +332,7 @@ BOOL fIsDragging; - (IBAction)applyQueueSettings:(id)sender; - (void) removeQueueFileItem:(int) queueItemToRemove; - (void) clearQueueAllItems; -- (void)moveObjectsInQueueArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(unsigned)insertIndex; +- (void)moveObjectsInQueueArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex; - (void)getQueueStats; - (void)setQueueEncodingItemsAsPending; - (IBAction) addToQueue: (id) sender; @@ -373,10 +378,19 @@ BOOL fIsDragging; - (void)outlineView:(NSOutlineView *)fPresetsOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item; /* We use this to provide tooltips for the items in the presets outline view */ - (NSString *)outlineView:(NSOutlineView *)fPresetsOutlineView toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item mouseLocation:(NSPoint)mouseLocation; - +- (void) checkBuiltInsForUpdates; /* We use this to actually select the preset and act accordingly */ - (IBAction)selectPreset:(id)sender; +/* Export / Import Presets */ +- (IBAction) browseExportPresetFile: (id) sender; +- (void) browseExportPresetFileDone: (NSSavePanel *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; + +- (IBAction) browseImportPresetFile: (id) sender; +- (void) browseImportPresetDone: (NSSavePanel *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; + /* Manage User presets */ - (void) loadPresets; - (IBAction) customSettingUsed: (id) sender; @@ -408,6 +422,12 @@ BOOL fIsDragging; - (void) prepareJobForPreview; - (void) remindUserOfSleepOrShutdown; -- (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(unsigned)insertIndex; +- (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex; + +- (int) hbInstances; + + + + @end