MacGui: fixed a warning in HBOutputRedirect and removed an unused ivar.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6488 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m
index c59d70ac1b308ec2c45a3676cc147c24587405ad..47133d05e3c3e34e86eba23916c527236d9449d5 100644 (file)
--- a/macosx/HBOutputPanelController.m
+++ b/macosx/HBOutputPanelController.m
@@ -22,6 +22,9 @@
 // lets use this higher value for now for better gui debugging
 #define TextStorageLowerSizeLimit 120000
 
+@interface HBOutputPanelController () <HBOutputRedirectListening>
+@end
+
 @implementation HBOutputPanelController
 
 /**

diff --git a/macosx/HBOutputRedirect.h b/macosx/HBOutputRedirect.h
index 562f094099b6848c41c9ea0b6d01ffb074c87866..116463e6064a9430374d8d67937e047550647d53 100644 (file)
--- a/macosx/HBOutputRedirect.h
+++ b/macosx/HBOutputRedirect.h
@@ -7,6 +7,14 @@
 
 #import <Cocoa/Cocoa.h>
 
+
+@protocol HBOutputRedirectListening <NSObject>
+
+- (void)stdoutRedirect:(NSString *)text;
+- (void)stderrRedirect:(NSString *)text;
+
+@end
+
 /**
  * This class is used to redirect @c stdout and @c stderr outputs. It is never
  * created directly; @c stdoutRedirect and @c stderrRedirect class methods
@@ -31,15 +39,13 @@
        
        /// Pointer to old write function for the stream.
        int     (*oldWriteFunc)(void *, const char *, int);
-       
-       NSLock *lock;
 }
 
 + (id)stdoutRedirect;
 + (id)stderrRedirect;
 
-- (void)addListener:(id)aListener;
-- (void)removeListener:(id)aListener;
+- (void)addListener:(id <HBOutputRedirectListening>)aListener;
+- (void)removeListener:(id <HBOutputRedirectListening>)aListener;
 
 @end
 

diff --git a/macosx/HBOutputRedirect.m b/macosx/HBOutputRedirect.m
index f1ff10e58438e49e8230bd9755e71878805cc203..7239fe3cd2d6a4fa547b82119613c9481aa2a004 100644 (file)
--- a/macosx/HBOutputRedirect.m
+++ b/macosx/HBOutputRedirect.m
@@ -77,7 +77,7 @@ int   stderrwrite(void *inFD, const char *buffer, int size)
  * Adds specified object as listener for this output. Method @c stdoutRedirect:
  * or @c stderrRedirect: of the listener is called to redirect the output.
  */
-- (void)addListener:(id)aListener
+- (void)addListener:(id <HBOutputRedirectListening>)aListener
 {
        NSAssert2([aListener respondsToSelector:forwardingSelector], @"Object %@ doesn't respond to selector \"%@\"", aListener, NSStringFromSelector(forwardingSelector));
 
@@ -94,7 +94,7 @@ int   stderrwrite(void *inFD, const char *buffer, int size)
 /**
  * Stops forwarding for this output to the specified listener object.
  */
-- (void)removeListener:(id)aListener
+- (void)removeListener:(id <HBOutputRedirectListening>)aListener
 {
        if ([listeners containsObject:aListener])
        {
@@ -138,7 +138,6 @@ int stderrwrite(void *inFD, const char *buffer, int size)
                forwardingSelector = aSelector;
                stream = aStream;
                oldWriteFunc = NULL;
-               lock = [[NSLock alloc] init];
        }
        return self;
 }