<div dir="ltr">Here is the proper version of this patch<div><br></div><div><div><br></div><div>---</div><div> Sources/VLCEventManager.m | 15 +++++++++++----</div><div> 1 file changed, 11 insertions(+), 4 deletions(-)</div>
<div><br></div><div>diff --git a/Sources/VLCEventManager.m b/Sources/VLCEventManager.m</div><div>index 143ed62..a918a72 100644</div><div>--- a/Sources/VLCEventManager.m</div><div>+++ b/Sources/VLCEventManager.m</div><div>
@@ -40,10 +40,10 @@ typedef enum</div><div> */</div><div> @interface message_t : NSObject</div><div> </div><div>-@property (nonatomic) id target; //< Target object that should receive the message (retained until method is called).</div>
<div>+@property (nonatomic, strong) id target; //< Target object that should receive the message (retained until method is called).</div><div> @property (nonatomic) SEL sel; //< A selector that identifies the message to be sent to the target.</div>
<div> @property (nonatomic, copy) NSString * name; //< Name to be used for NSNotification</div><div>-@property (nonatomic) id object; //< Object argument to pass to the target via the selector.</div>
<div>+@property (nonatomic, strong) id object; //< Object argument to pass to the target via the selector.</div><div> @property (nonatomic) message_type_t type; //< Type of queued message.</div>
<div> </div><div> @end</div><div>@@ -55,7 +55,7 @@ typedef enum</div><div> if (![object isKindOfClass:[message_t class]]) return NO;</div><div> </div><div> message_t *otherObject = object;</div><div>- BOOL notificatonMatches =</div>
<div>+ BOOL notificationMatches =</div><div> (otherObject.type == VLCNotification && [otherObject.name isEqualToString:<a href="http://self.name">self.name</a>]) ||</div><div> (otherObject.type == VLCObjectMethodWithArrayArg && [otherObject.object isEqual:self.object]) ||</div>
<div> (otherObject.type == VLCObjectMethodWithObjectArg && [otherObject.object isEqual:self.object]);</div><div>@@ -63,7 +63,7 @@ typedef enum</div><div> return [otherObject.target isEqual:_target] &&</div>
<div> otherObject.sel == self.sel &&</div><div> otherObject.type == self.type &&</div><div>- notificatonMatches;</div><div>+ notificationMatches;</div>
<div> }</div><div> </div><div> @end</div><div>@@ -79,6 +79,13 @@ typedef enum</div><div> }</div><div> </div><div> - (void)startEventLoop;</div><div>+- (void)callDelegateOfObjectAndSendNotificationWithArgs:(message_t *)message;</div>
<div>+- (void)callObjectMethodWithArgs:(message_t *)message;</div><div>+- (void)callDelegateOfObject:(id)aTarget withDelegateMethod:(SEL)aSelector withNotificationName:(NSString *)aNotificationName;</div><div>+- (pthread_cond_t *)signalData;</div>
<div>+- (pthread_mutex_t *)queueLock;</div><div>+</div><div>+- (void)addMessageToHandleOnMainThread:(message_t *)message;</div><div> </div><div> @end</div><div> </div><div>-- </div><div>1.8.5.2 (Apple Git-48)</div><div><br>
</div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On 7 July 2014 20:50, Florent Pillet <span dir="ltr"><<a href="mailto:fpillet@gmail.com" target="_blank">fpillet@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Actually do not apply this one now, there are a couple additional fixes I need to make due to the rebase</div>
<div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">On 7 July 2014 20:47, Florent Pillet <span dir="ltr"><<a href="mailto:fpillet@gmail.com" target="_blank">fpillet@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
Sources/VLCEventManager.m | 21 +++++++++++++++++----<br>
1 file changed, 17 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/Sources/VLCEventManager.m b/Sources/VLCEventManager.m<br>
index 143ed62..15e77fa 100644<br>
--- a/Sources/VLCEventManager.m<br>
+++ b/Sources/VLCEventManager.m<br>
@@ -40,10 +40,10 @@ typedef enum<br>
*/<br>
@interface message_t : NSObject<br>
<br>
-@property (nonatomic) id target; //< Target object that should receive the message (retained until method is called).<br>
+@property (nonatomic, strong) id target; //< Target object that should receive the message (retained until method is called).<br>
@property (nonatomic) SEL sel; //< A selector that identifies the message to be sent to the target.<br>
@property (nonatomic, copy) NSString * name; //< Name to be used for NSNotification<br>
-@property (nonatomic) id object; //< Object argument to pass to the target via the selector.<br>
+@property (nonatomic, strong) id object; //< Object argument to pass to the target via the selector.<br>
@property (nonatomic) message_type_t type; //< Type of queued message.<br>
<br>
@end<br>
@@ -55,7 +55,7 @@ typedef enum<br>
if (![object isKindOfClass:[message_t class]]) return NO;<br>
<br>
message_t *otherObject = object;<br>
- BOOL notificatonMatches =<br>
+ BOOL notificationMatches =<br>
(otherObject.type == VLCNotification && [otherObject.name isEqualToString:<a href="http://self.name" target="_blank">self.name</a>]) ||<br>
(otherObject.type == VLCObjectMethodWithArrayArg && [otherObject.object isEqual:self.object]) ||<br>
(otherObject.type == VLCObjectMethodWithObjectArg && [otherObject.object isEqual:self.object]);<br>
@@ -63,7 +63,7 @@ typedef enum<br>
return [otherObject.target isEqual:_target] &&<br>
otherObject.sel == self.sel &&<br>
otherObject.type == self.type &&<br>
- notificatonMatches;<br>
+ notificationMatches;<br>
}<br>
<br>
@end<br>
@@ -79,6 +79,14 @@ typedef enum<br>
}<br>
<br>
- (void)startEventLoop;<br>
+- (void)callDelegateOfObjectAndSendNotificationWithArgs:(message_t *)message;<br>
+- (void)callObjectMethodWithArgs:(message_t *)message;<br>
+- (void)callDelegateOfObject:(id)aTarget withDelegateMethod:(SEL)aSelector withNotificationName:(NSString *)aNotificationName;<br>
+- (pthread_cond_t *)signalData;<br>
+- (pthread_mutex_t *)queueLock;<br>
+- (NSMutableArray *)messageQueue;<br>
+<br>
+- (void)addMessageToHandleOnMainThread:(message_t *)message;<br>
<br>
@end<br>
<br>
@@ -329,6 +337,11 @@ static void * EventDispatcherMainLoop(void * user_data)<br>
method(delegate, aSelector, [NSNotification notificationWithName:aNotificationName object:aTarget]);<br>
}<br>
<br>
+- (NSMutableArray *)messageQueue<br>
+{<br>
+ return messageQueue;<br>
+}<br>
+<br>
- (pthread_cond_t *)signalData<br>
{<br>
return &_signalData;<br>
<span><font color="#888888">--<br>
1.8.5.2 (Apple Git-48)<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br>Florent Pillet<br><br>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Florent Pillet<br><br>
</div>