X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FController.h;h=f9634abe901bbb999b1217008b1f76341fea89a7;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=87e7cd6a7a5c24985da60249e4bbcb13502b9a6d;hpb=d0e64b1ce0adb0f331422299de3cb25590927e4b;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/Controller.h b/macosx/Controller.h index 87e7cd6a..f9634abe 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -10,12 +10,19 @@ #include "hb.h" #import "ChapterTitles.h" +#import "HBSubtitles.h" #import "PictureController.h" #import "HBPreviewController.h" #import "HBQueueController.h" #import "HBAdvancedController.h" #import "HBPreferencesController.h" #import "HBPresets.h" +#import "HBAudioController.h" + +extern NSString *HBContainerChangedNotification; +extern NSString *keyContainerTag; +extern NSString *HBTitleChangedNotification; +extern NSString *keyTitleTag; @class HBOutputPanelController; @@ -30,6 +37,7 @@ BOOL fIsDragging; @interface HBController : NSObject { + NSImage * fApplicationIcon; IBOutlet NSWindow * fWindow; /* Main Menu Outlets */ @@ -70,14 +78,26 @@ BOOL fIsDragging; IBOutlet NSTextField * fSrcTitleField; IBOutlet NSPopUpButton * fSrcTitlePopUp; - /* Angle selection popup (only used for libdvdnav */ + + /* lib dvd nav specific */ IBOutlet NSTextField * fSrcAngleLabel; IBOutlet NSPopUpButton * fSrcAnglePopUp; + /* Source start and end points */ + IBOutlet NSPopUpButton * fEncodeStartStopPopUp; + /* pts based start / stop */ + IBOutlet NSTextField * fSrcTimeStartEncodingField; + IBOutlet NSTextField * fSrcTimeEndEncodingField; + /* frame based based start / stop */ + IBOutlet NSTextField * fSrcFrameStartEncodingField; + IBOutlet NSTextField * fSrcFrameEndEncodingField; + IBOutlet NSTextField * fSrcChapterField; IBOutlet NSPopUpButton * fSrcChapterStartPopUp; IBOutlet NSTextField * fSrcChapterToField; IBOutlet NSPopUpButton * fSrcChapterEndPopUp; + + /* Source duration information */ IBOutlet NSTextField * fSrcDuration1Field; IBOutlet NSTextField * fSrcDuration2Field; @@ -97,6 +117,8 @@ BOOL fIsDragging; IBOutlet NSButton * fDstMp4iPodFileCheck; /* Video box */ + IBOutlet NSButton * fFrameratePfrCheck; + IBOutlet NSTextField * fVidRateField; IBOutlet NSPopUpButton * fVidRatePopUp; IBOutlet NSTextField * fVidEncoderField; @@ -132,64 +154,21 @@ BOOL fIsDragging; IBOutlet NSTextField * fSubField; IBOutlet NSPopUpButton * fSubPopUp; IBOutlet NSButton * fSubForcedCheck; - - /* Audio box */ - /* Track Labels */ - IBOutlet NSTextField * fAudSourceLabel; - IBOutlet NSTextField * fAudCodecLabel; - IBOutlet NSTextField * fAudMixdownLabel; - IBOutlet NSTextField * fAudSamplerateLabel; - IBOutlet NSTextField * fAudBitrateLabel; - IBOutlet NSTextField * fAudDrcLabel; - - IBOutlet NSTextField * fAudTrack1Label; - IBOutlet NSTextField * fAudTrack2Label; - IBOutlet NSTextField * fAudTrack3Label; - IBOutlet NSTextField * fAudTrack4Label; - /* Source Audio PopUps */ - IBOutlet NSPopUpButton * fAudLang1PopUp; - IBOutlet NSPopUpButton * fAudLang2PopUp; - IBOutlet NSPopUpButton * fAudLang3PopUp; - IBOutlet NSPopUpButton * fAudLang4PopUp; - /* Codec Popups */ - IBOutlet NSPopUpButton * fAudTrack1CodecPopUp; - IBOutlet NSPopUpButton * fAudTrack2CodecPopUp; - IBOutlet NSPopUpButton * fAudTrack3CodecPopUp; - IBOutlet NSPopUpButton * fAudTrack4CodecPopUp; - - /* Mixdown PopUps */ - IBOutlet NSPopUpButton * fAudTrack1MixPopUp; - IBOutlet NSPopUpButton * fAudTrack2MixPopUp; - IBOutlet NSPopUpButton * fAudTrack3MixPopUp; - IBOutlet NSPopUpButton * fAudTrack4MixPopUp; - - /* Samplerate PopUps */ - IBOutlet NSPopUpButton * fAudTrack1RatePopUp; - IBOutlet NSPopUpButton * fAudTrack2RatePopUp; - IBOutlet NSPopUpButton * fAudTrack3RatePopUp; - IBOutlet NSPopUpButton * fAudTrack4RatePopUp; - - /* Bitrate PopUps */ - IBOutlet NSPopUpButton * fAudTrack1BitratePopUp; - IBOutlet NSPopUpButton * fAudTrack2BitratePopUp; - IBOutlet NSPopUpButton * fAudTrack3BitratePopUp; - IBOutlet NSPopUpButton * fAudTrack4BitratePopUp; - - /* Dynamic Range Compression */ - IBOutlet NSSlider * fAudTrack1DrcSlider; - IBOutlet NSTextField * fAudTrack1DrcField; - IBOutlet NSSlider * fAudTrack2DrcSlider; - IBOutlet NSTextField * fAudTrack2DrcField; - IBOutlet NSSlider * fAudTrack3DrcSlider; - IBOutlet NSTextField * fAudTrack3DrcField; - IBOutlet NSSlider * fAudTrack4DrcSlider; - IBOutlet NSTextField * fAudTrack4DrcField; + IBOutlet NSTableView * fSubtitlesTable; + HBSubtitles * fSubtitlesDelegate; + IBOutlet NSButton * fBrowseSrtFileButton; + /* New Audio box */ + IBOutlet HBAudioController * fAudioDelegate; + /* Chapters box */ IBOutlet NSButton * fCreateChapterMarkers; IBOutlet NSTableView * fChapterTable; + IBOutlet NSButton * fLoadChaptersButton; + IBOutlet NSButton * fSaveChaptersButton; + IBOutlet NSTableColumn * fChapterTableNameColumn; ChapterTitles * fChapterTitlesDelegate; /* Bottom */ @@ -208,6 +187,10 @@ BOOL fIsDragging; IBOutlet NSTextField * fPresetNewName; IBOutlet NSTextField * fPresetNewDesc; IBOutlet NSPopUpButton * fPresetNewPicSettingsPopUp; + IBOutlet NSTextField * fPresetNewPicWidth; + IBOutlet NSTextField * fPresetNewPicHeight; + IBOutlet NSBox * fPresetNewPicWidthHeightBox; + IBOutlet NSButton * fPresetNewPicFiltersCheck; IBOutlet NSButton * fPresetNewFolderCheck; IBOutlet NSTextField * fPresetSelectedDisplay; @@ -223,7 +206,7 @@ BOOL fIsDragging; NSMutableDictionary *presetUserDefault;// this is 2 in "Default" preset key NSMutableDictionary *presetUserDefaultParent; NSMutableDictionary *presetUserDefaultParentParent; - int presetCurrentBuiltInCount; // keeps track of the current number of built in presets + int presetCurrentBuiltInCount; // keeps track of the current number of built in presets IBOutlet NSPanel * fAddPresetPanel; /* NSOutline View for the presets */ @@ -236,7 +219,8 @@ BOOL fIsDragging; hb_handle_t * fHandle; /* Queue variables */ - hb_handle_t * fQueueEncodeLibhb; // libhb for HB Encoding + int hbInstanceNum; //stores the number of HandBrake instances currently running + hb_handle_t * fQueueEncodeLibhb; // libhb for HB Encoding hb_title_t * fTitle; hb_title_t * fQueueEncodeTitle; int fEncodingQueueItem; // corresponds to the index of fJobGroups encoding item @@ -245,6 +229,9 @@ BOOL fIsDragging; int fCanceledCount; int fWorkingCount; + int fqueueEditRescanItemNum; // queue array item to be reloaded into the main window + int pidNum; // The pid number for this instance + NSString * currentQueueEncodeNameString; /* integer to set to determine the previous state of encode 0==idle, 1==encoding, 2==cancelled*/ @@ -254,10 +241,13 @@ BOOL fIsDragging; BOOL SuccessfulScan; BOOL applyQueueToScan; NSString * currentSource; - NSString * browsedSourceDisplayName; + NSString * browsedSourceDisplayName; double dockIconProgress; + BOOL hasValidPresetSelected; } +- (int) getPidnum; +- (IBAction) showAboutPanel:(id)sender; - (void) writeToActivityLog:(const char *) format, ...; - (IBAction) browseSources: (id) sender; @@ -268,36 +258,36 @@ BOOL fIsDragging; - (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum; - (IBAction) showNewScan: (id) sender; + +- (IBAction) cancelScanning:(id)sender; + - (void) updateUI: (NSTimer *) timer; - (void) enableUI: (bool) enable; - +- (IBAction) encodeStartStopPopUpChanged: (id) sender; - (IBAction) titlePopUpChanged: (id) sender; - (IBAction) chapterPopUpChanged: (id) sender; +- (IBAction) startEndSecValueChanged: (id) sender; +- (IBAction) startEndFrameValueChanged: (id) sender; + - (IBAction) formatPopUpChanged: (id) sender; - (IBAction) videoEncoderPopUpChanged: (id) sender; - (IBAction) autoSetM4vExtension: (id) sender; - (IBAction) twoPassCheckboxChanged: (id) sender; - (IBAction) videoFrameRateChanged: (id) sender; -- (IBAction) audioAddAudioTrackCodecs: (id)sender; -- (IBAction) audioCodecsPopUpChanged: (id) sender; -- (IBAction) setEnabledStateOfAudioMixdownControls: (id) sender; -- (IBAction) addAllAudioTracksToPopUp: (id) sender; -- (IBAction) selectAudioTrackInPopUp: (id) sender searchPrefixString: (NSString *) searchPrefixString selectIndexIfNotFound: (int) selectIndexIfNotFound; -- (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; @@ -315,7 +305,11 @@ BOOL fIsDragging; - (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum; - (void) processNewQueueEncode; - (void) clearQueueEncodedItems; -- (IBAction)applyQueueSettings:(id)sender; +/* Queue Editing */ +- (IBAction)applyQueueSettingsToMainWindow:(id)sender; +- (IBAction)rescanQueueItemToMainWindow:(NSString *) scanPath scanTitleNum: (int) scanTitleNum selectedQueueItem: (int) selectedQueueItem; + + - (void) removeQueueFileItem:(int) queueItemToRemove; - (void) clearQueueAllItems; - (void)moveObjectsInQueueArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex; @@ -381,6 +375,7 @@ BOOL fIsDragging; - (void) loadPresets; - (IBAction) customSettingUsed: (id) sender; - (IBAction) showAddPresetPanel: (id) sender; +- (IBAction) addPresetPicDropdownChanged: (id) sender; - (IBAction) closeAddPresetPanel: (id) sender; - (NSDictionary *)createPreset; @@ -399,7 +394,7 @@ BOOL fIsDragging; - (IBAction)getDefaultPresets:(id)sender; -(void)sendToMetaX:(NSString *) filePath; - // Growl methods +// Growl methods - (NSDictionary *) registrationDictionaryForGrowl; -(void)showGrowlDoneNotification:(NSString *) filePath; - (IBAction)showDebugOutputPanel:(id)sender; @@ -411,5 +406,19 @@ BOOL fIsDragging; - (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex; - (int) hbInstances; + +// Chapter files methods +- (IBAction) browseForChapterFile: (id) sender; +- (void) browseForChapterFileDone: (NSOpenPanel *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; + +- (IBAction) browseForChapterFileSave: (id) sender; +- (void) browseForChapterFileSaveDone: (NSSavePanel *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; + ++ (unsigned int) maximumNumberOfAllowedAudioTracks; +@property (nonatomic, assign) BOOL hasValidPresetSelected; +- (IBAction) addAllAudioTracks: (id) sender; + @end