summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.h51
-rw-r--r--macosx/Controller.mm561
-rw-r--r--macosx/DriveDetector.m2
-rw-r--r--macosx/English.lproj/MainMenu.nib/classes.nib21
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib10
-rw-r--r--macosx/English.lproj/MainMenu.nib/keyedobjects.nibbin70086 -> 94781 bytes
-rw-r--r--macosx/ExpressController.h2
-rw-r--r--macosx/HandBrake.icnsbin0 -> 47214 bytes
-rw-r--r--macosx/HandBrake.plist36
-rw-r--r--macosx/HandBrake.xcodeproj/pri.mode11329
-rw-r--r--macosx/HandBrake.xcodeproj/pri.pbxuser209
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj (renamed from macosx/MediaFork.xcodeproj/project.pbxproj)613
-rw-r--r--macosx/MediaFork.plist36
-rw-r--r--macosx/PictureController.h2
-rw-r--r--macosx/PictureGLView.h2
-rw-r--r--macosx/PrefsController.h4
-rw-r--r--macosx/PrefsController.m85
-rw-r--r--macosx/QueueController.h2
-rw-r--r--macosx/ScanController.h2
-rwxr-xr-xmacosx/localize.sh48
20 files changed, 2600 insertions, 415 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
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 3bf5f4f4a..52431ce57 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -58,8 +58,7 @@ static int FormatSettings[3][4] =
if( ( build = hb_check_update( fHandle, &version ) ) > -1 )
{
/* Update available - tell the user */
- /* TEMPORARILY COMMENT OUT AS UPDATE CHECK IS NOT ACCURATE */
- /*
+
NSBeginInformationalAlertSheet( _( @"Update is available" ),
_( @"Go get it!" ), _( @"Discard" ), NULL, fWindow, self,
@selector( UpdateAlertDone:returnCode:contextInfo: ),
@@ -67,7 +66,7 @@ static int FormatSettings[3][4] =
_( @"HandBrake %s (build %d) is now available for download." ),
version, build] );
return;
- */
+
}
/* Show scan panel ASAP */
@@ -95,7 +94,60 @@ static int FormatSettings[3][4] =
[self TranslateStrings];
- /* Destination box */
+ /* Init User Presets .plist */
+ /* We declare the default NSFileManager into fileManager */
+ NSFileManager * fileManager = [NSFileManager defaultManager];
+ //presetPrefs = [[NSUserDefaults standardUserDefaults] retain];
+ /* we set the files and support paths here */
+ AppSupportDirectory = @"~/Library/Application Support/HandBrake";
+ AppSupportDirectory = [AppSupportDirectory stringByExpandingTildeInPath];
+
+ UserPresetsFile = @"~/Library/Application Support/HandBrake/UserPresets.plist";
+ UserPresetsFile = [UserPresetsFile stringByExpandingTildeInPath];
+
+ x264ProfilesFile = @"~/Library/Application Support/HandBrake/x264Profiles.plist";
+ x264ProfilesFile = [x264ProfilesFile stringByExpandingTildeInPath];
+ /* We check for the app support directory for media fork */
+ if ([fileManager fileExistsAtPath:AppSupportDirectory] == 0)
+ {
+ // If it doesnt exist yet, we create it here
+ [fileManager createDirectoryAtPath:AppSupportDirectory attributes:nil];
+ }
+ // We check for the presets.plist here
+
+ if ([fileManager fileExistsAtPath:UserPresetsFile] == 0)
+ {
+
+ [fileManager createFileAtPath:UserPresetsFile contents:nil attributes:nil];
+
+ }
+ // We check for the x264profiles.plist here
+
+ if ([fileManager fileExistsAtPath:x264ProfilesFile] == 0)
+ {
+
+ [fileManager createFileAtPath:x264ProfilesFile contents:nil attributes:nil];
+ }
+
+
+ UserPresetsFile = @"~/Library/Application Support/HandBrake/UserPresets.plist";
+ UserPresetsFile = [[UserPresetsFile stringByExpandingTildeInPath]retain];
+
+ UserPresets = [[NSMutableArray alloc] initWithContentsOfFile:UserPresetsFile];
+ if (nil == UserPresets)
+ {
+ UserPresets = [[NSMutableArray alloc] init];
+ }
+ /* Show/Dont Show Presets drawer upon launch based
+ on user preference DefaultPresetsDrawerShow*/
+if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow"] > 0)
+ {
+ [fPresetDrawer open];
+ }
+
+
+
+ /* Destination box*/
[fDstFormatPopUp removeAllItems];
[fDstFormatPopUp addItemWithTitle: _( @"MP4 file" )];
[fDstFormatPopUp addItemWithTitle: _( @"AVI file" )];
@@ -169,8 +221,12 @@ static int FormatSettings[3][4] =
[self EnableUI: NO];
[fPauseButton setEnabled: NO];
[fRipButton setEnabled: NO];
+
+
+
}
+
- (void) TranslateStrings
{
[fSrcDVD1Field setStringValue: _( @"DVD:" )];
@@ -316,11 +372,21 @@ static int FormatSettings[3][4] =
/* Use the dvd name in the default output field here
May want to add code to remove blank spaces for some dvd names*/
-
+ /* Check to see if the last destination has been set,use if so, if not, use Desktop */
+ if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"])
+ {
+ [fDstFile2Field setStringValue: [NSString stringWithFormat:
+ @"%@/%@.mp4", [[NSUserDefaults standardUserDefaults] stringForKey:@"LastDestinationDirectory"],[NSString
+ stringWithUTF8String: title->name]]];
+ }
+ else
+ {
[fDstFile2Field setStringValue: [NSString stringWithFormat:
@"%@/Desktop/%@.mp4", NSHomeDirectory(),[NSString
stringWithUTF8String: title->name]]];
- /* Temporarily comment out to fix title selection*/
+ }
+
+
if (longuestpri < title->hours*60*60 + title->minutes *60 + title->seconds)
{
longuestpri=title->hours*60*60 + title->minutes *60 + title->seconds;
@@ -519,7 +585,7 @@ static int FormatSettings[3][4] =
fPicSettingDeinterlaceDsply,fPicLabelSettings,fPicLabelSrc,fPicLabelOutp,
fPicLabelAr,fPicLabelDeinter,fPicLabelSrcX,fPicLabelOutputX,
fPicLabelPAROutp,fPicLabelPAROutputX,fPicSettingPARWidth,fPicSettingPARHeight,
- fPicSettingPARDsply,fPicLabelAnamorphic};
+ fPicSettingPARDsply,fPicLabelAnamorphic,tableView,fPresetsAdd,fPresetsDelete};
for( unsigned i = 0;
i < sizeof( controls ) / sizeof( NSControl * ); i++ )
@@ -535,12 +601,21 @@ static int FormatSettings[3][4] =
}
}
[controls[i] setEnabled: b];
- /* Temporarily disable Lang2 until crash is fixed */
- [fAudLang2PopUp setEnabled: NO];
- [fAudLang2Field setEnabled: NO];
-
+
}
+ /* Temporarily disable Lang2 until crash is fixed */
+ [fAudLang2PopUp setEnabled: NO];
+ [fAudLang2Field setEnabled: NO];
+
+ if (b) {
+ /* if we're enabling the interface, check if we should / should't offer 6-channel AAC extraction */
+ [self Check6ChannelAACExtraction: NULL];
+ } else {
+ /* if we're disabling the interface, turn it off */
+ [fAudLang1SurroundCheck setEnabled: NO];
+ }
+
[self VideoMatrixChanged: NULL];
}
@@ -614,7 +689,7 @@ static int FormatSettings[3][4] =
if( returnCode == NSOKButton )
{
[fDstFile2Field setStringValue: [sheet filename]];
- [self FormatPopUpChanged: NULL];
+ [self FormatPopUpChanged: NULL];
}
}
@@ -686,7 +761,7 @@ static int FormatSettings[3][4] =
Lets Deprecate Baseline Level 1.3*/
job->h264_level = 30;
job->mux = HB_MUX_IPOD;
- /* move sanity check for iPod Encoding here */
+ /* move sanity check for iPod Encoding here */
job->pixel_ratio = 0 ;
}
@@ -699,6 +774,10 @@ static int FormatSettings[3][4] =
job->crf = 1;
}
+ /* Sends x264 options to the core library*/
+ job->x264opts = strdup([[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] cString]);
+
+
job->h264_13 = [fVidEncoderPopUp indexOfSelectedItem];
}
@@ -748,6 +827,13 @@ static int FormatSettings[3][4] =
indexOfSelectedItem]].rate;
job->abitrate = hb_audio_bitrates[[fAudBitratePopUp
indexOfSelectedItem]].rate;
+ /* have we selected that 5.1 should be extracted as AAC? */
+ if (job->acodec == HB_ACODEC_FAAC && [fAudLang1SurroundCheck isEnabled] && [fAudLang1SurroundCheck state] == NSOnState) {
+ job->surround = 1;
+ } else {
+ job->surround = 0;
+ }
+
}
- (IBAction) EnableQueue: (id) sender
@@ -760,32 +846,48 @@ static int FormatSettings[3][4] =
- (IBAction) AddToQueue: (id) sender
{
- hb_list_t * list = hb_get_titles( fHandle );
- hb_title_t * title = (hb_title_t *) hb_list_item( list,
- [fSrcTitlePopUp indexOfSelectedItem] );
- hb_job_t * job = title->job;
-
- [self PrepareJob];
-
- /* Destination file */
- job->file = strdup( [[fDstFile2Field stringValue] UTF8String] );
-
- if( [fVidTwoPassCheck state] == NSOnState )
- {
- job->pass = 1;
- hb_add( fHandle, job );
- job->pass = 2;
- hb_add( fHandle, job );
- }
- else
- {
- job->pass = 0;
- hb_add( fHandle, job );
- }
+/* We get the destination directory from the destingation field here */
+ NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
+ /* We check for a valid destination here */
+ if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0)
+ {
+ NSRunAlertPanel(@"Warning!", @"This is not a valid destination directory!", @"OK", nil, nil);
+ }
+ else
+ {
+
+ hb_list_t * list = hb_get_titles( fHandle );
+ hb_title_t * title = (hb_title_t *) hb_list_item( list,
+ [fSrcTitlePopUp indexOfSelectedItem] );
+ hb_job_t * job = title->job;
+
+ [self PrepareJob];
+
+ /* Destination file */
+ job->file = strdup( [[fDstFile2Field stringValue] UTF8String] );
+
+ if( [fVidTwoPassCheck state] == NSOnState )
+ {
+ job->pass = 1;
+ hb_add( fHandle, job );
+ job->pass = 2;
+ job->x264opts = strdup([[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] cString]);
+ hb_add( fHandle, job );
+ }
+ else
+ {
+ job->pass = 0;
+ hb_add( fHandle, job );
+ }
+
+ [[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"];
+ }
}
- (IBAction) Rip: (id) sender
{
+
+
/* Rip or Cancel ? */
if( [[fRipButton title] isEqualToString: _( @"Cancel" )] )
{
@@ -795,10 +897,15 @@ static int FormatSettings[3][4] =
if( [fQueueCheck state] == NSOffState )
{
- [self AddToQueue: sender];
+
+ [self AddToQueue: sender];
+
+
+
}
- if( [[NSFileManager defaultManager] fileExistsAtPath:
+ /* We check for duplicate name here */
+ if( [[NSFileManager defaultManager] fileExistsAtPath:
[fDstFile2Field stringValue]] )
{
NSBeginCriticalAlertSheet( _( @"File already exists" ),
@@ -809,8 +916,21 @@ static int FormatSettings[3][4] =
[fDstFile2Field stringValue]] );
return;
}
+ /* We get the destination directory from the destingation field here */
+ NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
+ /* We check for a valid destination here */
+ if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0)
+ {
+ NSRunAlertPanel(@"Warning!", @"This is not a valid destination directory!", @"OK", nil, nil);
+ }
+ else
+ {
+ [[NSUserDefaults standardUserDefaults] setObject:destinationDirectory forKey:@"LastDestinationDirectory"];
+ [self _Rip];
+ }
+
+
- [self _Rip];
}
- (void) OverwriteAlertDone: (NSWindow *) sheet
@@ -844,7 +964,7 @@ static int FormatSettings[3][4] =
hb_start( fHandle );
/* Disable interface */
- [self EnableUI: NO];
+ [self EnableUI: NO];
[fPauseButton setEnabled: NO];
[fRipButton setEnabled: NO];
}
@@ -1002,6 +1122,11 @@ static int FormatSettings[3][4] =
[fAudLang2PopUp selectItemAtIndex: 0];
/* END pri */
+
+ /* changing the title may have changed the audio channels on offer, so */
+ /* check if this change means we should / should't offer 6-channel AAC extraction */
+ [self Check6ChannelAACExtraction: sender];
+
}
- (IBAction) ChapterPopUpChanged: (id) sender
@@ -1085,6 +1210,11 @@ static int FormatSettings[3][4] =
[fDstFile2Field setStringValue: [NSString stringWithFormat:
@"%@.%s", string, ext]];
}
+
+ /* changing the codecs on offer may mean that we are/aren't now offering AAC, so */
+ /* check if this change means we should / should't offer 6-channel AAC extraction */
+ [self Check6ChannelAACExtraction: sender];
+
}
- (IBAction) CodecsPopUpChanged: (id) sender
@@ -1123,14 +1253,18 @@ static int FormatSettings[3][4] =
[fAudBitratePopUp setEnabled: YES];
}
+ /* check if this change means we should / should't offer 6-channel AAC extraction */
+ [self Check6ChannelAACExtraction: sender];
+
[self CalculateBitrate: sender];
+
}
- (IBAction) EncoderPopUpChanged: (id) sender
{
/* Check to see if we need to modify the job pic values based on x264 (iPod) encoder selection */
- if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fVidEncoderPopUp indexOfSelectedItem] == 1)
+ if ([fDstFormatPopUp indexOfSelectedItem] == 0 && [fDstCodecsPopUp indexOfSelectedItem] == 1 && [fVidEncoderPopUp indexOfSelectedItem] == 1)
{
hb_job_t * job = fTitle->job;
job->pixel_ratio = 0 ;
@@ -1146,12 +1280,94 @@ static int FormatSettings[3][4] =
hb_fix_aspect( job, HB_KEEP_WIDTH );
}
+
+ /* uncheck the "export 5.1 as 6-channel AAC" checkbox if it is checked */
+ [fAudLang1SurroundCheck setState: NSOffState];
+
}
-[self CalculatePictureSizing: sender];
+ [self CalculatePictureSizing: sender];
}
+- (IBAction) Check6ChannelAACExtraction: (id) sender
+{
+
+ /* make sure we have a selected title before continuing */
+ if (fTitle == NULL) return;
+
+ /* get the current title's job into a convenience variable */
+ hb_job_t * job = fTitle->job;
+
+ /* get the current audio tracks */
+ /* this is done in PrepareJob too, but we want them here to check against below */
+ job->audios[0] = [fAudLang1PopUp indexOfSelectedItem] - 1;
+ job->audios[1] = [fAudLang2PopUp indexOfSelectedItem] - 1;
+ job->audios[2] = -1;
+
+ /* now, let's check if any selected audio track has 5.1 sound */
+ hb_audio_t * audio;
+ bool foundfiveoneaudio = false;
+
+ /* find out what the currently-selected audio codec is */
+ int format = [fDstFormatPopUp indexOfSelectedItem];
+ int codecs = [fDstCodecsPopUp indexOfSelectedItem];
+ int acodec = FormatSettings[format][codecs] & HB_ACODEC_MASK;
+
+ /* we only offer the option to extract 5.1 to 6-channel if the selected audio codec is AAC */
+ if (acodec == HB_ACODEC_FAAC) {
+
+ bool doneaudios = false;
+ int thisaudio = 0;
+
+ while (!doneaudios) {
+
+ if (job->audios[thisaudio] == -1) {
+ doneaudios = true;
+ } else {
+ audio = (hb_audio_t *) hb_list_item( fTitle->list_audio, job->audios[thisaudio] );
+ if (audio != NULL) {
+ if (audio->channels == 5 && audio->lfechannels == 1) {
+ foundfiveoneaudio = true;
+ doneaudios = true; /* as it doesn't matter if we find any more! */
+ }
+ }
+ }
+
+ thisaudio++;
+ }
+ }
+
+ /* If we are extracting to AAC, and any of our soundtracks were 5.1, then enable the checkbox */
+ if (foundfiveoneaudio) {
+ [fAudLang1SurroundCheck setEnabled: YES];
+ /* Check default surround sound pref and if it is YES, lets also check the checkbox */
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultSurroundSound"] > 0)
+ {
+ [fAudLang1SurroundCheck setState: NSOnState];
+ }
+ } else {
+ [fAudLang1SurroundCheck setEnabled: NO];
+ /* as well as disabling the checkbox, let's uncheck it if it is checked */
+ [fAudLang1SurroundCheck setState: NSOffState];
+ }
+
+}
+
+
+- (IBAction) LanguagePopUpChanged: (id) sender
+{
+
+ /* selecting a different language may mean we have a different number of channels, so */
+ /* check if this change means we should / should't offer 6-channel AAC extraction */
+ [self Check6ChannelAACExtraction: sender];
+
+ /* see if the new language setting will change the bitrate we need */
+ [self CalculateBitrate: sender];
+
+}
+
+
/* Get and Display Current Pic Settings in main window */
- (IBAction) CalculatePictureSizing: (id) sender
{
@@ -1241,6 +1457,263 @@ static int FormatSettings[3][4] =
[fVidTargetSizeField intValue] )];
}
+- (IBAction) ShowAddPresetPanel: (id) sender
+{
+ /* Show the panel */
+ [NSApp beginSheet: fAddPresetPanel modalForWindow: fWindow
+ modalDelegate: NULL didEndSelector: NULL contextInfo: NULL];
+ [NSApp runModalForWindow: fAddPresetPanel];
+ [NSApp endSheet: fAddPresetPanel];
+ [fAddPresetPanel orderOut: self];
+}
+- (IBAction) CloseAddPresetPanel: (id) sender
+{
+ [NSApp stopModal];
+}
+
+- (IBAction)addPreset:(id)sender
+{
+ [UserPresets addObject:[self CreatePreset]];
+ /* We Sort the Presets Alphabetically by name */
+ NSSortDescriptor * lastNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName"
+ ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
+ NSArray *sortDescriptors=[NSArray arrayWithObject:lastNameDescriptor];
+ NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
+ [UserPresets setArray:sortedArray];
+
+ /* We stop the modal window for the new preset */
+ [fPresetNewName setStringValue: @""];
+ [NSApp stopModal];
+ /* We Reload the New Table data for presets */
+ [tableView reloadData];
+ /* We save all of the preset data here */
+ [self savePreset];
+}
+
+- (IBAction)insertPreset:(id)sender
+{
+ int index = [tableView selectedRow];
+ [UserPresets insertObject:[self CreatePreset] atIndex:index];
+ [tableView reloadData];
+ [self savePreset];
+}
+
+- (NSDictionary *)CreatePreset
+{
+ NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+ /* Get the New Preset Name from the field in the AddPresetPanel */
+ [preset setObject:[fPresetNewName stringValue] forKey:@"PresetName"];
+ /*Get the whether or not to apply pic settings in the AddPresetPanel*/
+ [preset setObject:[NSNumber numberWithInt:[fPresetNewPicSettingsApply state]] forKey:@"UsesPictureSettings"];
+ /* File Format */
+ [preset setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
+ /* Codecs */
+ [preset setObject:[fDstCodecsPopUp titleOfSelectedItem] forKey:@"FileCodecs"];
+ /* Video encoder */
+ [preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
+ /* Video quality */
+ [preset setObject:[NSNumber numberWithInt:[fVidQualityMatrix selectedRow]] forKey:@"VideoQualityType"];
+ [preset setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"];
+ [preset setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"];
+ [preset setObject:[NSNumber numberWithFloat:[fVidQualitySlider floatValue]] forKey:@"VideoQualitySlider"];
+
+ /* Video framerate */
+ [preset setObject:[fVidRatePopUp titleOfSelectedItem] forKey:@"VideoFramerate"];
+ /* GrayScale */
+ [preset setObject:[NSNumber numberWithInt:[fVidGrayscaleCheck state]] forKey:@"VideoGrayScale"];
+ /* 2 Pass Encoding */
+ [preset setObject:[NSNumber numberWithInt:[fVidTwoPassCheck state]] forKey:@"VideoTwoPass"];
+
+ /*Picture Settings*/
+ hb_job_t * job = fTitle->job;
+ /* Basic Picture Settings */
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PictureWidth"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PictureHeight"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->deinterlace] forKey:@"PictureDeinterlace"];
+ [preset setObject:[NSNumber numberWithInt:fTitle->job->pixel_ratio] forKey:@"PicturePAR"];
+ /* Set crop settings here */
+ /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+ [preset setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[1]] forKey:@"PictureBottomCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[2]] forKey:@"PictureLeftCrop"];
+ [preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
+
+ /*Audio*/
+ /* Audio Language One*/
+ [preset setObject:[fAudLang1PopUp titleOfSelectedItem] forKey:@"AudioLang1"];
+ /* Audio Language One Surround Sound Checkbox*/
+ [preset setObject:[NSNumber numberWithInt:[fAudLang1SurroundCheck state]] forKey:@"AudioLang1Surround"];
+ /* Audio Sample Rate*/
+ [preset setObject:[fAudRatePopUp titleOfSelectedItem] forKey:@"AudioSampleRate"];
+ /* Audio Bitrate Rate*/
+ [preset setObject:[fAudBitratePopUp titleOfSelectedItem] forKey:@"AudioBitRate"];
+ /* Subtitles*/
+ [preset setObject:[fSubPopUp titleOfSelectedItem] forKey:@"Subtitles"];
+
+
+ [preset autorelease];
+ return preset;
+
+}
+
+- (IBAction)deletePreset:(id)sender
+{
+ int status;
+ NSEnumerator *enumerator;
+ NSNumber *index;
+ NSMutableArray *tempArray;
+ id tempObject;
+
+ if ( [tableView numberOfSelectedRows] == 0 )
+ return;
+ /* Alert user before deleting preset */
+ /* Comment out for now, tie to user pref eventually */
+ //NSBeep();
+ status = NSRunAlertPanel(@"Warning!", @"Are you sure that you want to delete the selected preset?", @"OK", @"Cancel", nil);
+
+ if ( status == NSAlertDefaultReturn ) {
+ enumerator = [tableView selectedRowEnumerator];
+ tempArray = [NSMutableArray array];
+
+ while ( (index = [enumerator nextObject]) ) {
+ tempObject = [UserPresets objectAtIndex:[index intValue]];
+ [tempArray addObject:tempObject];
+ }
+
+ [UserPresets removeObjectsInArray:tempArray];
+ [tableView reloadData];
+ [self savePreset];
+ }
+}
+- (IBAction)tableViewSelected:(id)sender
+{
+
+ /* we get the chosen preset from the UserPresets array */
+ chosenPreset = [UserPresets objectAtIndex:[sender selectedRow]];
+ /* we set the preset display field in main window here */
+ //[fPresetSelectedDisplay setStringValue: [NSString stringWithFormat: @"%@", [chosenPreset valueForKey:@"PresetName"]]];
+ /* File Format */
+ [fDstFormatPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"FileFormat"]]];
+ [self FormatPopUpChanged: NULL];
+ /* Codecs */
+ [fDstCodecsPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"FileCodecs"]]];
+ [self CodecsPopUpChanged: NULL];
+ /* Video encoder */
+ [fVidEncoderPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoEncoder"]]];
+ /* Lets run through the following functions to get variables set there */
+ [self EncoderPopUpChanged: sender];
+ [self Check6ChannelAACExtraction: sender];
+ [self CalculateBitrate: sender];
+
+ /* Video quality */
+ [fVidQualityMatrix selectCellAtRow:[[chosenPreset objectForKey:@"VideoQualityType"] intValue] column:0];
+
+ [fVidTargetSizeField setStringValue: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoTargetSize"]]];
+ [fVidBitrateField setStringValue: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoAvgBitrate"]]];
+
+ [fVidQualitySlider setFloatValue: [[chosenPreset valueForKey:@"VideoQualitySlider"] floatValue]];
+ [self VideoMatrixChanged: sender];
+
+ /* Video framerate */
+ [fVidRatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"VideoFramerate"]]];
+
+ /* GrayScale */
+ [fVidGrayscaleCheck setState:[[chosenPreset objectForKey:@"VideoGrayScale"] intValue]];
+
+ /* 2 Pass Encoding */
+ [fVidTwoPassCheck setState:[[chosenPreset objectForKey:@"VideoTwoPass"] intValue]];
+
+
+ /*Audio*/
+ /* Audio Language One*/
+ [fAudLang1PopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioLang1"]]];
+ /* Audio Language One Surround Sound Checkbox*/
+ [fAudLang1SurroundCheck setState:[[chosenPreset objectForKey:@"AudioLang1Surround"] intValue]];
+ [self Check6ChannelAACExtraction: sender];
+ /* Audio Sample Rate*/
+ [fAudRatePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioSampleRate"]]];
+ /* Audio Bitrate Rate*/
+ [fAudBitratePopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"AudioBitRate"]]];
+ /*Subtitles*/
+ [fSubPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Subtitles"]]];
+
+ /* Picture Settings */
+ /* Look to see if we apply these here in objectForKey:@"UsesPictureSettings"] */
+ if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] == 1)
+ {
+ hb_job_t * job = fTitle->job;
+ job->width = [[chosenPreset objectForKey:@"PictureWidth"] intValue];
+ job->height = [[chosenPreset objectForKey:@"PictureHeight"] intValue];
+ job->keep_ratio = [[chosenPreset objectForKey:@"PictureKeepRatio"] intValue];
+ if (job->keep_ratio == 1)
+ {
+ hb_fix_aspect( job, HB_KEEP_WIDTH );
+ }
+ job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
+ job->crop[0] = [[chosenPreset objectForKey:@"PictureTopCrop"] intValue];
+ job->crop[1] = [[chosenPreset objectForKey:@"PictureBottomCrop"] intValue];
+ job->crop[2] = [[chosenPreset objectForKey:@"PictureLeftCrop"] intValue];
+ job->crop[3] = [[chosenPreset objectForKey:@"PictureRightCrop"] intValue];
+ [self CalculatePictureSizing: sender];
+ }
+
+ // Deselect the currently selected table //
+ //[tableView deselectRow:[tableView selectedRow]];
+}
+
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return [UserPresets count];
+}
+
+- (id)tableView:(NSTableView *)aTableView
+ objectValueForTableColumn:(NSTableColumn *)aTableColumn
+ row:(int)rowIndex
+{
+
+
+
+ id theRecord, theValue;
+
+ theRecord = [UserPresets objectAtIndex:rowIndex];
+ theValue = [theRecord objectForKey:[aTableColumn identifier]];
+
+ return theValue;
+}
+
+// NSTableDataSource method that we implement to edit values directly in the table...
+- (void)tableView:(NSTableView *)aTableView
+ setObjectValue:(id)anObject
+ forTableColumn:(NSTableColumn *)aTableColumn
+ row:(int)rowIndex
+{
+ id theRecord;
+
+ theRecord = [UserPresets objectAtIndex:rowIndex];
+ [theRecord setObject:anObject forKey:[aTableColumn identifier]];
+
+ /* We Sort the Presets Alphabetically by name */
+ NSSortDescriptor * lastNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName"
+ ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
+ NSArray *sortDescriptors=[NSArray arrayWithObject:lastNameDescriptor];
+ NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
+ [UserPresets setArray:sortedArray];
+ /* We Reload the New Table data for presets */
+ [tableView reloadData];
+ /* We save all of the preset data here */
+ [self savePreset];
+}
+
+
+- (void)savePreset
+{
+ [UserPresets writeToFile:UserPresetsFile atomically:YES];
+
+}
+
+
+
- (void) controlTextDidBeginEditing: (NSNotification *) notification
{
[self CalculateBitrate: NULL];
@@ -1259,13 +1732,15 @@ static int FormatSettings[3][4] =
- (IBAction) OpenHomepage: (id) sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL
- URLWithString:@"http://mediafork.dynalias.com/"]];
+ URLWithString:@"http://handbrake.m0k.org/"]];
}
- (IBAction) OpenForums: (id) sender
{
[[NSWorkspace sharedWorkspace] openURL: [NSURL
- URLWithString:@"http://mediafork.dynalias.com/forum/"]];
+ URLWithString:@"http://handbrake.m0k.org/forum/"]];
}
+
+
@end
diff --git a/macosx/DriveDetector.m b/macosx/DriveDetector.m
index e9e941569..61f722960 100644
--- a/macosx/DriveDetector.m
+++ b/macosx/DriveDetector.m
@@ -11,7 +11,7 @@
#include <IOKit/storage/IODVDMedia.h>
#include "DriveDetector.h"
-#include "mediafork.h"
+#include "hb.h"
@interface DriveDetector (Private)
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index ec791480a..2b248aded 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -7,29 +7,38 @@
CalculateBitrate = id;
Cancel = id;
ChapterPopUpChanged = id;
+ CloseAddPresetPanel = id;
CodecsPopUpChanged = id;
EnableQueue = id;
EncoderPopUpChanged = id;
FormatPopUpChanged = id;
+ InsertPreset = id;
+ LanguagePopUpChanged = id;
OpenForums = id;
OpenHomepage = id;
Pause = id;
QualitySliderChanged = id;
Rip = id;
+ ShowAddPresetPanel = id;
ShowPicturePanel = id;
ShowQueuePanel = id;
ShowScanPanel = id;
TitlePopUpChanged = id;
VideoMatrixChanged = id;
+ addPreset = id;
+ deletePreset = id;
+ tableViewSelected = id;
};
CLASS = HBController;
LANGUAGE = ObjC;
OUTLETS = {
- fAddToQuButton = NSButton;
+ fAddPresetPanel = NSPanel;
+ fAddToQuButton = NSTableView;
fAudBitrateField = NSTextField;
fAudBitratePopUp = NSPopUpButton;
fAudLang1Field = NSTextField;
fAudLang1PopUp = NSPopUpButton;
+ fAudLang1SurroundCheck = NSButton;
fAudLang2Field = NSTextField;
fAudLang2PopUp = NSPopUpButton;
fAudRateField = NSTextField;
@@ -67,6 +76,12 @@
fPictureButton = NSButton;
fPictureController = PictureController;
fPicturePanel = NSPanel;
+ fPresetDrawer = NSDrawer;
+ fPresetNewName = NSTextField;
+ fPresetNewPicSettingsApply = NSButton;
+ fPresetSelectedDisplay = NSTextField;
+ fPresetsAdd = NSButton;
+ fPresetsDelete = NSButton;
fQueueAddButton = NSButton;
fQueueCheck = NSButton;
fQueueController = QueueController;
@@ -105,6 +120,7 @@
fVidTargetSizeField = NSTextField;
fVidTwoPassCheck = NSButton;
fWindow = NSWindow;
+ tableView = NSTableView;
};
SUPERCLASS = NSObject;
},
@@ -167,10 +183,13 @@
CLASS = PrefsController;
LANGUAGE = ObjC;
OUTLETS = {
+ fDefAdvancedx264FlagsView = NSButton;
+ fDefAudioSurround = NSButton;
fDefCrf = NSButton;
fDefDeinterlace = NSButton;
fDefPicSizeAutoSetipod = NSButton;
fDefPixelRatio = NSButton;
+ fDefPresetDrawerShow = id;
fFileExtItunes = NSButton;
fPanel = NSPanel;
fUpdateCheck = NSButton;
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index eae7265dc..64beae6c9 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,11 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>74 141 555 411 0 0 1440 878 </string>
+ <string>25 277 630 601 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
+ <key>1843</key>
+ <string>610 276 220 592 0 0 1440 878 </string>
<key>29</key>
- <string>69 330 258 44 0 0 1440 878 </string>
+ <string>102 834 300 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -17,8 +19,8 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>1438</integer>
- <integer>21</integer>
+ <integer>29</integer>
+ <integer>1843</integer>
</array>
<key>IBSystem Version</key>
<string>8L127</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 9f9c43bb3..7bfb8416d 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
Binary files differ
diff --git a/macosx/ExpressController.h b/macosx/ExpressController.h
index f1e0d1904..5841f4e1f 100644
--- a/macosx/ExpressController.h
+++ b/macosx/ExpressController.h
@@ -1,7 +1,7 @@
/* ExpressController */
#import <Cocoa/Cocoa.h>
-#import "mediafork.h"
+#import "hb.h"
@class DriveDetector;
diff --git a/macosx/HandBrake.icns b/macosx/HandBrake.icns
new file mode 100644
index 000000000..f81352be3
--- /dev/null
+++ b/macosx/HandBrake.icns
Binary files differ
diff --git a/macosx/HandBrake.plist b/macosx/HandBrake.plist
new file mode 100644
index 000000000..4a4b36cd2
--- /dev/null
+++ b/macosx/HandBrake.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDisplayName</key>
+ <string>HandBrake</string>
+ <key>CFBundleExecutable</key>
+ <string>HandBrake</string>
+ <key>CFBundleGetInfoString</key>
+ <string>0.8.0b1</string>
+ <key>CFBundleIconFile</key>
+ <string>HandBrake</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.m0k.handbrake</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>HandBrake</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>0.8.0b2</string>
+ <key>CFBundleSignature</key>
+ <string>HB##</string>
+ <key>CFBundleVersion</key>
+ <string>2007022200</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>HandBrake Devs</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
diff --git a/macosx/HandBrake.xcodeproj/pri.mode1 b/macosx/HandBrake.xcodeproj/pri.mode1
new file mode 100644
index 000000000..385113e71
--- /dev/null
+++ b/macosx/HandBrake.xcodeproj/pri.mode1
@@ -0,0 +1,1329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>ActivePerspectiveName</key>
+ <string>Project</string>
+ <key>AllowedModules</key>
+ <array>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Name</key>
+ <string>Groups and Files Outline View</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Name</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCTaskListModule</string>
+ <key>Name</key>
+ <string>Task List</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Name</key>
+ <string>File and Smart Group Detail Viewer</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXBuildResultsModule</string>
+ <key>Name</key>
+ <string>Detailed Build Results Viewer</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXProjectFindModule</string>
+ <key>Name</key>
+ <string>Project Batch Find Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXRunSessionModule</string>
+ <key>Name</key>
+ <string>Run Log</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXBookmarksModule</string>
+ <key>Name</key>
+ <string>Bookmarks Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXClassBrowserModule</string>
+ <key>Name</key>
+ <string>Class Browser</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXCVSModule</string>
+ <key>Name</key>
+ <string>Source Code Control Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXDebugBreakpointsModule</string>
+ <key>Name</key>
+ <string>Debug Breakpoints Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>XCDockableInspector</string>
+ <key>Name</key>
+ <string>Inspector</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>n</string>
+ <key>Module</key>
+ <string>PBXOpenQuicklyModule</string>
+ <key>Name</key>
+ <string>Open Quickly Tool</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXDebugSessionModule</string>
+ <key>Name</key>
+ <string>Debugger</string>
+ </dict>
+ <dict>
+ <key>BundleLoadPath</key>
+ <string></string>
+ <key>MaxInstances</key>
+ <string>1</string>
+ <key>Module</key>
+ <string>PBXDebugCLIModule</string>
+ <key>Name</key>
+ <string>Debug Console</string>
+ </dict>
+ </array>
+ <key>Description</key>
+ <string>DefaultDescriptionKey</string>
+ <key>DockingSystemVisible</key>
+ <false/>
+ <key>Extension</key>
+ <string>mode1</string>
+ <key>FavBarConfig</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>0DFA5C670B8DD17A0020BC09</string>
+ <key>XCBarModuleItemNames</key>
+ <dict/>
+ <key>XCBarModuleItems</key>
+ <array/>
+ </dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
+ <key>Identifier</key>
+ <string>com.apple.perspectives.project.mode1</string>
+ <key>MajorVersion</key>
+ <integer>31</integer>
+ <key>MinorVersion</key>
+ <integer>1</integer>
+ <key>Name</key>
+ <string>Default</string>
+ <key>Notifications</key>
+ <array/>
+ <key>OpenEditors</key>
+ <array/>
+ <key>PerspectiveWidths</key>
+ <array>
+ <integer>-1</integer>
+ <integer>-1</integer>
+ </array>
+ <key>Perspectives</key>
+ <array>
+ <dict>
+ <key>ChosenToolbarItems</key>
+ <array>
+ <string>active-target-popup</string>
+ <string>active-buildstyle-popup</string>
+ <string>action</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>buildOrClean</string>
+ <string>build-and-runOrDebug</string>
+ <string>com.apple.ide.PBXToolbarStopButton</string>
+ <string>get-info</string>
+ <string>toggle-editor</string>
+ <string>NSToolbarFlexibleSpaceItem</string>
+ <string>com.apple.pbx.toolbar.searchfield</string>
+ </array>
+ <key>ControllerClassBaseName</key>
+ <string></string>
+ <key>IconName</key>
+ <string>WindowOfProjectWithEditor</string>
+ <key>Identifier</key>
+ <string>perspective.project</string>
+ <key>IsVertical</key>
+ <false/>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <true/>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FAAC04509CD000000102</string>
+ <string>1C08E77C0454961000C914BD</string>
+ <string>1C37FABC05509CD000000102</string>
+ <string>1C37FABC05539CD112110102</string>
+ <string>E2644B35053B69B200211256</string>
+ <string>1C37FABC04509CD000100104</string>
+ <string>1CC0EA4004350EF90044410B</string>
+ <string>1CC0EA4004350EF90041110B</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>yes</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>186</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>29B97314FDCFA39411CA2CEA</string>
+ <string>526FBC940B4CAA310064E04C</string>
+ <string>526FBC8D0B4CA9F90064E04C</string>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FABC05509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {186, 802}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <true/>
+ <key>XCSharingToken</key>
+ <string>com.apple.Xcode.GFSharingToken</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {203, 820}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>186</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>273 167 1118 861 0 0 1680 1028 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>203pt</string>
+ </dict>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20306471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>MyNewFile14.java</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20406471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>MyNewFile14.java</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {910, 0}}</string>
+ <key>RubberWindowFrame</key>
+ <string>273 167 1118 861 0 0 1680 1028 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>0pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B20506471E060097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Detail</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 5}, {910, 815}}</string>
+ <key>RubberWindowFrame</key>
+ <string>273 167 1118 861 0 0 1680 1028 </string>
+ </dict>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Proportion</key>
+ <string>815pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>910pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Project</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>XCModuleDock</string>
+ <string>PBXSmartGroupTreeModule</string>
+ <string>XCModuleDock</string>
+ <string>PBXNavigatorGroup</string>
+ <string>XCDetailModule</string>
+ </array>
+ <key>TableOfContents</key>
+ <array>
+ <string>0D3065750B9030CE0049CCA4</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>0D3065760B9030CE0049CCA4</string>
+ <string>1CE0B20306471E060097A5F4</string>
+ <string>1CE0B20506471E060097A5F4</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.default</string>
+ </dict>
+ <dict>
+ <key>ControllerClassBaseName</key>
+ <string></string>
+ <key>IconName</key>
+ <string>WindowOfProject</string>
+ <key>Identifier</key>
+ <string>perspective.morph</string>
+ <key>IsVertical</key>
+ <integer>0</integer>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FAAC04509CD000000102</string>
+ <string>1C08E77C0454961000C914BD</string>
+ <string>1C37FABC05509CD000000102</string>
+ <string>1C37FABC05539CD112110102</string>
+ <string>E2644B35053B69B200211256</string>
+ <string>1C37FABC04509CD000100104</string>
+ <string>1CC0EA4004350EF90044410B</string>
+ <string>1CC0EA4004350EF90041110B</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>11E0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>yes</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>186</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>29B97314FDCFA39411CA2CEA</string>
+ <string>1C37FABC05509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {186, 337}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <integer>1</integer>
+ <key>XCSharingToken</key>
+ <string>com.apple.Xcode.GFSharingToken</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {203, 355}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>186</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>373 269 690 397 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Morph</string>
+ <key>PreferredWidth</key>
+ <integer>300</integer>
+ <key>ServiceClasses</key>
+ <array>
+ <string>XCModuleDock</string>
+ <string>PBXSmartGroupTreeModule</string>
+ </array>
+ <key>TableOfContents</key>
+ <array>
+ <string>11E0B1FE06471DED0097A5F4</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.default.short</string>
+ </dict>
+ </array>
+ <key>PerspectivesBarVisible</key>
+ <false/>
+ <key>ShelfIsVisible</key>
+ <false/>
+ <key>SourceDescription</key>
+ <string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
+ <key>StatusbarIsVisible</key>
+ <true/>
+ <key>TimeStamp</key>
+ <real>0.0</real>
+ <key>ToolbarDisplayMode</key>
+ <integer>1</integer>
+ <key>ToolbarIsVisible</key>
+ <true/>
+ <key>ToolbarSizeMode</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Perspectives</string>
+ <key>UpdateMessage</key>
+ <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
+ <key>WindowJustification</key>
+ <integer>5</integer>
+ <key>WindowOrderList</key>
+ <array>
+ <string>/Users/pri/Desktop/HB/macosx/HandBrake.xcodeproj</string>
+ </array>
+ <key>WindowString</key>
+ <string>273 167 1118 861 0 0 1680 1028 </string>
+ <key>WindowTools</key>
+ <array>
+ <dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
+ <key>Identifier</key>
+ <string>windowTool.build</string>
+ <key>IsVertical</key>
+ <true/>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <true/>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528F0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>declpcm.c</string>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {1003, 419}}</string>
+ <key>RubberWindowFrame</key>
+ <string>500 275 1003 701 0 0 1680 1028 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>419pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>XCMainBuildResultsModuleGUID</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Build</string>
+ <key>XCBuildResultsTrigger_Collapse</key>
+ <integer>1021</integer>
+ <key>XCBuildResultsTrigger_Open</key>
+ <integer>1011</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 424}, {1003, 236}}</string>
+ <key>RubberWindowFrame</key>
+ <string>500 275 1003 701 0 0 1680 1028 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXBuildResultsModule</string>
+ <key>Proportion</key>
+ <string>236pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>660pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Build Results</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXBuildResultsModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <true/>
+ <key>TableOfContents</key>
+ <array>
+ <string>0DFA5CFA0B8DD7CF0020BC09</string>
+ <string>0DFA5CFB0B8DD7CF0020BC09</string>
+ <string>1CD0528F0623707200166675</string>
+ <string>XCMainBuildResultsModuleGUID</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.build</string>
+ <key>WindowString</key>
+ <string>500 275 1003 701 0 0 1680 1028 </string>
+ <key>WindowToolGUID</key>
+ <string>0DFA5CFA0B8DD7CF0020BC09</string>
+ <key>WindowToolIsVisible</key>
+ <false/>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debugger</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>Debugger</key>
+ <dict>
+ <key>HorizontalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {317, 164}}</string>
+ <string>{{317, 0}, {377, 164}}</string>
+ </array>
+ </dict>
+ <key>VerticalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {694, 164}}</string>
+ <string>{{0, 164}, {694, 216}}</string>
+ </array>
+ </dict>
+ </dict>
+ <key>LauncherConfigVersion</key>
+ <string>8</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C162984064C10D400B95A72</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Debug - GLUTExamples (Underwater)</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>DebugConsoleDrawerSize</key>
+ <string>{100, 120}</string>
+ <key>DebugConsoleVisible</key>
+ <string>None</string>
+ <key>DebugConsoleWindowFrame</key>
+ <string>{{200, 200}, {500, 300}}</string>
+ <key>DebugSTDIOWindowFrame</key>
+ <string>{{200, 200}, {500, 300}}</string>
+ <key>Frame</key>
+ <string>{{0, 0}, {694, 380}}</string>
+ <key>RubberWindowFrame</key>
+ <string>321 238 694 422 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXDebugSessionModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debugger</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXDebugSessionModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <string>1C0AD2AB069F1E9B00FABCE6</string>
+ <string>1C162984064C10D400B95A72</string>
+ <string>1C0AD2AC069F1E9B00FABCE6</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.debug</string>
+ <key>WindowString</key>
+ <string>321 238 694 422 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.find</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CDD528C0622207200134675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>&lt;No Editor&gt;</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528D0623707200166675</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <integer>1</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {781, 167}}</string>
+ <key>RubberWindowFrame</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>781pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>50%</string>
+ </dict>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528E0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Project Find</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{8, 0}, {773, 254}}</string>
+ <key>RubberWindowFrame</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXProjectFindModule</string>
+ <key>Proportion</key>
+ <string>50%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>428pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Project Find</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXProjectFindModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <string>1C530D58069F1CE1000CFCEE</string>
+ <string>1C530D59069F1CE1000CFCEE</string>
+ <string>1CDD528C0622207200134675</string>
+ <string>1C530D5A069F1CE1000CFCEE</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>1CD0528E0623707200166675</string>
+ </array>
+ <key>WindowString</key>
+ <string>62 385 781 470 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1C530D57069F1CE1000CFCEE</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>MENUSEPARATOR</string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debuggerConsole</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAAC065D492600B07095</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Debugger Console</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {440, 358}}</string>
+ <key>RubberWindowFrame</key>
+ <string>650 41 440 400 0 0 1280 1002 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXDebugCLIModule</string>
+ <key>Proportion</key>
+ <string>358pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>358pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debugger Console</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXDebugCLIModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C78EAAD065D492600B07095</string>
+ <string>1C78EAAE065D492600B07095</string>
+ <string>1C78EAAC065D492600B07095</string>
+ </array>
+ <key>WindowString</key>
+ <string>650 41 440 400 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.run</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>LauncherConfigVersion</key>
+ <string>3</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD0528B0623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Run</string>
+ <key>Runner</key>
+ <dict>
+ <key>HorizontalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {493, 167}}</string>
+ <string>{{0, 176}, {493, 267}}</string>
+ </array>
+ </dict>
+ <key>VerticalSplitView</key>
+ <dict>
+ <key>_collapsingFrameDimension</key>
+ <real>0.0</real>
+ <key>_indexOfCollapsedView</key>
+ <integer>0</integer>
+ <key>_percentageOfCollapsedView</key>
+ <real>0.0</real>
+ <key>isCollapsed</key>
+ <string>yes</string>
+ <key>sizes</key>
+ <array>
+ <string>{{0, 0}, {405, 443}}</string>
+ <string>{{414, 0}, {514, 443}}</string>
+ </array>
+ </dict>
+ </dict>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {460, 159}}</string>
+ <key>RubberWindowFrame</key>
+ <string>316 696 459 200 0 0 1280 1002 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXRunSessionModule</string>
+ <key>Proportion</key>
+ <string>159pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>159pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Run Log</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXRunSessionModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C0AD2B3069F1EA900FABCE6</string>
+ <string>1C0AD2B4069F1EA900FABCE6</string>
+ <string>1CD0528B0623707200166675</string>
+ <string>1C0AD2B5069F1EA900FABCE6</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.run</string>
+ <key>WindowString</key>
+ <string>316 696 459 200 0 0 1280 1002 </string>
+ <key>WindowToolGUID</key>
+ <string>1C0AD2B3069F1EA900FABCE6</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.scm</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAB2065D492600B07095</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>&lt;No Editor&gt;</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1C78EAB3065D492600B07095</string>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <integer>1</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {452, 0}}</string>
+ <key>RubberWindowFrame</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>0pt</string>
+ </dict>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CD052920623707200166675</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>SCM</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>ConsoleFrame</key>
+ <string>{{0, 259}, {452, 0}}</string>
+ <key>Frame</key>
+ <string>{{0, 7}, {452, 259}}</string>
+ <key>RubberWindowFrame</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ <key>TableConfiguration</key>
+ <array>
+ <string>Status</string>
+ <real>30</real>
+ <string>FileName</string>
+ <real>199</real>
+ <string>Path</string>
+ <real>197.09500122070312</real>
+ </array>
+ <key>TableFrame</key>
+ <string>{{0, 0}, {452, 250}}</string>
+ </dict>
+ <key>Module</key>
+ <string>PBXCVSModule</string>
+ <key>Proportion</key>
+ <string>262pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>266pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>SCM</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXCVSModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C78EAB4065D492600B07095</string>
+ <string>1C78EAB5065D492600B07095</string>
+ <string>1C78EAB2065D492600B07095</string>
+ <string>1CD052920623707200166675</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.scm</string>
+ <key>WindowString</key>
+ <string>743 379 452 308 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.breakpoints</string>
+ <key>IsVertical</key>
+ <integer>0</integer>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXBottomSmartGroupGIDs</key>
+ <array>
+ <string>1C77FABC04509CD000000102</string>
+ </array>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Files</string>
+ <key>PBXProjectStructureProvided</key>
+ <string>no</string>
+ <key>PBXSmartGroupTreeModuleColumnData</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
+ <array>
+ <real>168</real>
+ </array>
+ <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
+ <array>
+ <string>MainColumn</string>
+ </array>
+ </dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
+ <dict>
+ <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
+ <array>
+ <string>1C77FABC04509CD000000102</string>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
+ <array>
+ <array>
+ <integer>0</integer>
+ </array>
+ </array>
+ <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
+ <string>{{0, 0}, {168, 350}}</string>
+ </dict>
+ <key>PBXTopSmartGroupGIDs</key>
+ <array/>
+ <key>XCIncludePerspectivesSwitch</key>
+ <integer>0</integer>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 0}, {185, 368}}</string>
+ <key>GroupTreeTableConfiguration</key>
+ <array>
+ <string>MainColumn</string>
+ <real>168</real>
+ </array>
+ <key>RubberWindowFrame</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXSmartGroupTreeModule</string>
+ <key>Proportion</key>
+ <string>185pt</string>
+ </dict>
+ <dict>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CA1AED706398EBD00589147</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Detail</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{190, 0}, {554, 368}}</string>
+ <key>RubberWindowFrame</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>XCDetailModule</string>
+ <key>Proportion</key>
+ <string>554pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>368pt</string>
+ </dict>
+ </array>
+ <key>MajorVersion</key>
+ <integer>2</integer>
+ <key>MinorVersion</key>
+ <integer>0</integer>
+ <key>Name</key>
+ <string>Breakpoints</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXSmartGroupTreeModule</string>
+ <string>XCDetailModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1CDDB66807F98D9800BB5817</string>
+ <string>1CDDB66907F98D9800BB5817</string>
+ <string>1CE0B1FE06471DED0097A5F4</string>
+ <string>1CA1AED706398EBD00589147</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.breakpoints</string>
+ <key>WindowString</key>
+ <string>315 424 744 409 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1CDDB66807F98D9800BB5817</string>
+ <key>WindowToolIsVisible</key>
+ <integer>1</integer>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.debugAnimator</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Module</key>
+ <string>PBXNavigatorGroup</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Debug Visualizer</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXNavigatorGroup</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>1</integer>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.debugAnimator</string>
+ <key>WindowString</key>
+ <string>100 100 700 500 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.bookmarks</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>Module</key>
+ <string>PBXBookmarksModule</string>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>100%</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Bookmarks</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXBookmarksModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>0</integer>
+ <key>WindowString</key>
+ <string>538 42 401 187 0 0 1280 1002 </string>
+ </dict>
+ <dict>
+ <key>Identifier</key>
+ <string>windowTool.classBrowser</string>
+ <key>Layout</key>
+ <array>
+ <dict>
+ <key>Dock</key>
+ <array>
+ <dict>
+ <key>BecomeActive</key>
+ <integer>1</integer>
+ <key>ContentConfiguration</key>
+ <dict>
+ <key>OptionsSetName</key>
+ <string>Hierarchy, all classes</string>
+ <key>PBXProjectModuleGUID</key>
+ <string>1CA6456E063B45B4001379D8</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>Class Browser - NSObject</string>
+ </dict>
+ <key>GeometryConfiguration</key>
+ <dict>
+ <key>ClassesFrame</key>
+ <string>{{0, 0}, {374, 96}}</string>
+ <key>ClassesTreeTableConfiguration</key>
+ <array>
+ <string>PBXClassNameColumnIdentifier</string>
+ <real>208</real>
+ <string>PBXClassBookColumnIdentifier</string>
+ <real>22</real>
+ </array>
+ <key>Frame</key>
+ <string>{{0, 0}, {630, 331}}</string>
+ <key>MembersFrame</key>
+ <string>{{0, 105}, {374, 395}}</string>
+ <key>MembersTreeTableConfiguration</key>
+ <array>
+ <string>PBXMemberTypeIconColumnIdentifier</string>
+ <real>22</real>
+ <string>PBXMemberNameColumnIdentifier</string>
+ <real>216</real>
+ <string>PBXMemberTypeColumnIdentifier</string>
+ <real>97</real>
+ <string>PBXMemberBookColumnIdentifier</string>
+ <real>22</real>
+ </array>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <integer>1</integer>
+ <key>RubberWindowFrame</key>
+ <string>385 179 630 352 0 0 1440 878 </string>
+ </dict>
+ <key>Module</key>
+ <string>PBXClassBrowserModule</string>
+ <key>Proportion</key>
+ <string>332pt</string>
+ </dict>
+ </array>
+ <key>Proportion</key>
+ <string>332pt</string>
+ </dict>
+ </array>
+ <key>Name</key>
+ <string>Class Browser</string>
+ <key>ServiceClasses</key>
+ <array>
+ <string>PBXClassBrowserModule</string>
+ </array>
+ <key>StatusbarIsVisible</key>
+ <integer>0</integer>
+ <key>TableOfContents</key>
+ <array>
+ <string>1C0AD2AF069F1E9B00FABCE6</string>
+ <string>1C0AD2B0069F1E9B00FABCE6</string>
+ <string>1CA6456E063B45B4001379D8</string>
+ </array>
+ <key>ToolbarConfiguration</key>
+ <string>xcode.toolbar.config.classbrowser</string>
+ <key>WindowString</key>
+ <string>385 179 630 352 0 0 1440 878 </string>
+ <key>WindowToolGUID</key>
+ <string>1C0AD2AF069F1E9B00FABCE6</string>
+ <key>WindowToolIsVisible</key>
+ <integer>0</integer>
+ </dict>
+ </array>
+</dict>
+</plist>
diff --git a/macosx/HandBrake.xcodeproj/pri.pbxuser b/macosx/HandBrake.xcodeproj/pri.pbxuser
new file mode 100644
index 000000000..d6247b7c6
--- /dev/null
+++ b/macosx/HandBrake.xcodeproj/pri.pbxuser
@@ -0,0 +1,209 @@
+// !$*UTF8*$!
+{
+ 0D096DFE0B707D1200A845D4 /* libhb dlib */ = {
+ activeExec = 0;
+ };
+ 0DFA5C560B8DD1760020BC09 /* HandBrake */ = {
+ isa = PBXExecutable;
+ activeArgIndex = 2147483647;
+ activeArgIndices = (
+ );
+ argumentStrings = (
+ );
+ autoAttachOnCrash = 1;
+ configStateDict = {
+ };
+ customDataFormattersEnabled = 1;
+ debuggerPlugin = GDBDebugging;
+ disassemblyDisplayState = 0;
+ enableDebugStr = 1;
+ environmentEntries = (
+ );
+ executableSystemSymbolLevel = 0;
+ executableUserSymbolLevel = 0;
+ libgmallocEnabled = 0;
+ name = HandBrake;
+ sourceDirectories = (
+ );
+ };
+ 0DFA5C570B8DD1760020BC09 /* Instant HandBrake */ = {
+ isa = PBXExecutable;
+ activeArgIndex = 2147483647;
+ activeArgIndices = (
+ );
+ argumentStrings = (
+ );
+ autoAttachOnCrash = 1;
+ configStateDict = {
+ };
+ customDataFormattersEnabled = 1;
+ debuggerPlugin = GDBDebugging;
+ disassemblyDisplayState = 0;
+ dylibVariantSuffix = "";
+ enableDebugStr = 1;
+ environmentEntries = (
+ );
+ executableSystemSymbolLevel = 0;
+ executableUserSymbolLevel = 0;
+ libgmallocEnabled = 0;
+ name = "Instant HandBrake";
+ sourceDirectories = (
+ );
+ };
+ 0DFA5C580B8DD1760020BC09 /* HandBrakeCLI */ = {
+ isa = PBXExecutable;
+ activeArgIndex = 2147483647;
+ activeArgIndices = (
+ );
+ argumentStrings = (
+ );
+ autoAttachOnCrash = 1;
+ configStateDict = {
+ };
+ customDataFormattersEnabled = 1;
+ debuggerPlugin = GDBDebugging;
+ disassemblyDisplayState = 0;
+ enableDebugStr = 1;
+ environmentEntries = (
+ );
+ executableSystemSymbolLevel = 0;
+ executableUserSymbolLevel = 0;
+ libgmallocEnabled = 0;
+ name = HandBrakeCLI;
+ sourceDirectories = (
+ );
+ };
+ 0DFA5C680B8DD17A0020BC09 /* Source Control */ = {
+ isa = PBXSourceControlManager;
+ fallbackIsa = XCSourceControlManager;
+ isSCMEnabled = 0;
+ scmConfiguration = {
+ };
+ scmType = "";
+ };
+ 0DFA5C690B8DD17A0020BC09 /* Code sense */ = {
+ isa = PBXCodeSenseManager;
+ indexTemplatePath = "";
+ };
+ 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {962, 1274}}";
+ sepNavSelRange = "{441, 18}";
+ sepNavVisRect = "{{0, 0}, {962, 387}}";
+ };
+ };
+ 0DFA5D0E0B8DD9FB0020BC09 /* XCBreakpointsBucket */ = {
+ isa = XCBreakpointsBucket;
+ name = "Project Breakpoints";
+ objects = (
+ );
+ };
+ 0DFF0B710B6BC6E600549488 /* libhb */ = {
+ activeExec = 0;
+ };
+ 0DFF0C090B6BCEC200549488 /* HandBrakeCLI */ = {
+ activeExec = 0;
+ executables = (
+ 0DFA5C580B8DD1760020BC09 /* HandBrakeCLI */,
+ );
+ };
+ 29B97313FDCFA39411CA2CEA /* Project object */ = {
+ activeBuildConfigurationName = UB;
+ activeExecutable = 0DFA5C570B8DD1760020BC09 /* Instant HandBrake */;
+ activeTarget = 0D096DFE0B707D1200A845D4 /* libhb dlib */;
+ addToTargets = (
+ 4DD93F8D082036E8008E1322 /* HandBrake */,
+ );
+ breakpointsGroup = 0DFA5D0E0B8DD9FB0020BC09 /* XCBreakpointsBucket */;
+ codeSenseManager = 0DFA5C690B8DD17A0020BC09 /* Code sense */;
+ executables = (
+ 0DFA5C560B8DD1760020BC09 /* HandBrake */,
+ 0DFA5C570B8DD1760020BC09 /* Instant HandBrake */,
+ 0DFA5C580B8DD1760020BC09 /* HandBrakeCLI */,
+ );
+ perUserDictionary = {
+ PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+ PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+ PBXFileTableDataSourceColumnWidthsKey = (
+ 20,
+ 671,
+ 20,
+ 48,
+ 43,
+ 43,
+ 20,
+ );
+ PBXFileTableDataSourceColumnsKey = (
+ PBXFileDataSource_FiletypeID,
+ PBXFileDataSource_Filename_ColumnID,
+ PBXFileDataSource_Built_ColumnID,
+ PBXFileDataSource_ObjectSize_ColumnID,
+ PBXFileDataSource_Errors_ColumnID,
+ PBXFileDataSource_Warnings_ColumnID,
+ PBXFileDataSource_Target_ColumnID,
+ );
+ };
+ PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
+ PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+ PBXFileTableDataSourceColumnWidthsKey = (
+ 20,
+ 200,
+ 491,
+ 20,
+ 48,
+ 43,
+ 43,
+ );
+ PBXFileTableDataSourceColumnsKey = (
+ PBXFileDataSource_FiletypeID,
+ PBXFileDataSource_Filename_ColumnID,
+ PBXTargetDataSource_PrimaryAttribute,
+ PBXFileDataSource_Built_ColumnID,
+ PBXFileDataSource_ObjectSize_ColumnID,
+ PBXFileDataSource_Errors_ColumnID,
+ PBXFileDataSource_Warnings_ColumnID,
+ );
+ };
+ PBXPerProjectTemplateStateSaveDate = 193999038;
+ PBXWorkspaceStateSaveDate = 193999038;
+ };
+ sourceControlManager = 0DFA5C680B8DD17A0020BC09 /* Source Control */;
+ userBuildSettings = {
+ };
+ };
+ 4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */ = {
+ activeExec = 0;
+ executables = (
+ 0DFA5C570B8DD1760020BC09 /* Instant HandBrake */,
+ );
+ };
+ 4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {962, 784}}";
+ sepNavSelRange = "{49, 15}";
+ sepNavVisRect = "{{0, 0}, {962, 387}}";
+ };
+ };
+ 4DD93F8D082036E8008E1322 /* HandBrake */ = {
+ activeExec = 0;
+ executables = (
+ 0DFA5C560B8DD1760020BC09 /* HandBrake */,
+ );
+ };
+ 4DF3C8CB052889CD00A80101 /* Controller.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {459, 3038}}";
+ sepNavSelRange = "{7915, 0}";
+ sepNavVisRect = "{{0, 0}, {459, 186}}";
+ };
+ };
+ 526FBC760B4CA8F40064E04C /* test.c */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {962, 13230}}";
+ sepNavSelRange = "{322, 16}";
+ sepNavVisRect = "{{0, 0}, {962, 387}}";
+ };
+ };
+}
diff --git a/macosx/MediaFork.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 2a1819d02..5dc600ac4 100644
--- a/macosx/MediaFork.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -10,62 +10,64 @@
0D096E010B707D3400A845D4 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
0D096E020B707D3400A845D4 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
0D096E030B707D3400A845D4 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
- 0D096E040B707D3400A845D4 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9F0B4CAB100064E04C /* declpcm.c */; };
- 0D096E050B707D3400A845D4 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA00B4CAB100064E04C /* decmpeg2.c */; };
- 0D096E060B707D3400A845D4 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA10B4CAB100064E04C /* decsub.c */; };
- 0D096E070B707D3400A845D4 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA20B4CAB100064E04C /* demuxmpeg.c */; };
- 0D096E080B707D3400A845D4 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA30B4CAB100064E04C /* dvd.c */; };
- 0D096E090B707D3400A845D4 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA40B4CAB100064E04C /* encavcodec.c */; };
- 0D096E0A0B707D3400A845D4 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA50B4CAB100064E04C /* encfaac.c */; };
- 0D096E0B0B707D3400A845D4 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA60B4CAB100064E04C /* enclame.c */; };
- 0D096E0C0B707D3400A845D4 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA70B4CAB100064E04C /* encvorbis.c */; };
- 0D096E0D0B707D3400A845D4 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA80B4CAB100064E04C /* encx264.c */; };
- 0D096E0E0B707D3400A845D4 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA90B4CAB100064E04C /* encxvid.c */; };
- 0D096E0F0B707D3400A845D4 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAA0B4CAB100064E04C /* fifo.c */; };
- 0D096E100B707D3400A845D4 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAE0B4CAB100064E04C /* muxavi.c */; };
- 0D096E110B707D3400A845D4 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAF0B4CAB100064E04C /* muxcommon.c */; };
- 0D096E120B707D3400A845D4 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB00B4CAB100064E04C /* muxmp4.c */; };
- 0D096E130B707D3400A845D4 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB10B4CAB100064E04C /* muxogm.c */; };
- 0D096E140B707D3400A845D4 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB20B4CAB100064E04C /* ports.c */; };
- 0D096E150B707D3400A845D4 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB40B4CAB100064E04C /* reader.c */; };
- 0D096E160B707D3400A845D4 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB50B4CAB100064E04C /* render.c */; };
- 0D096E170B707D3400A845D4 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB60B4CAB100064E04C /* scan.c */; };
- 0D096E180B707D3400A845D4 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB70B4CAB100064E04C /* sync.c */; };
- 0D096E190B707D3400A845D4 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB80B4CAB100064E04C /* update.c */; };
- 0D096E1A0B707D3400A845D4 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB90B4CAB100064E04C /* work.c */; };
0D096EA30B70884A00A845D4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
- 0D75EDC00B6FF9DA0090EA86 /* MediaFork.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D118405053054CD00C39CA9 /* MediaFork.icns */; };
- 0D9C5CE50B77E85B00828855 /* mediafork.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C5CE40B77E85B00828855 /* mediafork.c */; };
- 0D9C5CE60B77E85B00828855 /* mediafork.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D9C5CE40B77E85B00828855 /* mediafork.c */; };
- 0DF377430B7BEACA00115CB0 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DF377420B7BEACA00115CB0 /* ipodutil.cpp */; };
- 0DF377440B7BEACA00115CB0 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DF377420B7BEACA00115CB0 /* ipodutil.cpp */; };
0DF377980B7BF99A00115CB0 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DF377970B7BF99A00115CB0 /* fakexcode.cpp */; };
+ 0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
+ 0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
+ 0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
+ 0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
+ 0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
+ 0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
+ 0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
+ 0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
+ 0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
+ 0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
+ 0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
+ 0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
+ 0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
+ 0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
+ 0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
+ 0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
+ 0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
+ 0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
+ 0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
+ 0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
+ 0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
+ 0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
+ 0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
+ 0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
+ 0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
+ 0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
+ 0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
+ 0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
+ 0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
+ 0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
+ 0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
+ 0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
+ 0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
+ 0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
+ 0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
+ 0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
+ 0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
+ 0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
+ 0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
+ 0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
+ 0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
+ 0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
+ 0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
+ 0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
+ 0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
+ 0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
+ 0DFA5CED0B8DD4210020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
+ 0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
+ 0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
+ 0DFA5CF00B8DD4210020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
+ 0DFA5CF10B8DD4210020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
+ 0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
+ 0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5D060B8DD9040020BC09 /* HandBrake.plist */; };
0DFF0B770B6BC72A00549488 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
0DFF0B790B6BC72A00549488 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
- 0DFF0B7B0B6BC72A00549488 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9F0B4CAB100064E04C /* declpcm.c */; };
- 0DFF0B7C0B6BC72A00549488 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA00B4CAB100064E04C /* decmpeg2.c */; };
- 0DFF0B7D0B6BC72A00549488 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA10B4CAB100064E04C /* decsub.c */; };
- 0DFF0B7E0B6BC72A00549488 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA20B4CAB100064E04C /* demuxmpeg.c */; };
- 0DFF0B7F0B6BC72A00549488 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA30B4CAB100064E04C /* dvd.c */; };
- 0DFF0B800B6BC72A00549488 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA40B4CAB100064E04C /* encavcodec.c */; };
- 0DFF0B810B6BC72A00549488 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA50B4CAB100064E04C /* encfaac.c */; };
- 0DFF0B820B6BC72A00549488 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA60B4CAB100064E04C /* enclame.c */; };
- 0DFF0B830B6BC72A00549488 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA70B4CAB100064E04C /* encvorbis.c */; };
- 0DFF0B840B6BC72A00549488 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA80B4CAB100064E04C /* encx264.c */; };
- 0DFF0B850B6BC72A00549488 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCA90B4CAB100064E04C /* encxvid.c */; };
- 0DFF0B860B6BC72A00549488 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAA0B4CAB100064E04C /* fifo.c */; };
- 0DFF0B8B0B6BC72A00549488 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAE0B4CAB100064E04C /* muxavi.c */; };
- 0DFF0B8C0B6BC72A00549488 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCAF0B4CAB100064E04C /* muxcommon.c */; };
- 0DFF0B8D0B6BC72A00549488 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB00B4CAB100064E04C /* muxmp4.c */; };
- 0DFF0B8E0B6BC72A00549488 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB10B4CAB100064E04C /* muxogm.c */; };
- 0DFF0B8F0B6BC72A00549488 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB20B4CAB100064E04C /* ports.c */; };
- 0DFF0B910B6BC72A00549488 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB40B4CAB100064E04C /* reader.c */; };
- 0DFF0B920B6BC72A00549488 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB50B4CAB100064E04C /* render.c */; };
- 0DFF0B930B6BC72A00549488 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB60B4CAB100064E04C /* scan.c */; };
- 0DFF0B940B6BC72A00549488 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB70B4CAB100064E04C /* sync.c */; };
- 0DFF0B950B6BC72A00549488 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB80B4CAB100064E04C /* update.c */; };
- 0DFF0B960B6BC72A00549488 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBCB90B4CAB100064E04C /* work.c */; };
0DFF0C100B6BCEE800549488 /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC760B4CA8F40064E04C /* test.c */; };
4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
@@ -86,7 +88,6 @@
4DD93F94082036E8008E1322 /* PrefsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DE93A3507F5A2C900F3C78F /* PrefsController.h */; };
4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
- 4DD93F98082036E8008E1322 /* MediaFork.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D118405053054CD00C39CA9 /* MediaFork.icns */; };
4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; };
4DD93F9C082036E8008E1322 /* PictureGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D85758E052B78E300C39CA9 /* PictureGLView.mm */; };
@@ -97,7 +98,6 @@
4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */; };
- 4DE09E63082038A400FB751F /* MediaFork.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DE09E62082038A400FB751F /* MediaFork.plist */; };
52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA2DC0993B01000FDC1A2 /* Express.plist */; };
/* End PBXBuildFile section */
@@ -128,21 +128,45 @@
/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- 0D096DFF0B707D1200A845D4 /* libmediafork.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmediafork.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
- 0D6E35760B6BD4F0005AABB3 /* MediaFork.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MediaFork.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 0D9C5CE40B77E85B00828855 /* mediafork.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mediafork.c; path = ../libmediafork/mediafork.c; sourceTree = SOURCE_ROOT; };
- 0DF377420B7BEACA00115CB0 /* ipodutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ipodutil.cpp; path = ../libmediafork/ipodutil.cpp; sourceTree = SOURCE_ROOT; };
+ 0D096DFF0B707D1200A845D4 /* libhb.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libhb.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
0DF377970B7BF99A00115CB0 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
- 0DFF0B720B6BC6E600549488 /* libmediafork.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmediafork.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 0DFF0C0A0B6BCEC200549488 /* MediaForkCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MediaForkCLI; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
+ 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../libhb/declpcm.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decmpeg2.c; path = ../libhb/decmpeg2.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C800B8DD3B60020BC09 /* decsub.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decsub.c; path = ../libhb/decsub.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = demuxmpeg.c; path = ../libhb/demuxmpeg.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C820B8DD3B60020BC09 /* dvd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dvd.c; path = ../libhb/dvd.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encavcodec.c; path = ../libhb/encavcodec.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C840B8DD3B60020BC09 /* encfaac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encfaac.c; path = ../libhb/encfaac.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C850B8DD3B60020BC09 /* enclame.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = enclame.c; path = ../libhb/enclame.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encvorbis.c; path = ../libhb/encvorbis.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C870B8DD3B60020BC09 /* encx264.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encx264.c; path = ../libhb/encx264.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C880B8DD3B60020BC09 /* encxvid.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encxvid.c; path = ../libhb/encxvid.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C890B8DD3B60020BC09 /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../libhb/fifo.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C8A0B8DD3B60020BC09 /* hb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hb.c; path = ../libhb/hb.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ipodutil.cpp; path = ../libhb/ipodutil.cpp; sourceTree = SOURCE_ROOT; };
+ 0DFA5C910B8DD3B60020BC09 /* muxavi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxavi.c; path = ../libhb/muxavi.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxcommon.c; path = ../libhb/muxcommon.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmp4.c; path = ../libhb/muxmp4.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C940B8DD3B60020BC09 /* muxogm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxogm.c; path = ../libhb/muxogm.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C950B8DD3B60020BC09 /* ports.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ports.c; path = ../libhb/ports.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C970B8DD3B60020BC09 /* reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = reader.c; path = ../libhb/reader.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C980B8DD3B60020BC09 /* render.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = render.c; path = ../libhb/render.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C990B8DD3B60020BC09 /* scan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scan.c; path = ../libhb/scan.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C9A0B8DD3B60020BC09 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../libhb/sync.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C9B0B8DD3B60020BC09 /* update.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = update.c; path = ../libhb/update.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5C9C0B8DD3B60020BC09 /* work.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = work.c; path = ../libhb/work.c; sourceTree = SOURCE_ROOT; };
+ 0DFA5D060B8DD9040020BC09 /* HandBrake.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = HandBrake.plist; sourceTree = "<group>"; };
+ 0DFF0B720B6BC6E600549488 /* libhb.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
- 4D118405053054CD00C39CA9 /* MediaFork.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = MediaFork.icns; sourceTree = "<group>"; };
- 4D1EA2DA0993B01000FDC1A2 /* Instant MediaFork.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Instant MediaFork.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Instant HandBrake.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = "<group>"; };
4D1EA3000993B13700FDC1A2 /* Express.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Express.nib; path = English.lproj/Express.nib; sourceTree = "<group>"; };
4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExpressController.h; sourceTree = "<group>"; };
@@ -160,39 +184,15 @@
4DD27BA507C0065C0023D231 /* QueueController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QueueController.h; sourceTree = "<group>"; };
4DD27BA607C0065C0023D231 /* QueueController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = QueueController.mm; sourceTree = "<group>"; };
4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
- 4DE09E62082038A400FB751F /* MediaFork.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = MediaFork.plist; sourceTree = "<group>"; };
4DE93A3507F5A2C900F3C78F /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefsController.h; sourceTree = "<group>"; };
4DE93A3607F5A2C900F3C78F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefsController.m; sourceTree = "<group>"; };
4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
4DF3C8CC052889CD00A80101 /* Controller.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = Controller.mm; sourceTree = "<group>"; };
526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; };
- 526FBC9B0B4CAB100064E04C /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../libmediafork/common.c; sourceTree = SOURCE_ROOT; };
- 526FBC9D0B4CAB100064E04C /* deca52.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deca52.c; path = ../libmediafork/deca52.c; sourceTree = SOURCE_ROOT; };
- 526FBC9E0B4CAB100064E04C /* decavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decavcodec.c; path = ../libmediafork/decavcodec.c; sourceTree = SOURCE_ROOT; };
- 526FBC9F0B4CAB100064E04C /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../libmediafork/declpcm.c; sourceTree = SOURCE_ROOT; };
- 526FBCA00B4CAB100064E04C /* decmpeg2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decmpeg2.c; path = ../libmediafork/decmpeg2.c; sourceTree = SOURCE_ROOT; };
- 526FBCA10B4CAB100064E04C /* decsub.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decsub.c; path = ../libmediafork/decsub.c; sourceTree = SOURCE_ROOT; };
- 526FBCA20B4CAB100064E04C /* demuxmpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = demuxmpeg.c; path = ../libmediafork/demuxmpeg.c; sourceTree = SOURCE_ROOT; };
- 526FBCA30B4CAB100064E04C /* dvd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dvd.c; path = ../libmediafork/dvd.c; sourceTree = SOURCE_ROOT; };
- 526FBCA40B4CAB100064E04C /* encavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encavcodec.c; path = ../libmediafork/encavcodec.c; sourceTree = SOURCE_ROOT; };
- 526FBCA50B4CAB100064E04C /* encfaac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encfaac.c; path = ../libmediafork/encfaac.c; sourceTree = SOURCE_ROOT; };
- 526FBCA60B4CAB100064E04C /* enclame.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = enclame.c; path = ../libmediafork/enclame.c; sourceTree = SOURCE_ROOT; };
- 526FBCA70B4CAB100064E04C /* encvorbis.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encvorbis.c; path = ../libmediafork/encvorbis.c; sourceTree = SOURCE_ROOT; };
- 526FBCA80B4CAB100064E04C /* encx264.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encx264.c; path = ../libmediafork/encx264.c; sourceTree = SOURCE_ROOT; };
- 526FBCA90B4CAB100064E04C /* encxvid.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encxvid.c; path = ../libmediafork/encxvid.c; sourceTree = SOURCE_ROOT; };
- 526FBCAA0B4CAB100064E04C /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../libmediafork/fifo.c; sourceTree = SOURCE_ROOT; };
- 526FBCAE0B4CAB100064E04C /* muxavi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxavi.c; path = ../libmediafork/muxavi.c; sourceTree = SOURCE_ROOT; };
- 526FBCAF0B4CAB100064E04C /* muxcommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxcommon.c; path = ../libmediafork/muxcommon.c; sourceTree = SOURCE_ROOT; };
- 526FBCB00B4CAB100064E04C /* muxmp4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmp4.c; path = ../libmediafork/muxmp4.c; sourceTree = SOURCE_ROOT; };
- 526FBCB10B4CAB100064E04C /* muxogm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxogm.c; path = ../libmediafork/muxogm.c; sourceTree = SOURCE_ROOT; };
- 526FBCB20B4CAB100064E04C /* ports.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ports.c; path = ../libmediafork/ports.c; sourceTree = SOURCE_ROOT; };
- 526FBCB40B4CAB100064E04C /* reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = reader.c; path = ../libmediafork/reader.c; sourceTree = SOURCE_ROOT; };
- 526FBCB50B4CAB100064E04C /* render.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = render.c; path = ../libmediafork/render.c; sourceTree = SOURCE_ROOT; };
- 526FBCB60B4CAB100064E04C /* scan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scan.c; path = ../libmediafork/scan.c; sourceTree = SOURCE_ROOT; };
- 526FBCB70B4CAB100064E04C /* sync.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../libmediafork/sync.c; sourceTree = SOURCE_ROOT; };
- 526FBCB80B4CAB100064E04C /* update.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = update.c; path = ../libmediafork/update.c; sourceTree = SOURCE_ROOT; };
- 526FBCB90B4CAB100064E04C /* work.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = work.c; path = ../libmediafork/work.c; sourceTree = SOURCE_ROOT; };
+ 526FBC9B0B4CAB100064E04C /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../libhb/common.c; sourceTree = SOURCE_ROOT; };
+ 526FBC9D0B4CAB100064E04C /* deca52.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deca52.c; path = ../libhb/deca52.c; sourceTree = SOURCE_ROOT; };
+ 526FBC9E0B4CAB100064E04C /* decavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decavcodec.c; path = ../libhb/decavcodec.c; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -245,11 +245,11 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 4D1EA2DA0993B01000FDC1A2 /* Instant MediaFork.app */,
- 0DFF0B720B6BC6E600549488 /* libmediafork.a */,
- 0DFF0C0A0B6BCEC200549488 /* MediaForkCLI */,
- 0D6E35760B6BD4F0005AABB3 /* MediaFork.app */,
- 0D096DFF0B707D1200A845D4 /* libmediafork.dylib */,
+ 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */,
+ 0DFF0B720B6BC6E600549488 /* libhb.a */,
+ 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */,
+ 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */,
+ 0D096DFF0B707D1200A845D4 /* libhb.dylib */,
);
name = Products;
sourceTree = "<group>";
@@ -257,10 +257,10 @@
29B97314FDCFA39411CA2CEA /* HandBrake */ = {
isa = PBXGroup;
children = (
- 526FBC940B4CAA310064E04C /* Instant MediaFork Sources */,
- 526FBC930B4CAA260064E04C /* MediaFork Sources */,
- 526FBC920B4CAA120064E04C /* MediaForkCLI Sources */,
- 526FBC8D0B4CA9F90064E04C /* libmediafork Sources */,
+ 526FBC940B4CAA310064E04C /* Instant HandBrake Sources */,
+ 526FBC930B4CAA260064E04C /* HandBrake Sources */,
+ 526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */,
+ 526FBC8D0B4CA9F90064E04C /* libhb Sources */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -280,8 +280,8 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */,
29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
- 4D118405053054CD00C39CA9 /* MediaFork.icns */,
4D1EA3000993B13700FDC1A2 /* Express.nib */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
);
@@ -301,54 +301,54 @@
name = Frameworks;
sourceTree = "<group>";
};
- 526FBC8D0B4CA9F90064E04C /* libmediafork Sources */ = {
+ 526FBC8D0B4CA9F90064E04C /* libhb Sources */ = {
isa = PBXGroup;
children = (
+ 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */,
+ 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */,
+ 0DFA5C800B8DD3B60020BC09 /* decsub.c */,
+ 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */,
+ 0DFA5C820B8DD3B60020BC09 /* dvd.c */,
+ 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */,
+ 0DFA5C840B8DD3B60020BC09 /* encfaac.c */,
+ 0DFA5C850B8DD3B60020BC09 /* enclame.c */,
+ 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */,
+ 0DFA5C870B8DD3B60020BC09 /* encx264.c */,
+ 0DFA5C880B8DD3B60020BC09 /* encxvid.c */,
+ 0DFA5C890B8DD3B60020BC09 /* fifo.c */,
+ 0DFA5C8A0B8DD3B60020BC09 /* hb.c */,
+ 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */,
+ 0DFA5C910B8DD3B60020BC09 /* muxavi.c */,
+ 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */,
+ 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */,
+ 0DFA5C940B8DD3B60020BC09 /* muxogm.c */,
+ 0DFA5C950B8DD3B60020BC09 /* ports.c */,
+ 0DFA5C970B8DD3B60020BC09 /* reader.c */,
+ 0DFA5C980B8DD3B60020BC09 /* render.c */,
+ 0DFA5C990B8DD3B60020BC09 /* scan.c */,
+ 0DFA5C9A0B8DD3B60020BC09 /* sync.c */,
+ 0DFA5C9B0B8DD3B60020BC09 /* update.c */,
+ 0DFA5C9C0B8DD3B60020BC09 /* work.c */,
526FBC9B0B4CAB100064E04C /* common.c */,
526FBC9D0B4CAB100064E04C /* deca52.c */,
526FBC9E0B4CAB100064E04C /* decavcodec.c */,
- 526FBC9F0B4CAB100064E04C /* declpcm.c */,
- 526FBCA00B4CAB100064E04C /* decmpeg2.c */,
- 526FBCA10B4CAB100064E04C /* decsub.c */,
- 0DF377420B7BEACA00115CB0 /* ipodutil.cpp */,
- 526FBCA20B4CAB100064E04C /* demuxmpeg.c */,
- 526FBCA30B4CAB100064E04C /* dvd.c */,
- 526FBCA40B4CAB100064E04C /* encavcodec.c */,
- 526FBCA50B4CAB100064E04C /* encfaac.c */,
- 526FBCA60B4CAB100064E04C /* enclame.c */,
- 526FBCA70B4CAB100064E04C /* encvorbis.c */,
- 526FBCA80B4CAB100064E04C /* encx264.c */,
- 526FBCA90B4CAB100064E04C /* encxvid.c */,
- 526FBCAA0B4CAB100064E04C /* fifo.c */,
- 526FBCAE0B4CAB100064E04C /* muxavi.c */,
- 526FBCAF0B4CAB100064E04C /* muxcommon.c */,
- 526FBCB00B4CAB100064E04C /* muxmp4.c */,
- 0D9C5CE40B77E85B00828855 /* mediafork.c */,
- 526FBCB10B4CAB100064E04C /* muxogm.c */,
- 526FBCB20B4CAB100064E04C /* ports.c */,
- 526FBCB40B4CAB100064E04C /* reader.c */,
- 526FBCB50B4CAB100064E04C /* render.c */,
- 526FBCB60B4CAB100064E04C /* scan.c */,
- 526FBCB70B4CAB100064E04C /* sync.c */,
- 526FBCB80B4CAB100064E04C /* update.c */,
- 526FBCB90B4CAB100064E04C /* work.c */,
);
- name = "libmediafork Sources";
+ name = "libhb Sources";
sourceTree = "<group>";
};
- 526FBC920B4CAA120064E04C /* MediaForkCLI Sources */ = {
+ 526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */ = {
isa = PBXGroup;
children = (
0DF377970B7BF99A00115CB0 /* fakexcode.cpp */,
526FBC760B4CA8F40064E04C /* test.c */,
);
- name = "MediaForkCLI Sources";
+ name = "HandBrakeCLI Sources";
sourceTree = "<group>";
};
- 526FBC930B4CAA260064E04C /* MediaFork Sources */ = {
+ 526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
isa = PBXGroup;
children = (
- 4DE09E62082038A400FB751F /* MediaFork.plist */,
+ 0DFA5D060B8DD9040020BC09 /* HandBrake.plist */,
4D1FD381073D19CE00E46515 /* PictureController.h */,
4D1FD382073D19CE00E46515 /* PictureController.mm */,
4DF3C8CB052889CD00A80101 /* Controller.h */,
@@ -366,17 +366,17 @@
4D2AE78909CCB24C007E18F6 /* DriveDetector.m */,
4D2AE78A09CCB24C007E18F6 /* DriveDetector.h */,
);
- name = "MediaFork Sources";
+ name = "HandBrake Sources";
sourceTree = "<group>";
};
- 526FBC940B4CAA310064E04C /* Instant MediaFork Sources */ = {
+ 526FBC940B4CAA310064E04C /* Instant HandBrake Sources */ = {
isa = PBXGroup;
children = (
4D1EA31A0993B24700FDC1A2 /* ExpressController.h */,
4D1EA31B0993B24700FDC1A2 /* ExpressController.m */,
4D1EA2DC0993B01000FDC1A2 /* Express.plist */,
);
- name = "Instant MediaFork Sources";
+ name = "Instant HandBrake Sources";
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -413,9 +413,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 0D096DFE0B707D1200A845D4 /* libmediafork dlib */ = {
+ 0D096DFE0B707D1200A845D4 /* libhb dlib */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libmediafork dlib" */;
+ buildConfigurationList = 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */;
buildPhases = (
0D096DFB0B707D1200A845D4 /* Headers */,
0D096DFC0B707D1200A845D4 /* Sources */,
@@ -425,14 +425,14 @@
);
dependencies = (
);
- name = "libmediafork dlib";
+ name = "libhb dlib";
productName = "libmediafork dlib";
- productReference = 0D096DFF0B707D1200A845D4 /* libmediafork.dylib */;
+ productReference = 0D096DFF0B707D1200A845D4 /* libhb.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
- 0DFF0B710B6BC6E600549488 /* libmediafork */ = {
+ 0DFF0B710B6BC6E600549488 /* libhb */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libmediafork" */;
+ buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */;
buildPhases = (
0DFF0B6E0B6BC6E600549488 /* Headers */,
0DFF0B6F0B6BC6E600549488 /* Sources */,
@@ -442,14 +442,14 @@
);
dependencies = (
);
- name = libmediafork;
+ name = libhb;
productName = libmediafork;
- productReference = 0DFF0B720B6BC6E600549488 /* libmediafork.a */;
+ productReference = 0DFF0B720B6BC6E600549488 /* libhb.a */;
productType = "com.apple.product-type.library.static";
};
- 0DFF0C090B6BCEC200549488 /* MediaForkCLI */ = {
+ 0DFF0C090B6BCEC200549488 /* HandBrakeCLI */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "MediaForkCLI" */;
+ buildConfigurationList = 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */;
buildPhases = (
0DFF0C070B6BCEC200549488 /* Sources */,
0DFF0C080B6BCEC200549488 /* Frameworks */,
@@ -459,14 +459,14 @@
dependencies = (
0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */,
);
- name = MediaForkCLI;
+ name = HandBrakeCLI;
productName = MediaForkCLI;
- productReference = 0DFF0C0A0B6BCEC200549488 /* MediaForkCLI */;
+ productReference = 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */;
productType = "com.apple.product-type.tool";
};
- 4D1EA2D90993B01000FDC1A2 /* Instant MediaFork */ = {
+ 4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant MediaFork" */;
+ buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */;
buildPhases = (
4D1EA2D60993B01000FDC1A2 /* Resources */,
4D1EA2D70993B01000FDC1A2 /* Sources */,
@@ -477,14 +477,14 @@
dependencies = (
0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */,
);
- name = "Instant MediaFork";
+ name = "Instant HandBrake";
productName = "Instant HandBrake";
- productReference = 4D1EA2DA0993B01000FDC1A2 /* Instant MediaFork.app */;
+ productReference = 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */;
productType = "com.apple.product-type.application";
};
- 4DD93F8D082036E8008E1322 /* MediaFork */ = {
+ 4DD93F8D082036E8008E1322 /* HandBrake */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "MediaFork" */;
+ buildConfigurationList = 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */;
buildPhases = (
4DD93F8E082036E8008E1322 /* Headers */,
4DD93F95082036E8008E1322 /* Resources */,
@@ -496,9 +496,9 @@
dependencies = (
0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */,
);
- name = MediaFork;
+ name = HandBrake;
productName = HandBrake;
- productReference = 0D6E35760B6BD4F0005AABB3 /* MediaFork.app */;
+ productReference = 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -506,16 +506,16 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "MediaFork" */;
+ buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
projectDirPath = "";
targets = (
- 4DD93F8D082036E8008E1322 /* MediaFork */,
- 4D1EA2D90993B01000FDC1A2 /* Instant MediaFork */,
- 0DFF0B710B6BC6E600549488 /* libmediafork */,
- 0DFF0C090B6BCEC200549488 /* MediaForkCLI */,
- 0D096DFE0B707D1200A845D4 /* libmediafork dlib */,
+ 4DD93F8D082036E8008E1322 /* HandBrake */,
+ 4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */,
+ 0DFF0B710B6BC6E600549488 /* libhb */,
+ 0DFF0C090B6BCEC200549488 /* HandBrakeCLI */,
+ 0D096DFE0B707D1200A845D4 /* libhb dlib */,
);
};
/* End PBXProject section */
@@ -525,7 +525,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 0D75EDC00B6FF9DA0090EA86 /* MediaFork.icns in Resources */,
+ 0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */,
52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */,
52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */,
4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */,
@@ -536,10 +536,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */,
4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */,
4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */,
- 4DD93F98082036E8008E1322 /* MediaFork.icns in Resources */,
- 4DE09E63082038A400FB751F /* MediaFork.plist in Resources */,
+ 0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -550,34 +550,34 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */,
+ 0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */,
+ 0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */,
+ 0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */,
+ 0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */,
+ 0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */,
+ 0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */,
+ 0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */,
+ 0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */,
+ 0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */,
+ 0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */,
+ 0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */,
+ 0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */,
+ 0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */,
+ 0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */,
+ 0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */,
+ 0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */,
+ 0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */,
+ 0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */,
+ 0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */,
+ 0DFA5CED0B8DD4210020BC09 /* render.c in Sources */,
+ 0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */,
+ 0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */,
+ 0DFA5CF00B8DD4210020BC09 /* update.c in Sources */,
+ 0DFA5CF10B8DD4210020BC09 /* work.c in Sources */,
0D096E010B707D3400A845D4 /* common.c in Sources */,
0D096E020B707D3400A845D4 /* deca52.c in Sources */,
0D096E030B707D3400A845D4 /* decavcodec.c in Sources */,
- 0D096E040B707D3400A845D4 /* declpcm.c in Sources */,
- 0D096E050B707D3400A845D4 /* decmpeg2.c in Sources */,
- 0D096E060B707D3400A845D4 /* decsub.c in Sources */,
- 0D096E070B707D3400A845D4 /* demuxmpeg.c in Sources */,
- 0D096E080B707D3400A845D4 /* dvd.c in Sources */,
- 0D096E090B707D3400A845D4 /* encavcodec.c in Sources */,
- 0D096E0A0B707D3400A845D4 /* encfaac.c in Sources */,
- 0D096E0B0B707D3400A845D4 /* enclame.c in Sources */,
- 0D096E0C0B707D3400A845D4 /* encvorbis.c in Sources */,
- 0D096E0D0B707D3400A845D4 /* encx264.c in Sources */,
- 0D096E0E0B707D3400A845D4 /* encxvid.c in Sources */,
- 0D096E0F0B707D3400A845D4 /* fifo.c in Sources */,
- 0D096E100B707D3400A845D4 /* muxavi.c in Sources */,
- 0D096E110B707D3400A845D4 /* muxcommon.c in Sources */,
- 0D096E120B707D3400A845D4 /* muxmp4.c in Sources */,
- 0D096E130B707D3400A845D4 /* muxogm.c in Sources */,
- 0D096E140B707D3400A845D4 /* ports.c in Sources */,
- 0D096E150B707D3400A845D4 /* reader.c in Sources */,
- 0D096E160B707D3400A845D4 /* render.c in Sources */,
- 0D096E170B707D3400A845D4 /* scan.c in Sources */,
- 0D096E180B707D3400A845D4 /* sync.c in Sources */,
- 0D096E190B707D3400A845D4 /* update.c in Sources */,
- 0D096E1A0B707D3400A845D4 /* work.c in Sources */,
- 0D9C5CE60B77E85B00828855 /* mediafork.c in Sources */,
- 0DF377430B7BEACA00115CB0 /* ipodutil.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -585,34 +585,34 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */,
+ 0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */,
+ 0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */,
+ 0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */,
+ 0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */,
+ 0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */,
+ 0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */,
+ 0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */,
+ 0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */,
+ 0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */,
+ 0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */,
+ 0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */,
+ 0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */,
+ 0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */,
+ 0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */,
+ 0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */,
+ 0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */,
+ 0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */,
+ 0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */,
+ 0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */,
+ 0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */,
+ 0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */,
+ 0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */,
+ 0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */,
+ 0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */,
0DFF0B770B6BC72A00549488 /* common.c in Sources */,
0DFF0B790B6BC72A00549488 /* deca52.c in Sources */,
0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */,
- 0DFF0B7B0B6BC72A00549488 /* declpcm.c in Sources */,
- 0DFF0B7C0B6BC72A00549488 /* decmpeg2.c in Sources */,
- 0DFF0B7D0B6BC72A00549488 /* decsub.c in Sources */,
- 0DFF0B7E0B6BC72A00549488 /* demuxmpeg.c in Sources */,
- 0DFF0B7F0B6BC72A00549488 /* dvd.c in Sources */,
- 0DFF0B800B6BC72A00549488 /* encavcodec.c in Sources */,
- 0DFF0B810B6BC72A00549488 /* encfaac.c in Sources */,
- 0DFF0B820B6BC72A00549488 /* enclame.c in Sources */,
- 0DFF0B830B6BC72A00549488 /* encvorbis.c in Sources */,
- 0DFF0B840B6BC72A00549488 /* encx264.c in Sources */,
- 0DFF0B850B6BC72A00549488 /* encxvid.c in Sources */,
- 0DFF0B860B6BC72A00549488 /* fifo.c in Sources */,
- 0DFF0B8B0B6BC72A00549488 /* muxavi.c in Sources */,
- 0DFF0B8C0B6BC72A00549488 /* muxcommon.c in Sources */,
- 0DFF0B8D0B6BC72A00549488 /* muxmp4.c in Sources */,
- 0DFF0B8E0B6BC72A00549488 /* muxogm.c in Sources */,
- 0DFF0B8F0B6BC72A00549488 /* ports.c in Sources */,
- 0DFF0B910B6BC72A00549488 /* reader.c in Sources */,
- 0DFF0B920B6BC72A00549488 /* render.c in Sources */,
- 0DFF0B930B6BC72A00549488 /* scan.c in Sources */,
- 0DFF0B940B6BC72A00549488 /* sync.c in Sources */,
- 0DFF0B950B6BC72A00549488 /* update.c in Sources */,
- 0DFF0B960B6BC72A00549488 /* work.c in Sources */,
- 0D9C5CE50B77E85B00828855 /* mediafork.c in Sources */,
- 0DF377440B7BEACA00115CB0 /* ipodutil.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -656,17 +656,17 @@
/* Begin PBXTargetDependency section */
0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 0DFF0B710B6BC6E600549488 /* libmediafork */;
+ target = 0DFF0B710B6BC6E600549488 /* libhb */;
targetProxy = 0D6E35900B6BD5FA005AABB3 /* PBXContainerItemProxy */;
};
0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 0DFF0B710B6BC6E600549488 /* libmediafork */;
+ target = 0DFF0B710B6BC6E600549488 /* libhb */;
targetProxy = 0DFF0BF10B6BCCB400549488 /* PBXContainerItemProxy */;
};
0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
- target = 0DFF0B710B6BC6E600549488 /* libmediafork */;
+ target = 0DFF0B710B6BC6E600549488 /* libhb */;
targetProxy = 0DFF0BF30B6BCCB900549488 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -694,7 +694,7 @@
0D096E660B707D5800A845D4 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -712,15 +712,15 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
OTHER_LDFLAGS = (
../contrib/lib/libmp4v2.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
../contrib/lib/libavcodec.a,
@@ -743,7 +743,7 @@
);
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SEPARATE_STRIP = YES;
ZERO_LINK = NO;
};
@@ -752,7 +752,7 @@
0D096E670B707D5800A845D4 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
COPY_PHASE_STRIP = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -769,15 +769,15 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
OTHER_LDFLAGS = (
../contrib/lib/libmp4v2.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
../contrib/lib/libavcodec.a,
@@ -800,7 +800,7 @@
);
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SEPARATE_STRIP = YES;
ZERO_LINK = NO;
};
@@ -809,7 +809,7 @@
0D096E680B707D5800A845D4 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXECUTABLE_PREFIX = lib;
@@ -824,15 +824,15 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
OTHER_LDFLAGS = (
../contrib/lib/libmp4v2.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
../contrib/lib/libavcodec.a,
@@ -855,7 +855,7 @@
);
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SEPARATE_STRIP = YES;
ZERO_LINK = NO;
};
@@ -864,7 +864,7 @@
0D096E690B707D5800A845D4 /* UB */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXECUTABLE_PREFIX = lib;
@@ -879,13 +879,12 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=2007021100",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100 ";
OTHER_LDFLAGS = (
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
@@ -910,7 +909,7 @@
);
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SEPARATE_STRIP = YES;
ZERO_LINK = NO;
};
@@ -919,7 +918,7 @@
0D88F56B0B6CDCD400F81F26 /* UB */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
@@ -929,17 +928,16 @@
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=2007021100",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
OTHER_LDFLAGS = "";
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -953,12 +951,12 @@
FRAMEWORK_SEARCH_PATHS = "";
GCC_OPTIMIZATION_LEVEL = s;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- HEADER_SEARCH_PATHS = ../libmediafork;
- INFOPLIST_FILE = MediaFork.plist;
+ HEADER_SEARCH_PATHS = ../libhb;
+ INFOPLIST_FILE = HandBrake.plist;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -976,7 +974,7 @@
../contrib/lib/libx264.a,
../contrib/lib/libxvidcore.a,
);
- PRODUCT_NAME = MediaFork;
+ PRODUCT_NAME = HandBrake;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -996,7 +994,7 @@
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INFOPLIST_FILE = Express.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
@@ -1005,7 +1003,7 @@
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1024,7 +1022,7 @@
../contrib/lib/libxvidcore.a,
);
PREBINDING = NO;
- PRODUCT_NAME = "Instant MediaFork";
+ PRODUCT_NAME = "Instant HandBrake";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
@@ -1038,12 +1036,12 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1063,7 +1061,7 @@
"-lz",
);
PREBINDING = NO;
- PRODUCT_NAME = MediaForkCLI;
+ PRODUCT_NAME = HandBrakeCLI;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1084,7 +1082,7 @@
0DFF0B740B6BC70400549488 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1096,17 +1094,16 @@
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
OTHER_LDFLAGS = "";
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1115,7 +1112,7 @@
0DFF0B750B6BC70400549488 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1126,17 +1123,16 @@
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
OTHER_LDFLAGS = "";
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1145,7 +1141,7 @@
0DFF0B760B6BC70400549488 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libmediafork";
+ CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
@@ -1155,17 +1151,16 @@
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
INSTALL_PATH = /usr/local/lib;
OTHER_CFLAGS = (
- "-D__LIBMEDIAFORK__",
+ "-D__LIBHB__",
"-DSYS_DARWIN",
"$(OTHER_CFLAGS_QUOTED_1)",
- "-DHB_BUILD=20070211",
"-DUSE_PTHREAD",
);
- OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+ OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
OTHER_LDFLAGS = "";
PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
PREBINDING = NO;
- PRODUCT_NAME = mediafork;
+ PRODUCT_NAME = hb;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1181,12 +1176,13 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1206,7 +1202,7 @@
"-lz",
);
PREBINDING = NO;
- PRODUCT_NAME = MediaForkCLI;
+ PRODUCT_NAME = HandBrakeCLI;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1221,12 +1217,13 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1246,7 +1243,7 @@
"-lz",
);
PREBINDING = NO;
- PRODUCT_NAME = MediaForkCLI;
+ PRODUCT_NAME = HandBrakeCLI;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1259,12 +1256,13 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1284,7 +1282,7 @@
"-lz",
);
PREBINDING = NO;
- PRODUCT_NAME = MediaForkCLI;
+ PRODUCT_NAME = HandBrakeCLI;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ZERO_LINK = NO;
};
@@ -1301,7 +1299,7 @@
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INFOPLIST_FILE = Express.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
@@ -1310,7 +1308,8 @@
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1329,7 +1328,7 @@
../contrib/lib/libxvidcore.a,
);
PREBINDING = NO;
- PRODUCT_NAME = "Instant MediaFork";
+ PRODUCT_NAME = "Instant HandBrake";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
@@ -1346,7 +1345,7 @@
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INFOPLIST_FILE = Express.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
@@ -1355,7 +1354,8 @@
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1374,7 +1374,7 @@
../contrib/lib/libxvidcore.a,
);
PREBINDING = NO;
- PRODUCT_NAME = "Instant MediaFork";
+ PRODUCT_NAME = "Instant HandBrake";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
@@ -1389,7 +1389,7 @@
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- HEADER_SEARCH_PATHS = ../libmediafork;
+ HEADER_SEARCH_PATHS = ../libhb;
INFOPLIST_FILE = Express.plist;
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = (
@@ -1398,7 +1398,8 @@
);
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1417,7 +1418,7 @@
../contrib/lib/libxvidcore.a,
);
PREBINDING = NO;
- PRODUCT_NAME = "Instant MediaFork";
+ PRODUCT_NAME = "Instant HandBrake";
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
@@ -1427,20 +1428,22 @@
4D4E7BC1087804870051572B /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CONFIGURATION_BUILD_DIR = ..;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.8.0;
+ CURRENT_PROJECT_VERSION = 0.8.0b1;
FRAMEWORK_SEARCH_PATHS = "";
GCC_DYNAMIC_NO_PIC = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = s;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- HEADER_SEARCH_PATHS = ../libmediafork;
- INFOPLIST_FILE = MediaFork.plist;
+ HEADER_SEARCH_PATHS = ../libhb;
+ INFOPLIST_FILE = HandBrake.plist;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1458,7 +1461,7 @@
../contrib/lib/libx264.a,
../contrib/lib/libxvidcore.a,
);
- PRODUCT_NAME = MediaFork;
+ PRODUCT_NAME = HandBrake;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -1473,18 +1476,20 @@
4D4E7BC2087804870051572B /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CONFIGURATION_BUILD_DIR = ..;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.8.0;
+ CURRENT_PROJECT_VERSION = 0.8.0b1;
FRAMEWORK_SEARCH_PATHS = "";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_OPTIMIZATION_LEVEL = s;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- HEADER_SEARCH_PATHS = ../libmediafork;
- INFOPLIST_FILE = MediaFork.plist;
+ HEADER_SEARCH_PATHS = ../libhb;
+ INFOPLIST_FILE = HandBrake.plist;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1502,7 +1507,7 @@
../contrib/lib/libx264.a,
../contrib/lib/libxvidcore.a,
);
- PRODUCT_NAME = MediaFork;
+ PRODUCT_NAME = HandBrake;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -1517,16 +1522,18 @@
4D4E7BC3087804870051572B /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 0.8.0;
+ CONFIGURATION_BUILD_DIR = ..;
+ CURRENT_PROJECT_VERSION = 0.8.0b1;
FRAMEWORK_SEARCH_PATHS = "";
GCC_OPTIMIZATION_LEVEL = s;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- HEADER_SEARCH_PATHS = ../libmediafork;
- INFOPLIST_FILE = MediaFork.plist;
+ HEADER_SEARCH_PATHS = ../libhb;
+ INFOPLIST_FILE = HandBrake.plist;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
- ../libmediafork/libmediafork.a,
+ ../libhb/libhb.a,
+ ../contrib/lib/libquicktime.a,
../contrib/lib/libmp4v2.a,
../contrib/lib/liba52.a,
../contrib/lib/libavformat.a,
@@ -1544,7 +1551,7 @@
../contrib/lib/libx264.a,
../contrib/lib/libxvidcore.a,
);
- PRODUCT_NAME = MediaFork;
+ PRODUCT_NAME = HandBrake;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -1582,7 +1589,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libmediafork dlib" */ = {
+ 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0D096E660B707D5800A845D4 /* Development */,
@@ -1593,7 +1600,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libmediafork" */ = {
+ 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0DFF0B740B6BC70400549488 /* Development */,
@@ -1604,7 +1611,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "MediaForkCLI" */ = {
+ 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0DFF0C0D0B6BCEE000549488 /* Development */,
@@ -1615,7 +1622,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant MediaFork" */ = {
+ 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D1EA2DE0993B01100FDC1A2 /* Development */,
@@ -1626,7 +1633,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "MediaFork" */ = {
+ 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D4E7BC1087804870051572B /* Development */,
@@ -1637,7 +1644,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
};
- 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "MediaFork" */ = {
+ 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4D4E7BC5087804870051572B /* Development */,
diff --git a/macosx/MediaFork.plist b/macosx/MediaFork.plist
deleted file mode 100644
index f9ae89d7b..000000000
--- a/macosx/MediaFork.plist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleDisplayName</key>
- <string>MediaFork</string>
- <key>CFBundleExecutable</key>
- <string>MediaFork</string>
- <key>CFBundleGetInfoString</key>
- <string>0.8.0b1</string>
- <key>CFBundleIconFile</key>
- <string>MediaFork</string>
- <key>CFBundleIdentifier</key>
- <string>org.mediafork.dynalias</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>MediaFork</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>0.8.0b1</string>
- <key>CFBundleSignature</key>
- <string>HB##</string>
- <key>CFBundleVersion</key>
- <string>2007021100</string>
- <key>NSHumanReadableCopyright</key>
- <string>MediaFork Devs</string>
- <key>NSMainNibFile</key>
- <string>MainMenu</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 7f750f031..46b8b3d98 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -6,7 +6,7 @@
#include <Cocoa/Cocoa.h>
-#include "mediafork.h"
+#include "hb.h"
#include "PictureGLView.h"
@interface PictureController : NSObject
diff --git a/macosx/PictureGLView.h b/macosx/PictureGLView.h
index 518ba1268..229d822ac 100644
--- a/macosx/PictureGLView.h
+++ b/macosx/PictureGLView.h
@@ -6,7 +6,7 @@
#include <Cocoa/Cocoa.h>
-#include "mediafork.h"
+#include "hb.h"
#define HB_ANIMATE_NONE 1
#define HB_ANIMATE_BACKWARD 2
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index a9c198c55..a9ccb54a4 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -12,8 +12,10 @@
IBOutlet NSButton * fDefDeinterlace;
IBOutlet NSButton * fDefPicSizeAutoSetipod;
IBOutlet NSButton * fDefPixelRatio;
+ IBOutlet NSButton * fDefAudioSurround;
+ IBOutlet NSButton * fDefPresetDrawerShow;
-
+ IBOutlet NSTextView * fDefAdvancedx264FlagsView;
}
- (IBAction) OpenPanel: (id) sender;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index e00051cb9..b417416b5 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -8,9 +8,9 @@
NSDictionary * appDefaults;
/* Unless the user specified otherwise, default is to check
- for update fDefPicSizeAutoSetipod*/
+ for update DefAdvancedx264Flags*/
defaults = [NSUserDefaults standardUserDefaults];
- appDefaults = [NSDictionary dictionaryWithObject:@"NO"
+ appDefaults = [NSDictionary dictionaryWithObject:@"YES"
forKey:@"CheckForUpdates"];
appDefaults = [NSDictionary dictionaryWithObject:@"English"
forKey:@"DefaultLanguage"];
@@ -24,15 +24,21 @@
forKey:@"DefaultPicSizeAutoiPod"];
appDefaults = [NSDictionary dictionaryWithObject:@"NO"
forKey:@"PixelRatio"];
-
+ appDefaults = [NSDictionary dictionaryWithObject:@"NO"
+ forKey:@"DefaultSurroundSound"];
+ appDefaults = [NSDictionary dictionaryWithObject:@""
+ forKey:@"DefAdvancedx264Flags"];
+ appDefaults = [NSDictionary dictionaryWithObject:@"YES"
+ forKey:@"DefaultPresetsDrawerShow"];
+ NSString *defDestDirectory = @"~/Desktop";
+ defDestDirectory = [defDestDirectory stringByExpandingTildeInPath];
+ appDefaults = [NSDictionary dictionaryWithObject:defDestDirectory forKey:@"LastDestinationDirectory"];
[defaults registerDefaults: appDefaults];
/* fUpdateCheck Check or uncheck according to the preferences */
-
- [fUpdateCheck setState: 0];
- [fUpdateCheck setEnabled: NO];
-
+ [fUpdateCheck setState: [defaults boolForKey:@"CheckForUpdates"] ?
+ NSOnState : NSOffState];
// Fill the languages combobox
[fdefaultlanguage removeAllItems];
@@ -215,22 +221,37 @@
/* fFileExtItunes Check or uncheck according to the preferences */
[fFileExtItunes setState: [defaults boolForKey:@"DefaultMpegName"] ?
- NSOnState : NSOffState];
-
- /* fDefCrf Check or uncheck according to the preferences*/
+ NSOnState : NSOffState];
+
+ /* fDefCrf Check or uncheck according to the preferences*/
[fDefCrf setState: [defaults boolForKey:@"DefaultCrf"] ?
- NSOnState : NSOffState];
-
+ NSOnState : NSOffState];
+
/* fDefDeinterlace Check or uncheck according to the preferences*/
[fDefDeinterlace setState: [defaults boolForKey:@"DefaultDeinterlaceOn"] ?
- NSOnState : NSOffState];
-
-/* fDefPicSizeAutoSetipod Check or uncheck according to the preferences*/
+ NSOnState : NSOffState];
+
+ /* fDefPicSizeAutoSetipod Check or uncheck according to the preferences*/
[fDefPicSizeAutoSetipod setState: [defaults boolForKey:@"DefaultPicSizeAutoiPod"] ?
- NSOnState : NSOffState];
- /* fDefPixelRatio */
+ NSOnState : NSOffState];
+ /* fDefPixelRatio */
[fDefPixelRatio setState: [defaults boolForKey:@"PixelRatio"] ?
- NSOnState : NSOffState];
+ NSOnState : NSOffState];
+
+ /* fDefAudioSurround Check or uncheck according to the preferences */
+ [fDefAudioSurround setState: [defaults boolForKey:@"DefaultSurroundSound"] ?
+ NSOnState : NSOffState];
+
+ /* Insert default DefAdvanced x264 Flag here */
+ if ([defaults stringForKey:@"DefAdvancedx264Flags"]!=NULL)
+ {
+ [fDefAdvancedx264FlagsView setString:[defaults stringForKey:@"DefAdvancedx264Flags"]];
+ }
+
+ /* fDefPresetDrawerShow Check or uncheck according to the preferences*/
+ [fDefPresetDrawerShow setState: [defaults boolForKey:@"DefaultPresetsDrawerShow"] ?
+ NSOnState : NSOffState];
+
}
@@ -241,6 +262,7 @@
- (IBAction) ClosePanel: (id) sender;
{
+ [self CheckChanged: sender];
[NSApp stopModal];
[fPanel orderOut: sender];
}
@@ -318,9 +340,34 @@
{
[defaults setObject:@"NO" forKey:@"PixelRatio"];
}
-
+
+
+ /* Use Surround Sound if available*/
+ if( [fDefAudioSurround state] == NSOnState )
+ {
+ [defaults setObject:@"YES" forKey:@"DefaultSurroundSound"];
+ }
+ else
+ {
+ [defaults setObject:@"NO" forKey:@"DefaultSurroundSound"];
+ }
+
+
+ /*Advanced x264 Flag string into */
+ [defaults setObject:[fDefAdvancedx264FlagsView string] forKey:@"DefAdvancedx264Flags"];
+
+ /* Show Presets Drawer upon launch*/
+ if( [fDefPresetDrawerShow state] == NSOnState )
+ {
+ [defaults setObject:@"YES" forKey:@"DefaultPresetsDrawerShow"];
+ }
+ else
+ {
+ [defaults setObject:@"NO" forKey:@"DefaultPresetsDrawerShow"];
+ }
+
}
@end
diff --git a/macosx/QueueController.h b/macosx/QueueController.h
index 94feab4fb..635adc7b8 100644
--- a/macosx/QueueController.h
+++ b/macosx/QueueController.h
@@ -2,7 +2,7 @@
#include <Cocoa/Cocoa.h>
-#include "mediafork.h"
+#include "hb.h"
@interface QueueController : NSObject
{
diff --git a/macosx/ScanController.h b/macosx/ScanController.h
index 63c50b65c..e872bd048 100644
--- a/macosx/ScanController.h
+++ b/macosx/ScanController.h
@@ -6,7 +6,7 @@
#include <Cocoa/Cocoa.h>
-#include "mediafork.h"
+#include "hb.h"
@class DriveDetector;
@interface ScanController : NSObject
{
diff --git a/macosx/localize.sh b/macosx/localize.sh
index 27c423caa..5c32cfcde 100755
--- a/macosx/localize.sh
+++ b/macosx/localize.sh
@@ -8,3 +8,51 @@ do
cp -r English.lproj $l.lproj
cp ../../../macosx/i18n/$l.strings $l.lproj/Localizable.strings
done
+
+echo Generating Info.plist with correct version information
+cd ..
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDisplayName</key>
+ <string>HandBrake</string>
+ <key>CFBundleExecutable</key>
+ <string>HandBrake</string>
+ <key>CFBundleGetInfoString</key>
+ <string>0.8.0b1</string>
+ <key>CFBundleIconFile</key>
+ <string>HandBrake</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.m0k.handbrake</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>HandBrake</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>$2</string>
+ <key>CFBundleSignature</key>
+ <string>HB##</string>
+ <key>CFBundleVersion</key>
+ <string>$3</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>HandBrake Devs</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>" > Info.plist
+
+if [ $4 == "DEV" ]; then
+echo Installing libquicktime Plugins in the $1 Bundle
+cd Resources
+mkdir plugins
+cd plugins
+cp ../../../../contrib/lib/libquicktime/* .
+fi
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 14:52:39 +0000