Commit 9d1b941b authored by Thomas Guillem's avatar Thomas Guillem

dialog: rename dialog_provider

It'll will be replaced by the new dialog API
parent 76294775
......@@ -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;
......
......@@ -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 );
......
......@@ -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
......
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