diff options
author | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
---|---|---|
committer | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
commit | c4a642b4648d486777af91ccc2894355df447089 (patch) | |
tree | 4ff9eee3e39a530cb649d9db43456e0ab3d712a3 /macosx/Controller.h | |
parent | ff5ed5d2a2009504f1da3cf348689a59a82b27f1 (diff) |
Merge the 5.1 branch into the trunk.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.h')
-rw-r--r-- | macosx/Controller.h | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h index 6dc4c02db..8d920d104 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -6,7 +6,7 @@ #include <Cocoa/Cocoa.h> -#include "mediafork.h" +#include "hb.h" #include "ScanController.h" #include "PictureController.h" @@ -103,6 +103,7 @@ /* Audio box */ IBOutlet NSTextField * fAudLang1Field; IBOutlet NSPopUpButton * fAudLang1PopUp; + IBOutlet NSButton * fAudLang1SurroundCheck; IBOutlet NSTextField * fAudLang2Field; IBOutlet NSPopUpButton * fAudLang2PopUp; IBOutlet NSTextField * fAudRateField; @@ -119,8 +120,28 @@ IBOutlet NSButton * fPauseButton; IBOutlet NSButton * fRipButton; + /* User Preset variables here fPresetNewPicSettingsApply*/ + + IBOutlet NSDrawer * fPresetDrawer; + IBOutlet NSTextField * fPresetNewName; + IBOutlet NSButton * fPresetNewPicSettingsApply; + IBOutlet NSTextField * fPresetSelectedDisplay; + + NSString * AppSupportDirectory; + NSString * UserPresetsFile; + NSString * x264ProfilesFile; + NSMutableArray * UserPresets; + NSMutableArray * x264Profiles; + NSMutableArray *UserPresetssortedArray; + NSMutableDictionary * chosenPreset; + + + IBOutlet NSPanel * fAddPresetPanel; + IBOutlet NSTableView * tableView; + IBOutlet NSButton * fPresetsAdd; + IBOutlet NSButton * fPresetsDelete; hb_handle_t * fHandle; - hb_title_t * fTitle; + hb_title_t * fTitle; } - (void) TranslateStrings; @@ -136,6 +157,9 @@ - (IBAction) FormatPopUpChanged: (id) sender; - (IBAction) CodecsPopUpChanged: (id) sender; - (IBAction) EncoderPopUpChanged: (id) sender; +- (IBAction) Check6ChannelAACExtraction: (id) sender; +- (IBAction) LanguagePopUpChanged: (id) sender; + - (IBAction) BrowseFile: (id) sender; - (void) BrowseFileDone: (NSSavePanel *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo; @@ -169,5 +193,28 @@ - (IBAction) OpenHomepage: (id) sender; - (IBAction) OpenForums: (id) sender; +// Preset Methods Here + +- (IBAction) ShowAddPresetPanel: (id) sender; +- (IBAction) CloseAddPresetPanel: (id) sender; +- (NSDictionary *)CreatePreset; + +- (void) savePreset; +- (IBAction)addPreset:(id)sender; +- (IBAction)insertPreset:(id)sender; +- (IBAction)deletePreset:(id)sender; +- (IBAction)tableViewSelected:(id)sender; +// NSTableDataSource methods +- (int)numberOfRowsInTableView:(NSTableView *)aTableView; +- (id)tableView:(NSTableView *)aTableView + objectValueForTableColumn:(NSTableColumn *)aTableColumn + row:(int)rowIndex; +- (void)tableView:(NSTableView *)aTableView + setObjectValue:(id)anObject + forTableColumn:(NSTableColumn *)aTableColumn + row:(int)rowIndex; + + + @end |