Commit 8fdbf0f2 authored by jwatzman's avatar jwatzman Committed by Felix Paul Kühne
Browse files

Revert "macosx: fixed compilation warning and potential, runtime exception"

This reverts commit 55e3f943

 and fixes it the right way. I'm honestly not sure what's going on in that commit -- it silences the compiler warning not by actually fixing the problem (which is that the method isn't declared in the interface) but just by not making the method call visible to the compiler! It also completely breaks the feature, by moving things onto the main thread that can't be there, causing a deadlock, as specifically noted in the comment right above this code.

In any event, it's easy enough to revert and add to the interface properly, silencing the compiler warning and unbreaking this extension feature.
Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 4dd7f02c
......@@ -183,6 +183,7 @@ struct intf_sys_t
- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event force:(BOOL)b_force;
- (void)PlaylistItemChanged;
- (void)informInputChanged;
- (void)playbackStatusUpdated;
- (void)sendDistributedNotificationWithUpdatedPlaybackStatus;
- (void)playbackModeUpdated;
......
......@@ -430,8 +430,8 @@ static int PLItemChanged(vlc_object_t *p_this, const char *psz_var,
* and other issues, we need to wait for -PlaylistItemChanged to finish and
* then -informInputChanged on this non-main thread. */
[o_plItemChangedLock lock];
[[VLCMain sharedInstance] performSelectorOnMainThread:@selector(PlaylistItemChanged) withObject:nil waitUntilDone:YES];
[[VLCMain sharedInstance] performSelectorOnMainThread:@selector(informInputChanged) withObject:nil waitUntilDone:YES];
[[VLCMain sharedInstance] performSelectorOnMainThread:@selector(PlaylistItemChanged) withObject:nil waitUntilDone:YES]; // MUST BE ON MAIN THREAD
[[VLCMain sharedInstance] informInputChanged]; // DO NOT MOVE TO MAIN THREAD
[o_plItemChangedLock unlock];
[o_pool release];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment