Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
3767759a
Commit
3767759a
authored
Jan 02, 2008
by
Pierre d'Herbemont
Browse files
MacOSX/Framework/VLCEventManager: Code cleanup. (Patch by Enrique Osuna).
parent
55bc65e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
extras/MacOSX/Framework/Headers/Internal/VLCEventManager.h
View file @
3767759a
...
...
@@ -28,7 +28,7 @@
/* This object is here to ensure safe inter thread communication */
@interface
VLCEventManager
:
NSObject
{
NSMutableArray
*
messageQueue
;
NSMutableArray
*
messageQueue
;
pthread_t
dispatcherThread
;
pthread_mutex_t
queueLock
;
pthread_cond_t
signalData
;
...
...
extras/MacOSX/Framework/Sources/VLCEventManager.m
View file @
3767759a
...
...
@@ -63,7 +63,7 @@ static void * EventDispatcherMainLoop(void * user_data)
{
NSAutoreleasePool
*
pool
=
[[
NSAutoreleasePool
alloc
]
init
];
struct
message
*
message
,
*
message_newer
=
NULL
;
NSData
*
dataMessage
;
NSData
*
dataMessage
;
int
i
;
/* Sleep a bit not to flood the interface */
...
...
@@ -72,7 +72,7 @@ static void * EventDispatcherMainLoop(void * user_data)
pthread_mutex_lock
(
[
self
queueLock
]
);
/* Wait until we have something on the queue */
while
([[
self
messageQueue
]
count
]
<=
0
)
while
(
[[
self
messageQueue
]
count
]
<=
0
)
{
pthread_cond_wait
(
[
self
signalData
],
[
self
queueLock
]
);
}
...
...
@@ -87,14 +87,14 @@ static void * EventDispatcherMainLoop(void * user_data)
{
for
(
i
=
0
;
i
<
[[
self
messageQueue
]
count
]
-
1
;
i
++
)
{
message_newer
=
(
struct
message
*
)[(
NSData
*
)[[
self
messageQueue
]
objectAtIndex
:
i
]
bytes
];
message_newer
=
(
struct
message
*
)[(
NSData
*
)[[
self
messageQueue
]
objectAtIndex
:
i
]
bytes
];
if
(
message_newer
->
type
==
VLCNotification
&&
message_newer
->
target
==
message
->
target
&&
[
message_newer
->
u
.
name
isEqualToString
:
message
->
u
.
name
]
)
{
[
message_newer
->
target
release
];
[
message
->
u
.
name
release
];
[[
self
messageQueue
]
removeObjectAtIndex
:
i
];
[
message
_newer
->
u
.
name
release
];
[[
self
messageQueue
]
removeObjectAtIndex
:
i
];
i
--
;
continue
;
}
...
...
@@ -112,8 +112,8 @@ static void * EventDispatcherMainLoop(void * user_data)
message_newer
->
sel
==
message
->
sel
)
{
if
(
!
newArg
)
newArg
=
[
NSMutableArray
arrayWithArray
:
message
->
u
.
object
];
[
newArg
addObjectsFromArray
:
message_newer
->
u
.
object
];
newArg
=
[
NSMutableArray
arrayWithArray
:
message
->
u
.
object
];
[
newArg
addObjectsFromArray
:
message_newer
->
u
.
object
];
[
message_newer
->
target
release
];
[
message_newer
->
u
.
object
release
];
[[
self
messageQueue
]
removeObjectAtIndex
:
i
];
...
...
@@ -142,7 +142,6 @@ static void * EventDispatcherMainLoop(void * user_data)
else
[
self
performSelectorOnMainThread
:
@selector
(
callObjectMethodWithArgs
:)
withObject
:
[
dataMessage
retain
]
/* released in the call */
waitUntilDone
:
YES
];
pthread_mutex_lock
(
[
self
queueLock
]
);
[[
self
messageQueue
]
removeLastObject
];
pthread_mutex_unlock
(
[
self
queueLock
]
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment