vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 19 16:41:53 2016 +0200| [06f2a64ba2eaec5beea490c0d89840d93102edfe] | committer: Rémi Denis-Courmont
playlist: remove useless intf-change object variable > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06f2a64ba2eaec5beea490c0d89840d93102edfe --- modules/control/dbus/dbus.c | 5 ----- modules/control/dbus/dbus_common.h | 1 - modules/gui/macosx/VLCMain.m | 2 -- modules/gui/macosx/VLCPlaylistInfo.m | 1 - modules/gui/ncurses.c | 2 -- src/playlist/engine.c | 3 --- 6 files changed, 14 deletions(-) diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c index ef5b13d..dd90941 100644 --- a/modules/control/dbus/dbus.c +++ b/modules/control/dbus/dbus.c @@ -236,7 +236,6 @@ static int Open( vlc_object_t *p_this ) p_sys->p_playlist = p_playlist; var_AddCallback( p_playlist, "input-current", AllCallback, p_intf ); - var_AddCallback( p_playlist, "intf-change", AllCallback, p_intf ); var_AddCallback( p_playlist, "volume", AllCallback, p_intf ); var_AddCallback( p_playlist, "mute", AllCallback, p_intf ); var_AddCallback( p_playlist, "playlist-item-append", AllCallback, p_intf ); @@ -298,7 +297,6 @@ static void Close ( vlc_object_t *p_this ) vlc_join( p_sys->thread, NULL ); var_DelCallback( p_playlist, "input-current", AllCallback, p_intf ); - var_DelCallback( p_playlist, "intf-change", AllCallback, p_intf ); var_DelCallback( p_playlist, "volume", AllCallback, p_intf ); var_DelCallback( p_playlist, "mute", AllCallback, p_intf ); var_DelCallback( p_playlist, "playlist-item-append", AllCallback, p_intf ); @@ -553,7 +551,6 @@ static void ProcessEvents( intf_thread_t *p_intf, vlc_dictionary_insert( &player_properties, "Metadata", NULL ); break; - case SIGNAL_INTF_CHANGE: case SIGNAL_PLAYLIST_ITEM_APPEND: case SIGNAL_PLAYLIST_ITEM_DELETED: { @@ -979,8 +976,6 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var, if( oldval.b_bool != newval.b_bool ) info.signal = SIGNAL_VOLUME_MUTED; } - else if( !strcmp( "intf-change", psz_var ) ) - info.signal = SIGNAL_INTF_CHANGE; else if( !strcmp( "playlist-item-append", psz_var ) ) info.signal = SIGNAL_PLAYLIST_ITEM_APPEND; else if( !strcmp( "playlist-item-deleted", psz_var ) ) diff --git a/modules/control/dbus/dbus_common.h b/modules/control/dbus/dbus_common.h index 85eb033..800c053 100644 --- a/modules/control/dbus/dbus_common.h +++ b/modules/control/dbus/dbus_common.h @@ -113,7 +113,6 @@ enum { SIGNAL_NONE=0, SIGNAL_ITEM_CURRENT, - SIGNAL_INTF_CHANGE, SIGNAL_PLAYLIST_ITEM_APPEND, SIGNAL_PLAYLIST_ITEM_DELETED, SIGNAL_INPUT_METADATA, diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m index 6fb71c8..7be456c 100644 --- a/modules/gui/macosx/VLCMain.m +++ b/modules/gui/macosx/VLCMain.m @@ -233,8 +233,6 @@ static VLCMain *sharedInstance = nil; _mainWindowController = [[NSWindowController alloc] initWithWindowNibName:@"MainWindow"]; - var_Create(p_intf, "intf-change", VLC_VAR_BOOL); - var_AddCallback(p_intf->obj.libvlc, "intf-toggle-fscontrol", ShowController, (__bridge void *)self); var_AddCallback(p_intf->obj.libvlc, "intf-show", ShowController, (__bridge void *)self); diff --git a/modules/gui/macosx/VLCPlaylistInfo.m b/modules/gui/macosx/VLCPlaylistInfo.m index 2745921..f2bca54 100644 --- a/modules/gui/macosx/VLCPlaylistInfo.m +++ b/modules/gui/macosx/VLCPlaylistInfo.m @@ -378,7 +378,6 @@ FREENULL( psz_##foo ); playlist_t *p_playlist = pl_Get(getIntf()); input_item_WriteMeta(VLC_OBJECT(p_playlist), p_item); - var_SetBool(p_playlist, "intf-change", true); [self updatePanelWithItem: p_item]; [_saveMetaDataButton setEnabled: NO]; diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index f429798..e523cc0 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1783,7 +1783,6 @@ static void cleanup_run(void *data) { intf_thread_t *intf = data; playlist_t *p_playlist = pl_Get(intf); - var_DelCallback(p_playlist, "intf-change", PlaylistChanged, intf); var_DelCallback(p_playlist, "item-change", ItemChanged, intf); var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf); } @@ -1797,7 +1796,6 @@ static void *Run(void *data) intf_sys_t *sys = intf->p_sys; playlist_t *p_playlist = pl_Get(intf); - var_AddCallback(p_playlist, "intf-change", PlaylistChanged, intf); var_AddCallback(p_playlist, "item-change", ItemChanged, intf); var_AddCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf); diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 9068f19..a295b80 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -412,9 +412,6 @@ void set_current_status_node( playlist_t * p_playlist, static void VariablesInit( playlist_t *p_playlist ) { /* These variables control updates */ - var_Create( p_playlist, "intf-change", VLC_VAR_BOOL ); - var_SetBool( p_playlist, "intf-change", true ); - var_Create( p_playlist, "item-change", VLC_VAR_ADDRESS ); var_Create( p_playlist, "leaf-to-parent", VLC_VAR_INTEGER ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
