Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9d1b941b
Commit
9d1b941b
authored
Feb 04, 2016
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dialog: rename dialog_provider
It'll will be replaced by the new dialog API
parent
76294775
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
src/interface/dialog.c
src/interface/dialog.c
+5
-5
src/libvlc.c
src/libvlc.c
+1
-1
src/libvlc.h
src/libvlc.h
+1
-1
No files found.
src/interface/dialog.c
View file @
9d1b941b
...
...
@@ -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
;
...
...
src/libvlc.c
View file @
9d1b941b
...
...
@@ -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
);
...
...
src/libvlc.h
View file @
9d1b941b
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment