From 00e5c28922670d035b60e18927f3cd8c87a57852 Mon Sep 17 00:00:00 2001 From: GRMrGecko Date: Sat, 3 Aug 2013 08:56:27 -0500 Subject: [PATCH] Removed top codec from MGMSIP and changed to a codec priority setup. Added ability to choose where recorded calls are stored. Added codec priority management to advanced preferences. Added more codec options to PJSIP build script and created fat version of libpjmedia-videodev (don't know if we'll ever implement Video support, why it's not linked to MGMSIP). --- Classes/VoiceBase/SIP/MGMSIP.h | 4 +- Classes/VoiceBase/SIP/MGMSIP.m | 38 +- Classes/VoiceMac/MGMController.h | 1 + Classes/VoiceMac/MGMController.m | 3 + Classes/VoiceMac/Preferences/MGMSIPPane.h | 11 +- Classes/VoiceMac/Preferences/MGMSIPPane.m | 89 +- Classes/VoiceMac/SIP/MGMSIPCallWindow.m | 2 +- Resources/VoiceMac/Info.plist | 6 +- .../Preferences/English.lproj/SIPPane.xib | 1631 +++++++++-------- SIP/install | 7 +- 10 files changed, 973 insertions(+), 819 deletions(-) diff --git a/Classes/VoiceBase/SIP/MGMSIP.h b/Classes/VoiceBase/SIP/MGMSIP.h index cd6dc99..e33b244 100644 --- a/Classes/VoiceBase/SIP/MGMSIP.h +++ b/Classes/VoiceBase/SIP/MGMSIP.h @@ -40,7 +40,7 @@ extern NSString * const MGMSIPEchoCacnellationEnabled; extern NSString * const MGMSIPPort; extern NSString * const MGMSIPPublicAddress; extern NSString * const MGMSIPUserAgent; -extern NSString * const MGMSIPCodec; +extern NSString * const MGMSIPCodecs; extern NSString * const MGMNetworkConnectedNotification; extern NSString * const MGMNetworkDisconnectedNotification; @@ -113,7 +113,6 @@ typedef enum { BOOL shouldRestart; NSTimer *restartTimer; - unsigned int codecOriginalPriority; NSMutableDictionary *codecsInfo; NSMutableArray *accounts; @@ -165,7 +164,6 @@ typedef enum { - (void)registerThread:(pj_thread_desc *)thePJThreadDesc; -- (void)setTopCodec:(NSString *)theCodec; - (void)setPriority:(unsigned int)thePriority forCodec:(NSString *)theCodec; - (NSDictionary *)codecs; diff --git a/Classes/VoiceBase/SIP/MGMSIP.m b/Classes/VoiceBase/SIP/MGMSIP.m index 6d5f846..b4c6231 100644 --- a/Classes/VoiceBase/SIP/MGMSIP.m +++ b/Classes/VoiceBase/SIP/MGMSIP.m @@ -51,6 +51,7 @@ NSString * const MGMSIPPort = @"MGMSIPPort"; NSString * const MGMSIPPublicAddress = @"MGMSIPPublicAddress"; NSString * const MGMSIPUserAgent = @"MGMSIPUserAgent"; NSString * const MGMSIPCodec = @"MGMSIPCodec"; +NSString * const MGMSIPCodecs = @"MGMSIPCodecs"; NSString * const MGMNetworkConnectedNotification = @"MGMNetworkConnectedNotification"; NSString * const MGMNetworkDisconnectedNotification = @"MGMNetworkDisconnectedNotification"; @@ -342,7 +343,12 @@ static OSStatus MGMAudioDevicesChanged(AudioHardwarePropertyID propertyID, void [defaults setObject:[NSNumber numberWithBool:NO] forKey:MGMSIPNameServersEnabled]; [defaults setObject:[NSNumber numberWithBool:YES] forKey:MGMSIPEchoCacnellationEnabled]; [defaults setObject:[NSNumber numberWithInt:0] forKey:MGMSIPPort]; - [defaults setObject:@"speex/16000" forKey:MGMSIPCodec]; + if ([[NSUserDefaults standardUserDefaults] objectForKey:MGMSIPCodec]!=nil) { + [defaults setObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:PJMEDIA_CODEC_PRIO_NEXT_HIGHER], [[NSUserDefaults standardUserDefaults] objectForKey:MGMSIPCodec], nil] forKey:MGMSIPCodecs]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:MGMSIPCodec]; + } else { + [defaults setObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:PJMEDIA_CODEC_PRIO_NEXT_HIGHER], @"speex/16000", nil] forKey:MGMSIPCodecs]; + } [defaults setObject:[NSNumber numberWithFloat:1.0] forKey:MGMSIPVolume]; [defaults setObject:[NSNumber numberWithFloat:1.0] forKey:MGMSIPMicVolume]; [defaults setObject:MGMSIPASystemDefault forKey:MGMSIPACurrentInputDevice]; @@ -582,11 +588,21 @@ static OSStatus MGMAudioDevicesChanged(AudioHardwarePropertyID propertyID, void if (status==PJ_SUCCESS) { for (int i=0; iPJMEDIA_CODEC_PRIO_HIGHEST) + thePriority = PJMEDIA_CODEC_PRIO_HIGHEST; + pj_str_t codec = [theCodec PJString]; pj_status_t status = pjmedia_codec_mgr_set_codec_priority(pjmedia_endpt_get_codec_mgr(pjsua_var.med_endpt), &codec, thePriority); [codecsInfo setObject:[NSNumber numberWithUnsignedInt:thePriority] forKey:theCodec]; + [[NSUserDefaults standardUserDefaults] setObject:codecsInfo forKey:MGMSIPCodecs]; if (status!=PJ_SUCCESS) NSLog(@"Error changing priority of codec %@ to %u: %d", theCodec, thePriority, status); } diff --git a/Classes/VoiceMac/MGMController.h b/Classes/VoiceMac/MGMController.h index e5a3ff1..49123ec 100644 --- a/Classes/VoiceMac/MGMController.h +++ b/Classes/VoiceMac/MGMController.h @@ -22,6 +22,7 @@ @class MGMContactsController, MGMPreferences, MGMAbout, MGMTaskManager, MGMURLConnectionManager, MGMThemeManager, MGMSMSManager, MGMBadge, MGMMultiSMS, MGMInstance, WebView; extern NSString * const MGMContactsControllersChangedNotification; +extern NSString * const MGMSIPRecordFolder; @interface MGMController : NSObject { NSMutableArray *contactsControllers; diff --git a/Classes/VoiceMac/MGMController.m b/Classes/VoiceMac/MGMController.m index b475ec0..6cced14 100644 --- a/Classes/VoiceMac/MGMController.m +++ b/Classes/VoiceMac/MGMController.m @@ -40,6 +40,8 @@ NSString * const MGMLaunchCount = @"MGMLaunchCount"; NSString * const MGMMakeDefault = @"MGMMakeDefault"; +NSString * const MGMSIPRecordFolder = @"MGMSIPRecordFolder"; + NSString * const MGMContactsControllersChangedNotification = @"MGMContactsControllersChangedNotification"; NSString * const MGMLoading = @"Loading..."; @@ -54,6 +56,7 @@ NSString * const MGMLoading = @"Loading..."; [GrowlApplicationBridge setGrowlDelegate:nil]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + [defaults registerDefaults:[NSMutableDictionary dictionaryWithObjectsAndKeys:@"~/Desktop/", MGMSIPRecordFolder, nil]]; if ([defaults boolForKey:MGMMakeDefault]) { NSString *bundleID = [[NSBundle mainBundle] bundleIdentifier]; LSSetDefaultHandlerForURLScheme(CFSTR("tel"), (CFStringRef)bundleID); diff --git a/Classes/VoiceMac/Preferences/MGMSIPPane.h b/Classes/VoiceMac/Preferences/MGMSIPPane.h index 4cc1161..a956aa1 100644 --- a/Classes/VoiceMac/Preferences/MGMSIPPane.h +++ b/Classes/VoiceMac/Preferences/MGMSIPPane.h @@ -48,8 +48,12 @@ IBOutlet NSTextField *logFileLevelField; IBOutlet NSTextField *consoleLogLevelField; IBOutlet NSTextField *publicAddressField; + IBOutlet NSTextField *recordedCallsField; IBOutlet NSTextField *userAgentField; - IBOutlet NSPopUpButton *codecPopUp; + + NSMutableArray *codecs; + IBOutlet NSWindow *codecWindow; + IBOutlet NSTableView *codecView; } - (id)initWithPreferences:(MGMPreferences *)thePreferences; + (void)setUpToolbarItem:(NSToolbarItem *)theItem; @@ -80,6 +84,9 @@ - (IBAction)consoleLogLevel:(id)sender; - (IBAction)publicAddress:(id)sender; - (IBAction)userAgent:(id)sender; -- (IBAction)codec:(id)sender; +- (IBAction)recordedCallsFolder:(id)sender; +- (IBAction)chooseRecordedCallsFolder:(id)sender; +- (IBAction)showCodecs:(id)sender; +- (IBAction)hideCodecs:(id)sender; @end #endif \ No newline at end of file diff --git a/Classes/VoiceMac/Preferences/MGMSIPPane.m b/Classes/VoiceMac/Preferences/MGMSIPPane.m index 27a38b7..74affdf 100644 --- a/Classes/VoiceMac/Preferences/MGMSIPPane.m +++ b/Classes/VoiceMac/Preferences/MGMSIPPane.m @@ -19,8 +19,12 @@ #if MGMSIPENABLED #import "MGMSIPPane.h" +#import "MGMController.h" #import +NSString * const MGMCodecName = @"name"; +NSString * const MGMCodecPriority = @"priority"; + @implementation MGMSIPPane - (id)initWithPreferences:(MGMPreferences *)thePreferences { if ((self = [super initWithPreferences:thePreferences])) { @@ -62,15 +66,10 @@ [publicAddressField setStringValue:[defaults objectForKey:MGMSIPPublicAddress]]; if ([defaults objectForKey:MGMSIPUserAgent]!=nil) [userAgentField setStringValue:[defaults objectForKey:MGMSIPUserAgent]]; - NSArray *codecs = [[[MGMSIP sharedSIP] codecs] allKeys]; - codecs = [codecs sortedArrayUsingSelector:@selector(compare:)]; - int currentCodecIndex = 0; - for (int i=0; i<[codecs count]; i++) { - if ([[codecs objectAtIndex:i] isEqual:[defaults objectForKey:MGMSIPCodec]]) - currentCodecIndex = i; - [codecPopUp addItemWithTitle:[codecs objectAtIndex:i]]; + if ([defaults objectForKey:MGMSIPRecordFolder]==nil || [[defaults objectForKey:MGMSIPRecordFolder] isEqual:@""]) { + [defaults setObject:@"~/Desktop/" forKey:MGMSIPRecordFolder]; } - [codecPopUp selectItemAtIndex:currentCodecIndex]; + [recordedCallsField setStringValue:[defaults objectForKey:MGMSIPRecordFolder]]; NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter]; [notificationCenter addObserver:self selector:@selector(volumeChanged:) name:MGMSIPVolumeChangedNotification object:nil]; @@ -99,6 +98,8 @@ //[[MGMSIP sharedSIP] restart]; } [mainView release]; + [codecs release]; + [codecWindow release]; [super dealloc]; } + (void)setUpToolbarItem:(NSToolbarItem *)theItem { @@ -253,8 +254,76 @@ [[NSUserDefaults standardUserDefaults] setObject:[userAgentField stringValue] forKey:MGMSIPUserAgent]; shouldRestart = YES; } -- (IBAction)codec:(id)sender { - [[MGMSIP sharedSIP] setTopCodec:[[codecPopUp selectedItem] title]]; +- (IBAction)recordedCallsFolder:(id)sender { + [[NSUserDefaults standardUserDefaults] setObject:[logFileField stringValue] forKey:MGMSIPRecordFolder]; +} +- (IBAction)chooseRecordedCallsFolder:(id)sender { + NSOpenPanel *panel = [NSOpenPanel openPanel]; + [panel setCanChooseDirectories:YES]; + [panel setCanChooseFiles:NO]; + int returnCode; + returnCode = [panel runModal]; + if (returnCode==NSOKButton) { + NSString *path = [[panel URL] path]; + [recordedCallsField setStringValue:path]; + [[NSUserDefaults standardUserDefaults] setObject:path forKey:MGMSIPRecordFolder]; + } +} +- (void)reloadCodecs { + NSDictionary *allCodecs = [[MGMSIP sharedSIP] codecs]; + NSArray *codecKeys = [allCodecs allKeys]; + [codecs release]; + codecs = [NSMutableArray new]; + for (int i=0; i<[codecKeys count]; i++) { + [codecs addObject:[NSDictionary dictionaryWithObjectsAndKeys:[codecKeys objectAtIndex:i], MGMCodecName, [allCodecs objectForKey:[codecKeys objectAtIndex:i]], MGMCodecPriority, nil]]; + } + if ([[codecView sortDescriptors] count]==0) { + [codecView setSortDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:MGMCodecName ascending:YES] autorelease]]]; + } + [codecs sortUsingDescriptors:[codecView sortDescriptors]]; + [codecView reloadData]; +} +- (IBAction)showCodecs:(id)sender { + [self reloadCodecs]; + [[NSApplication sharedApplication] beginSheet:codecWindow modalForWindow:[preferences preferencesWindow] modalDelegate:nil didEndSelector:nil contextInfo:nil]; +} +- (IBAction)hideCodecs:(id)sender { + [[NSApplication sharedApplication] endSheet:codecWindow returnCode:NSCancelButton]; + [codecWindow orderOut:sender]; +} + +- (NSInteger)numberOfRowsInTableView:(NSTableView *)theTableView { + return [codecs count]; +} +- (id)tableView:(NSTableView *)theTableView objectValueForTableColumn:(NSTableColumn *)theColumn row:(NSInteger)rowIndex { + if ([[theColumn identifier] isEqualToString:MGMCodecName]) { + return [[codecs objectAtIndex:rowIndex] objectForKey:MGMCodecName]; + } else if ([[theColumn identifier] isEqualToString:MGMCodecPriority]) { + return [[codecs objectAtIndex:rowIndex] objectForKey:MGMCodecPriority]; + } + return @""; +} +- (BOOL)tableView:(NSTableView *)theTableView shouldEditTableColumn:(NSTableColumn *)theColumn row:(NSInteger)rowIndex { + if ([[theColumn identifier] isEqualToString:MGMCodecPriority]) + return YES; + return NO; +} +- (void)tableView:(NSTableView *)theTableView setObjectValue:(id)theValue forTableColumn:(NSTableColumn *)theColumn row:(NSInteger)rowIndex { + NSString *codecName = [[codecs objectAtIndex:rowIndex] objectForKey:MGMCodecName]; + unsigned int priority = [theValue unsignedIntValue]; + if (priority>255) + priority = 255; + [codecs replaceObjectAtIndex:rowIndex withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:priority], MGMCodecPriority, codecName, MGMCodecName, nil]]; + [[MGMSIP sharedSIP] setPriority:priority forCodec:codecName]; + [codecs sortUsingDescriptors:[theTableView sortDescriptors]]; + [theTableView reloadData]; +} +- (BOOL)tableView:(NSTableView *)aTableView shouldSelectTableColumn:(NSTableColumn *)aTableColumn { + return NO; +} +- (void)tableView:(NSTableView *)theTableView sortDescriptorsDidChange:(NSArray *)oldDescriptors { + [codecs sortUsingDescriptors:[theTableView sortDescriptors]]; + [theTableView reloadData]; } @end #endif \ No newline at end of file diff --git a/Classes/VoiceMac/SIP/MGMSIPCallWindow.m b/Classes/VoiceMac/SIP/MGMSIPCallWindow.m index f72c5a5..557b300 100644 --- a/Classes/VoiceMac/SIP/MGMSIPCallWindow.m +++ b/Classes/VoiceMac/SIP/MGMSIPCallWindow.m @@ -289,7 +289,7 @@ NSString * const MGMSCTitleNoNameFormat = @"Call With %@"; [call stopRecording]; } else { NSFileManager *manager = [NSFileManager defaultManager]; - NSString *baseName = [[NSString stringWithFormat:@"~/Desktop/Call With %@ - ", phoneNumber] stringByExpandingTildeInPath]; + NSString *baseName = [[[[NSUserDefaults standardUserDefaults] objectForKey:MGMSIPRecordFolder] stringByExpandingTildeInPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"Call With %@ - ", phoneNumber]]; NSString *name = nil; for (int i=1; i<50; i++) { // Not like someone will have 50 recordings with one person on their desktop... name = [[baseName stringByAppendingFormat:@"%02d", i] stringByAppendingPathExtension:MGMWavExt]; diff --git a/Resources/VoiceMac/Info.plist b/Resources/VoiceMac/Info.plist index 0e50dc9..83ef85d 100644 --- a/Resources/VoiceMac/Info.plist +++ b/Resources/VoiceMac/Info.plist @@ -68,7 +68,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3 + 0.4 CFBundleSignature ???? CFBundleURLTypes @@ -105,7 +105,7 @@ CFBundleVersion - 0.3 + 0.4 MGMGRBugsEmail bugs@mrgeckosmedia.com MGMGRContactEmail @@ -131,7 +131,7 @@ SUEnableSystemProfiling SUFeedURL - http://mrgeckosmedia.com/applications/appcast/VoiceMac + https://mrgeckosmedia.com/applications/appcast/VoiceMac SUPublicDSAKeyFile dsa_pub.pem SUScheduledCheckInterval diff --git a/Resources/VoiceMac/Preferences/English.lproj/SIPPane.xib b/Resources/VoiceMac/Preferences/English.lproj/SIPPane.xib index 67b784d..b196b7c 100644 --- a/Resources/VoiceMac/Preferences/English.lproj/SIPPane.xib +++ b/Resources/VoiceMac/Preferences/English.lproj/SIPPane.xib @@ -2,30 +2,44 @@ 1050 - 10J567 - 823 - 1038.35 - 462.00 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 3084 - + YES - + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSMenu + NSPopUpButton + NSPopUpButtonCell + NSScrollView + NSScroller + NSSlider + NSSliderCell + NSTabView + NSTabViewItem + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell + NSView + NSWindowTemplate YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -48,7 +62,8 @@ 12 {{13, 10}, {454, 255}} - + + YES @@ -63,10 +78,11 @@ 268 {{14, 186}, {158, 17}} + YES - 68288064 + 68157504 71304192 Speaker Volume: @@ -79,9 +95,9 @@ 6 System controlColor - + 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -94,16 +110,18 @@ + NO 268 {{14, 150}, {158, 17}} + YES - 68288064 + 68157504 71304192 Microphone Volume: @@ -111,16 +129,18 @@ + NO 268 {{14, 61}, {158, 17}} + YES - 68288064 + 68157504 71304192 Echo Cancelation: @@ -128,16 +148,18 @@ + NO 268 {{14, 35}, {158, 17}} + YES - 68288064 + 68157504 71304192 Voice Activity Detection: @@ -145,16 +167,18 @@ + NO 268 {{175, 175}, {244, 25}} + YES - -2080244224 + -2080374784 0 @@ -167,16 +191,18 @@ NO NO + NO 268 {{175, 139}, {244, 25}} + YES - -2080244224 + -2080374784 0 @@ -189,21 +215,23 @@ NO NO + NO 268 {{175, 60}, {18, 18}} + YES - -2080244224 + -2080374784 0 - 1215582719 + 1215582464 2 NSImage @@ -217,21 +245,23 @@ 200 25 + NO 268 {{175, 34}, {18, 18}} + YES - -2080244224 + -2080374784 0 - 1215582719 + 1215582464 2 @@ -240,16 +270,18 @@ 200 25 + NO 268 {{14, 113}, {158, 17}} + YES - 68288064 + 68157504 71304192 Audio Output: @@ -257,16 +289,18 @@ + NO 268 {{14, 87}, {158, 17}} + YES - 68288064 + 68157504 71304192 Audio Input: @@ -274,20 +308,22 @@ + NO 268 {{174, 107}, {246, 26}} + YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -308,20 +344,22 @@ YES 2 + NO 268 {{174, 81}, {246, 26}} + YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 129 @@ -342,10 +380,12 @@ YES 2 + NO {{10, 33}, {434, 209}} + Sound @@ -367,7 +407,7 @@ YES - 68288064 + 68157504 71304192 Outbound Proxy Host: @@ -375,6 +415,7 @@ + NO @@ -384,7 +425,7 @@ YES - 68288064 + 68157504 71304192 Outbound Proxy Port: @@ -392,6 +433,7 @@ + NO @@ -401,7 +443,7 @@ YES - 68288064 + 68157504 71304192 STUN Server: @@ -409,6 +451,7 @@ + NO @@ -418,7 +461,7 @@ YES - 68288064 + 68157504 71304192 STUN Server Port: @@ -426,6 +469,7 @@ + NO @@ -435,7 +479,7 @@ YES - 68288064 + 68157504 71304192 Use Name Servers: @@ -443,6 +487,7 @@ + NO @@ -452,7 +497,7 @@ YES - 68288064 + 68157504 71304192 Local Port: @@ -460,6 +505,7 @@ + NO @@ -469,7 +515,7 @@ YES - 68288064 + 68157504 71304192 Use ICE: @@ -477,6 +523,7 @@ + NO @@ -486,7 +533,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -496,7 +543,7 @@ 6 System textBackgroundColor - + 3 MQA @@ -508,6 +555,7 @@ + NO @@ -517,7 +565,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -526,6 +574,7 @@ + NO @@ -535,7 +584,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -545,6 +594,7 @@ + NO @@ -554,7 +604,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -563,6 +613,7 @@ + NO @@ -572,7 +623,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -581,6 +632,7 @@ + NO @@ -590,7 +642,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -600,6 +652,7 @@ + NO @@ -609,12 +662,12 @@ YES - -2080244224 + -2080374784 0 - 1215582719 + 1215582464 2 @@ -623,21 +676,21 @@ 200 25 + NO 268 {{162, 9}, {18, 18}} - YES - -2080244224 + -2080374784 0 - 1215582719 + 1215582464 2 @@ -646,6 +699,7 @@ 200 25 + NO @@ -655,7 +709,7 @@ YES - 68288064 + 68157504 272630784 System decides if empty. @@ -663,6 +717,7 @@ + NO {{10, 33}, {434, 209}} @@ -687,7 +742,7 @@ YES - 68288064 + 68157504 71304192 Log File: @@ -695,6 +750,7 @@ + NO @@ -704,7 +760,7 @@ YES - 68288064 + 68157504 71304192 Log File Level: @@ -712,6 +768,7 @@ + NO @@ -721,7 +778,7 @@ YES - 68288064 + 68157504 71304192 Console Log Level: @@ -729,6 +786,7 @@ + NO @@ -738,7 +796,7 @@ YES - 68288064 + 68157504 71304192 Public Address: @@ -746,6 +804,7 @@ + NO @@ -755,7 +814,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -764,6 +823,7 @@ + NO @@ -773,7 +833,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -782,6 +842,7 @@ + NO @@ -791,7 +852,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -800,6 +861,7 @@ + NO @@ -809,7 +871,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -818,6 +880,7 @@ + NO @@ -827,18 +890,78 @@ YES - 67239424 + 67108864 134217728 Choose - -2038284033 + -2038284288 129 200 25 + NO + + + + 268 + {{14, 46}, {122, 17}} + + + YES + + 68157504 + 71304192 + Recorded Calls: + + + + + + NO + + + + 268 + {{141, 44}, {193, 22}} + + + YES + + -1804599231 + 272630784 + + + + YES + + + + NO + + + + 268 + {{336, 38}, {87, 32}} + + + YES + + 67108864 + 134217728 + Choose + + + -2038284288 + 129 + + + 200 + 25 + + NO @@ -848,7 +971,7 @@ YES - 68288064 + 68157504 71304192 User Agent: @@ -856,16 +979,17 @@ + NO 268 {{141, 72}, {276, 22}} - + YES - -1804468671 + -1804599231 272630784 @@ -874,55 +998,49 @@ + NO 268 - {{14, 46}, {122, 17}} + {{14, 17}, {122, 17}} + YES - 68288064 + 68157504 71304192 - Top Codec: + Codec: + NO - + 268 - {{138, 40}, {282, 26}} + {{135, 8}, {163, 32}} + + _NS:9 YES - - -2076049856 - 2048 + + 67108864 + 134217728 + Edit Codecs Priority - - 109199615 + _NS:9 + + -2038284288 129 - 400 - 75 - - YES - - OtherViews - - YES - - - - -1 - 1 - YES - YES - 2 + 200 + 25 + NO {{10, 33}, {434, 209}} @@ -946,9 +1064,297 @@ {480, 279} + NSView + + 15 + 2 + {{131, 159}, {385, 231}} + 1685586944 + Window + NSWindow + + + + + 256 + + YES + + + 268 + + YES + + + 2304 + + YES + + + 256 + {385, 179} + + + + _NS:13 + YES + NO + YES + + + 256 + {385, 17} + + + + _NS:16 + + + + + -2147483392 + {{224, 0}, {16, 17}} + + _NS:19 + + + YES + + name + 305.8046875 + 40 + 1000 + + 75497536 + 2048 + Codec + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + + + + 337641536 + 2048 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + + 3 + YES + YES + + + name + YES + compare: + + + + priority + 73 + 40 + 1000 + + 75497536 + 2048 + Priority + + + + + + 337641536 + 2048 + Text Cell + + + + + + 3 + YES + YES + + + priority + YES + compare: + + + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 17 + -700448768 + + + MGMCodecView + 4 + 15 + 0 + YES + 0 + 1 + + + {{1, 17}, {385, 179}} + + + + _NS:11 + + + 4 + + + + -2147483392 + {{224, 17}, {15, 102}} + + + + _NS:58 + NO + + _doScroller: + 37 + 0.1947367936372757 + + + + -2147483392 + {{1, 119}, {223, 15}} + + + + _NS:60 + NO + 1 + + _doScroller: + 0.57142859697341919 + + + + 2304 + + YES + + + {{1, 0}, {385, 17}} + + + + _NS:15 + + + 4 + + + {{-1, 35}, {387, 197}} + + + + _NS:9 + 133682 + + + + + QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 + + + + 268 + {{309, 2}, {73, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Done + + _NS:9 + + -2038284288 + 129 + + DQ + 200 + 25 + + NO + + + + 268 + {{6, 9}, {235, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Notes: 255 is max and 0 is disabled. + + _NS:1535 + + + + + NO + + + {385, 231} + + + + _NS:20 + + {{0, 0}, {1440, 878}} + {10000000000000, 10000000000000} + YES + @@ -1266,20 +1672,76 @@ 172 - - codecPopUp + + hideCodecs: - + - 181 + 200 - codec: + showCodecs: - + - 182 + 201 + + + + codecWindow + + + + 202 + + + + codecView + + + + 203 + + + + recordedCallsFolder: + + + + 214 + + + + chooseRecordedCallsFolder: + + + + 215 + + + + recordedCallsField + + + + 216 + + + + dataSource + + + + 198 + + + + delegate + + + + 199 @@ -1287,7 +1749,9 @@ YES 0 - + + YES + @@ -1365,8 +1829,11 @@ + + + - + @@ -2009,30 +2476,173 @@ - 175 - + 183 + YES - + + + + + + 184 + + + YES + + + + + + + + 185 + + + YES + + + + + + + + + 186 + + + YES + + + + + + + 187 + + + + + 188 + + + + + 189 + + + + + 190 + + + YES + + + + + + 191 + + + YES + + + + + + 192 + + + + + 193 + + + + + 194 + + + YES + - 176 - - - YES - - - + 195 + + - 177 - + 196 + YES + - + + + + 197 + + + + + 204 + + + YES + + + + + + 205 + + + + + 206 + + + YES + + + + + + 207 + + + YES + + + + + + 208 + + + YES + + + + + + 209 + + + + + 210 + + + + + 211 + + @@ -2040,10 +2650,10 @@ YES YES - 1.IBEditorWindowLastContentRect + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency 1.IBPluginDependency - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect 100.IBPluginDependency 137.IBPluginDependency 138.IBPluginDependency @@ -2051,25 +2661,43 @@ 140.IBPluginDependency 141.IBPluginDependency 142.IBPluginDependency - 143.IBEditorWindowLastContentRect 143.IBPluginDependency 147.IBPluginDependency 148.IBPluginDependency - 149.IBEditorWindowLastContentRect 149.IBPluginDependency 166.IBPluginDependency - 166.IBViewBoundsToFrameTransform 167.IBPluginDependency 168.IBPluginDependency 169.IBPluginDependency 173.IBPluginDependency - 173.IBViewBoundsToFrameTransform 174.IBPluginDependency - 175.IBPluginDependency - 176.IBPluginDependency - 177.IBEditorWindowLastContentRect - 177.IBPluginDependency + 183.IBPluginDependency + 183.NSWindowTemplate.visibleAtLaunch + 184.IBPluginDependency + 185.IBPluginDependency + 186.IBPluginDependency + 187.IBPluginDependency + 188.IBPluginDependency + 189.IBPluginDependency + 190.IBPluginDependency + 191.IBPluginDependency + 192.IBPluginDependency + 193.IBPluginDependency + 194.IBPluginDependency + 195.IBPluginDependency + 196.IBPluginDependency + 197.IBPluginDependency 2.IBPluginDependency + 204.IBPluginDependency + 205.IBPluginDependency + 206.IBPluginDependency + 207.IBPluginDependency + 208.IBPluginDependency + 209.IBPluginDependency + 210.IBPluginDependency + 211.IBPluginDependency + 23.IBPluginDependency + 24.IBPluginDependency 25.IBPluginDependency 26.IBPluginDependency 27.IBPluginDependency @@ -2140,12 +2768,8 @@ 98.IBPluginDependency 99.IBPluginDependency - + YES - {{321, 477}, {480, 279}} - com.apple.InterfaceBuilder.CocoaPlugin - {628, 654} - {{217, 442}, {480, 272}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2153,27 +2777,45 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{508, 579}, {246, 4}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{508, 553}, {246, 4}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAwrIAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBYAAAwrIAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{471, 565}, {282, 4}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2250,24 +2892,28 @@ YES - - YES - + YES - - YES - + - 182 + 216 YES + + MGMPreferencesPane + NSObject + + IBProjectSource + ./Classes/MGMPreferencesPane.h + + MGMSIPPane MGMPreferencesPane @@ -2280,9 +2926,10 @@ STUNServerPort: audio: chooseLogFile: - codec: + chooseRecordedCallsFolder: consoleLogLevel: echoCancelation: + hideCodecs: localPort: logFile: logFileLevel: @@ -2291,11 +2938,13 @@ outboundProxyHost: outboundProxyPort: publicAddress: + recordedCallsFolder: + showCodecs: userAgent: voiceActivityDetection: volume: - + YES id id @@ -2316,6 +2965,9 @@ id id id + id + id + id @@ -2327,9 +2979,10 @@ STUNServerPort: audio: chooseLogFile: - codec: + chooseRecordedCallsFolder: consoleLogLevel: echoCancelation: + hideCodecs: localPort: logFile: logFileLevel: @@ -2338,11 +2991,13 @@ outboundProxyHost: outboundProxyPort: publicAddress: + recordedCallsFolder: + showCodecs: userAgent: voiceActivityDetection: volume: - + YES ICE: @@ -2365,7 +3020,7 @@ id - codec: + chooseRecordedCallsFolder: id @@ -2376,6 +3031,10 @@ echoCancelation: id + + hideCodecs: + id + localPort: id @@ -2408,6 +3067,14 @@ publicAddress: id + + recordedCallsFolder: + id + + + showCodecs: + id + userAgent: id @@ -2431,7 +3098,8 @@ STUNServerPortField audioInputPopUp audioOutputPopUp - codecPopUp + codecView + codecWindow consoleLogLevelField echoCancelationButton localPortField @@ -2444,18 +3112,20 @@ outboundProxyHostField outboundProxyPortField publicAddressField + recordedCallsField userAgentField voiceActivityDetectionButton volumeSlider - + YES NSButton NSTextField NSTextField NSPopUpButton NSPopUpButton - NSPopUpButton + NSTableView + NSWindow NSTextField NSButton NSTextField @@ -2469,6 +3139,7 @@ NSTextField NSTextField NSTextField + NSTextField NSButton NSSlider @@ -2482,7 +3153,8 @@ STUNServerPortField audioInputPopUp audioOutputPopUp - codecPopUp + codecView + codecWindow consoleLogLevelField echoCancelationButton localPortField @@ -2495,11 +3167,12 @@ outboundProxyHostField outboundProxyPortField publicAddressField + recordedCallsField userAgentField voiceActivityDetectionButton volumeSlider - + YES ICEButton @@ -2522,8 +3195,12 @@ NSPopUpButton - codecPopUp - NSPopUpButton + codecView + NSTableView + + + codecWindow + NSWindow consoleLogLevelField @@ -2573,6 +3250,10 @@ publicAddressField NSTextField + + recordedCallsField + NSTextField + userAgentField NSTextField @@ -2589,631 +3270,10 @@ IBProjectSource - Classes/VoiceMac/Preferences/MGMSIPPane.h + ./Classes/MGMSIPPane.h - - YES - - MGMPreferencesPane - NSObject - - IBFrameworkSource - MGMUsers.framework/Headers/MGMPreferencesPane.h - - - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItemCell - NSButtonCell - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItemCell.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureFileOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureView.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTMovie.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTMovieView.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CIImageProvider.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSPopUpButtonCell - NSMenuItemCell - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButtonCell.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSSlider - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSlider.h - - - - NSSliderCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSliderCell.h - - - - NSTabView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTabView.h - - - - NSTabViewItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTabViewItem.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - 0 IBCocoaFramework @@ -3226,7 +3286,6 @@ YES - ../../../../VoiceMac.xcodeproj 3 NSSwitch diff --git a/SIP/install b/SIP/install index 7e3312e..3b8515d 100755 --- a/SIP/install +++ b/SIP/install @@ -1,6 +1,6 @@ #!/bin/bash -PPCFLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -arch ppc -ggdb" +PPCFLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -arch ppc -ggdb -DPJMEDIA_HAS_G7221_CODEC=1 -DPJMEDIA_HAS_G711_CODEC=1" PPCCC="/Applications/Xcode.app/Contents/Developer/usr/bin/gcc-4.2" PPCCXX="/Applications/Xcode.app/Contents/Developer/usr/bin/g++-4.2" PPCAR="/Applications/Xcode.app/Contents/Developer/usr/bin/ar rv" @@ -9,14 +9,14 @@ PPCHOST="ppc-apple-darwin10" PPCPATH="${PWD}/opt-ppc" PPCLDFLAGS="-arch ppc -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk" -I386FLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -arch i386 -ggdb" +I386FLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -arch i386 -ggdb -DPJMEDIA_HAS_G7221_CODEC=1 -DPJMEDIA_HAS_G711_CODEC=1" I386CC="/Applications/Xcode.app/Contents/Developer/usr/bin/gcc-4.2" I386CXX="/Applications/Xcode.app/Contents/Developer/usr/bin/g++-4.2" I386HOST="i386-apple-darwin10" I386PATH="${PWD}/opt-i386" I386LDFLAGS="-arch i386" -X86_64FLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch x86_64 -ggdb" +X86_64FLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch x86_64 -ggdb -DPJMEDIA_HAS_G7221_CODEC=1 -DPJMEDIA_HAS_G711_CODEC=1" X86_64CC="/Applications/Xcode.app/Contents/Developer/usr/bin/gcc-4.2" X86_64CXX="/Applications/Xcode.app/Contents/Developer/usr/bin/g++-4.2" X86_64HOST="x86_64-apple-darwin10" @@ -204,6 +204,7 @@ if [ "$1" = "" ]; then lipo -create "${PPCPATH}/lib/libpjlib-util-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjlib-util-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjlib-util-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjlib-util.a" lipo -create "${PPCPATH}/lib/libpjmedia-audiodev-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjmedia-audiodev-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjmedia-audiodev-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjmedia-audiodev.a" lipo -create "${PPCPATH}/lib/libpjmedia-codec-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjmedia-codec-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjmedia-codec-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjmedia-codec.a" + lipo -create "${PPCPATH}/lib/libpjmedia-videodev-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjmedia-videodev-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjmedia-videodev-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjmedia-videodev.a" lipo -create "${PPCPATH}/lib/libpjmedia-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjmedia-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjmedia-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjmedia.a" lipo -create "${PPCPATH}/lib/libpjnath-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjnath-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjnath-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjnath.a" lipo -create "${PPCPATH}/lib/libpjsip-powerpc-apple-darwin10.a" "${I386PATH}/lib/libpjsip-i386-apple-darwin10.a" "${X86_64PATH}/lib/libpjsip-simple-x86_64-apple-darwin10.a" -output "${FINALPATH}/lib/libpjsip-simple.a"