[vlc-devel] [PATCH 5/5] VLCKit: Removed a couple VLCEventManager unused internal methods, fixed a typo

[Florent Pillet]

Here is the proper version of this patch


---
 Sources/VLCEventManager.m | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Sources/VLCEventManager.m b/Sources/VLCEventManager.m
index 143ed62..a918a72 100644
--- a/Sources/VLCEventManager.m
+++ b/Sources/VLCEventManager.m
@@ -40,10 +40,10 @@ typedef enum
  */
 @interface message_t : NSObject

- at property (nonatomic) id target;    //< Target object that should receive
the message (retained until method is called).
+ at property (nonatomic, strong) id target;    //< Target object that should
receive the message (retained until method is called).
 @property (nonatomic) SEL sel;      //< A selector that identifies the
message to be sent to the target.
 @property (nonatomic, copy) NSString * name;           //< Name to be used
for NSNotification
- at property (nonatomic) id object;                  //< Object argument to
pass to the target via the selector.
+ at property (nonatomic, strong) id object;                  //< Object
argument to pass to the target via the selector.
 @property (nonatomic) message_type_t type;            //< Type of queued
message.

 @end
@@ -55,7 +55,7 @@ typedef enum
     if (![object isKindOfClass:[message_t class]]) return NO;

     message_t *otherObject = object;
-    BOOL notificatonMatches =
+    BOOL notificationMatches =
         (otherObject.type == VLCNotification              &&
[otherObject.name isEqualToString:self.name]) ||
         (otherObject.type == VLCObjectMethodWithArrayArg  &&
[otherObject.object isEqual:self.object]) ||
         (otherObject.type == VLCObjectMethodWithObjectArg &&
[otherObject.object isEqual:self.object]);
@@ -63,7 +63,7 @@ typedef enum
     return [otherObject.target isEqual:_target] &&
             otherObject.sel == self.sel         &&
             otherObject.type == self.type       &&
-            notificatonMatches;
+        notificationMatches;
 }

 @end
@@ -79,6 +79,13 @@ typedef enum
 }

 - (void)startEventLoop;
+- (void)callDelegateOfObjectAndSendNotificationWithArgs:(message_t
*)message;
+- (void)callObjectMethodWithArgs:(message_t *)message;
+- (void)callDelegateOfObject:(id)aTarget withDelegateMethod:(SEL)aSelector
withNotificationName:(NSString *)aNotificationName;
+- (pthread_cond_t *)signalData;
+- (pthread_mutex_t *)queueLock;
+
+- (void)addMessageToHandleOnMainThread:(message_t *)message;

 @end

-- 
1.8.5.2 (Apple Git-48)



On 7 July 2014 20:50, Florent Pillet <fpillet at gmail.com> wrote:

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


-- 
Florent Pillet
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20140707/bc0ab92f/attachment.html>