vlc | branch: master | Thomas Guillem <[email protected]> | Thu Feb 4 11:46:56 2016 +0100| [9d1b941b159039d9f0a435900738c274278a7767] | committer: Thomas Guillem
dialog: rename dialog_provider It'll will be replaced by the new dialog API > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d1b941b159039d9f0a435900738c274278a7767 --- src/interface/dialog.c | 10 +++++----- src/libvlc.c | 2 +- src/libvlc.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/interface/dialog.c b/src/interface/dialog.c index 94450db..ca711c5 100644 --- a/src/interface/dialog.c +++ b/src/interface/dialog.c @@ -49,10 +49,10 @@ int dialog_Register (vlc_object_t *obj) int ret = VLC_EGENERIC; vlc_mutex_lock (&provider_lock); - if (priv->p_dialog_provider == NULL) + if (priv->p_legacy_dialog_provider == NULL) { /* Since the object is responsible for unregistering itself before * it terminates, at reference is not needed. */ - priv->p_dialog_provider = obj; + priv->p_legacy_dialog_provider = obj; ret = VLC_SUCCESS; } vlc_mutex_unlock (&provider_lock); @@ -72,9 +72,9 @@ int dialog_Unregister (vlc_object_t *obj) int ret = VLC_EGENERIC; vlc_mutex_lock (&provider_lock); - if (priv->p_dialog_provider == obj) + if (priv->p_legacy_dialog_provider == obj) { - priv->p_dialog_provider = NULL; + priv->p_legacy_dialog_provider = NULL; ret = VLC_SUCCESS; } vlc_mutex_unlock (&provider_lock); @@ -87,7 +87,7 @@ static vlc_object_t *dialog_GetProvider (vlc_object_t *obj) vlc_object_t *provider; vlc_mutex_lock (&provider_lock); - if ((provider = priv->p_dialog_provider) != NULL) + if ((provider = priv->p_legacy_dialog_provider) != NULL) vlc_object_hold (provider); vlc_mutex_unlock (&provider_lock); return provider; diff --git a/src/libvlc.c b/src/libvlc.c index a7d9a69..0b865ca 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -100,7 +100,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv = libvlc_priv (p_libvlc); priv->playlist = NULL; - priv->p_dialog_provider = NULL; + priv->p_legacy_dialog_provider = NULL; priv->p_vlm = NULL; vlc_ExitInit( &priv->exit ); diff --git a/src/libvlc.h b/src/libvlc.h index e18ee37..063854e 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -148,7 +148,7 @@ typedef struct libvlc_priv_t /* Singleton objects */ vlc_logger_t *logger; vlm_t *p_vlm; ///< the VLM singleton (or NULL) - vlc_object_t *p_dialog_provider; ///< dialog provider + vlc_object_t *p_legacy_dialog_provider; ///< dialog provider struct playlist_t *playlist; ///< Playlist for interfaces struct playlist_preparser_t *parser; ///< Input item meta data handler struct vlc_actions *actions; ///< Hotkeys handler _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
