summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.mm
diff options
context:
space:
mode:
authordynaflash <[email protected]>2008-10-30 18:11:58 +0000
committerdynaflash <[email protected]>2008-10-30 18:11:58 +0000
commit39a4d09c458ecef7007890aaf9872842e041410f (patch)
treee96bcab8669d0b167f58bfecaaa7b9c1201d49d9 /macosx/Controller.mm
parenta9d513228bfebd402967d967e210d7dad4d5acf3 (diff)
MacGui: Acivity Logs for individual encodes initial implementation
- Individual activity logs are saved in the file format "YYYY-MM-DD HH-MM-SS mymoviename.txt". - Default directory is "~/Library/Application Support/HandBrake/EncodeLogs/". - Advanced preference available to alternatively put them in the users output movie directory with the output movie (by default set to "off"). - Renamed the existing contextual menu items for the Activity Window to better reflect choices (function remains the same) as follows: -- "Copy All Output" -> "Copy Window Contents". -- "Clear Output" -> "Clear Window Contents". -- "Open Log File" -> "Open Log File For This Session". -- "Clear Log File" -> "Clear Log File For This Session". - Added "Open Individual Log File Directory" to the Activity Window contextual menu to open this directory with the Finder - Also commented out some macgui based activity log messages that were used to troubleshoot the new queue. - Note: the individual activity logs are in addition to the existing session based activity log. If you do a scan of a new source during encoding, the new source scan log messages will be intermixed with the encode log messages as I have no clue how to separate stderr/stdout based on which instance of libhb is sending the messages. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1881 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r--macosx/Controller.mm17
1 files changed, 11 insertions, 6 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 2e7a93c82..5901249e2 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -748,8 +748,11 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[fWindow setFrame:frame display:YES animate:YES];
fRipIndicatorShown = NO;
}
-
- /* Check to see if the encode state has not been cancelled
+ /* Since we are done with this encode, tell output to stop writing to the
+ * individual encode log
+ */
+ [outputPanel endEncodeLog];
+ /* Check to see if the encode state has not been cancelled
to determine if we should check for encode done notifications */
if( fEncodeState != 2 )
{
@@ -2054,8 +2057,10 @@ fWorkingCount = 0;
/* Here we actually tell hb_scan to perform the source scan, using the path to source and title number*/
- (void) performNewQueueScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum
{
- //NSRunAlertPanel(@"Hello!", @"We are now performing a new queue scan!", @"OK", nil, nil);
-
+ /* Tell HB to output a new activity log file for this encode */
+ [outputPanel startEncodeLog:[[QueueFileArray objectAtIndex:currentQueueEncodeIndex] objectForKey:@"DestinationPath"]];
+
+
/* use a bool to determine whether or not we can decrypt using vlc */
BOOL cancelScanDecrypt = 0;
/* set the bool so that showNewScan knows to apply the appropriate queue
@@ -2437,10 +2442,10 @@ fWorkingCount = 0;
}
NSMutableDictionary * queueToApply = [QueueFileArray objectAtIndex:currentQueueEncodeIndex];
- [self writeToActivityLog: "processNewQueueEncode currentQueueEncodeIndex is: %d", currentQueueEncodeIndex];
+ //[self writeToActivityLog: "processNewQueueEncode currentQueueEncodeIndex is: %d", currentQueueEncodeIndex];
[self writeToActivityLog: "processNewQueueEncode number of passes expected is: %d", ([[queueToApply objectForKey:@"VideoTwoPass"] intValue] + 1)];
job->file = [[queueToApply objectForKey:@"DestinationPath"] UTF8String];
- [self writeToActivityLog: "processNewQueueEncode sending to prepareJob"];
+ //[self writeToActivityLog: "processNewQueueEncode sending to prepareJob"];
[self prepareJob];
if( [[queueToApply objectForKey:@"SubtitlesForced"] intValue] == 1 )
job->subtitle_force = 1;