Commit d3b385e2 authored by David Fuhrmann's avatar David Fuhrmann

macosx: rename PLItemChanged to InputThreadChanged

This path is about the current input thread, not about playlist
items.
parent ff4982c0
...@@ -152,7 +152,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification"; ...@@ -152,7 +152,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
- (void)updateCurrentlyUsedHotkeys; - (void)updateCurrentlyUsedHotkeys;
- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event force:(BOOL)b_force; - (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event force:(BOOL)b_force;
- (void)PlaylistItemChanged; - (void)inputThreadChanged;
- (void)plItemUpdated; - (void)plItemUpdated;
- (void)playbackStatusUpdated; - (void)playbackStatusUpdated;
- (void)sendDistributedNotificationWithUpdatedPlaybackStatus; - (void)sendDistributedNotificationWithUpdatedPlaybackStatus;
......
...@@ -85,7 +85,7 @@ static void destroyProgressPanel (void *); ...@@ -85,7 +85,7 @@ static void destroyProgressPanel (void *);
static int InputEvent(vlc_object_t *, const char *, static int InputEvent(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *); vlc_value_t, vlc_value_t, void *);
static int PLItemChanged(vlc_object_t *, const char *, static int InputThreadChanged(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *); vlc_value_t, vlc_value_t, void *);
static int PLItemUpdated(vlc_object_t *, const char *, static int PLItemUpdated(vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *); vlc_value_t, vlc_value_t, void *);
...@@ -387,12 +387,12 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, ...@@ -387,12 +387,12 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int PLItemChanged(vlc_object_t *p_this, const char *psz_var, static int InputThreadChanged(vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t new_val, void *param) vlc_value_t oldval, vlc_value_t new_val, void *param)
{ {
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
[[VLCMain sharedInstance] performSelectorOnMainThread:@selector(PlaylistItemChanged) withObject:nil waitUntilDone:NO]; [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(inputThreadChanged) withObject:nil waitUntilDone:NO];
[o_pool release]; [o_pool release];
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -680,7 +680,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -680,7 +680,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_AddCallback(p_intf->p_libvlc, "intf-show", ShowController, self); var_AddCallback(p_intf->p_libvlc, "intf-show", ShowController, self);
var_AddCallback(p_intf->p_libvlc, "intf-boss", BossCallback, self); var_AddCallback(p_intf->p_libvlc, "intf-boss", BossCallback, self);
var_AddCallback(p_playlist, "item-change", PLItemUpdated, self); var_AddCallback(p_playlist, "item-change", PLItemUpdated, self);
var_AddCallback(p_playlist, "input-current", PLItemChanged, self); var_AddCallback(p_playlist, "input-current", InputThreadChanged, self);
var_AddCallback(p_playlist, "playlist-item-append", PLItemAppended, self); var_AddCallback(p_playlist, "playlist-item-append", PLItemAppended, self);
var_AddCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self); var_AddCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self);
var_AddCallback(p_playlist, "random", PlaybackModeUpdated, self); var_AddCallback(p_playlist, "random", PlaybackModeUpdated, self);
...@@ -796,7 +796,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -796,7 +796,7 @@ static VLCMain *_o_sharedMainInstance = nil;
* Thus, call additional updaters as we might miss these events if posted before * Thus, call additional updaters as we might miss these events if posted before
* the callbacks are registered. * the callbacks are registered.
*/ */
[self PlaylistItemChanged]; [self inputThreadChanged];
[self playbackModeUpdated]; [self playbackModeUpdated];
// respect playlist-autostart // respect playlist-autostart
...@@ -849,7 +849,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -849,7 +849,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_DelCallback(p_intf, "dialog-question", DialogCallback, self); var_DelCallback(p_intf, "dialog-question", DialogCallback, self);
var_DelCallback(p_intf, "dialog-progress-bar", DialogCallback, self); var_DelCallback(p_intf, "dialog-progress-bar", DialogCallback, self);
var_DelCallback(p_playlist, "item-change", PLItemUpdated, self); var_DelCallback(p_playlist, "item-change", PLItemUpdated, self);
var_DelCallback(p_playlist, "input-current", PLItemChanged, self); var_DelCallback(p_playlist, "input-current", InputThreadChanged, self);
var_DelCallback(p_playlist, "playlist-item-append", PLItemAppended, self); var_DelCallback(p_playlist, "playlist-item-append", PLItemAppended, self);
var_DelCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self); var_DelCallback(p_playlist, "playlist-item-deleted", PLItemRemoved, self);
var_DelCallback(p_playlist, "random", PlaybackModeUpdated, self); var_DelCallback(p_playlist, "random", PlaybackModeUpdated, self);
...@@ -1318,7 +1318,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1318,7 +1318,7 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
// This must be called on main thread // This must be called on main thread
- (void)PlaylistItemChanged - (void)inputThreadChanged
{ {
if (p_current_input) { if (p_current_input) {
var_DelCallback(p_current_input, "intf-event", InputEvent, [VLCMain sharedInstance]); var_DelCallback(p_current_input, "intf-event", InputEvent, [VLCMain sharedInstance]);
......
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