summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-03-03 17:26:47 +0000
committerdynaflash <[email protected]>2009-03-03 17:26:47 +0000
commite71371db07b6c0efafabc7f6ec5c3b2b57bb9fcb (patch)
tree63a7d17bbb17cb85c9d3d850ec38a028f25d1357 /macosx
parent34b9a9d0f67e507f296bb376b81789d10bdc8223 (diff)
MacGui: Report the svn version and arch in the session activity log and the individual encode log.
- ie. [11:25:22] macgui: Handbrake Version: svn2207 x86_64 (2009030301) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2209 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.mm2
-rw-r--r--macosx/HBOutputPanelController.m2
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index af86c9c1a..1239ef7f3 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -73,7 +73,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
fPresetsBuiltin = [[HBPresets alloc] init];
fPreferencesController = [[HBPreferencesController alloc] init];
/* Lets report the HandBrake version number here to the activity log and text log file */
- NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleGetInfoString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
+ NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
[self writeToActivityLog: "%s", [versionStringFull UTF8String]];
return self;
diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m
index 41506b9b2..0ae508d40 100644
--- a/macosx/HBOutputPanelController.m
+++ b/macosx/HBOutputPanelController.m
@@ -145,7 +145,7 @@
[fileManager createFileAtPath:outputLogFileForEncode contents:nil attributes:nil];
/* Similar to the regular activity log, we print a header containing the date and time of the encode as well as what directory it was encoded to */
- NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleGetInfoString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)\n\n", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
+ NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)\n\n", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]];
NSString *startOutputLogString = [NSString stringWithFormat: @"HandBrake Activity Log for %@: %@\n%@",outputFileForEncode, [[NSDate date] descriptionWithCalendarFormat:nil timeZone:nil locale:nil],versionStringFull];
[startOutputLogString writeToFile:outputLogFileForEncode atomically:YES encoding:NSUTF8StringEncoding error:NULL];