Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
451
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
9f47a3a5
Commit
9f47a3a5
authored
9 years ago
by
Thomas Guillem
Browse files
Options
Downloads
Patches
Plain Diff
lua: use new ext dialog API
parent
183d5cda
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/lua/libs/dialog.c
+6
-5
6 additions, 5 deletions
modules/lua/libs/dialog.c
with
6 additions
and
5 deletions
modules/lua/libs/dialog.c
+
6
−
5
View file @
9f47a3a5
...
...
@@ -33,6 +33,7 @@
#endif
#include
<vlc_common.h>
#include
<vlc_dialog.h>
#include
<vlc_extensions.h>
#include
"../vlc.h"
...
...
@@ -249,9 +250,9 @@ static int vlclua_dialog_delete( lua_State *L )
msg_Dbg
(
p_mgr
,
"Deleting dialog '%s'"
,
p_dlg
->
psz_title
);
p_dlg
->
b_kill
=
true
;
lua_SetDialogUpdate
(
L
,
0
);
// Reset the update flag
dialog_ExtensionU
pdate
(
p_mgr
,
p_dlg
);
vlc_ext_dialog_u
pdate
(
p_mgr
,
p_dlg
);
/* After
dialog_ExtensionU
pdate, the UI thread must take the lock asap and
/* After
vlc_ext_dialog_u
pdate, the UI thread must take the lock asap and
* then signal us when it's done deleting the dialog.
*/
msg_Dbg
(
p_mgr
,
"Waiting for the dialog to be deleted..."
);
...
...
@@ -358,7 +359,7 @@ static int vlclua_dialog_update( lua_State *L )
extension_dialog_t
*
p_dlg
=
*
pp_dlg
;
// Updating dialog immediately
dialog_ExtensionU
pdate
(
p_mgr
,
p_dlg
);
vlc_ext_dialog_u
pdate
(
p_mgr
,
p_dlg
);
// Reset update flag
lua_SetDialogUpdate
(
L
,
0
);
...
...
@@ -400,7 +401,7 @@ int lua_DialogFlush( lua_State *L )
int
i_ret
=
VLC_SUCCESS
;
if
(
lua_GetDialogUpdate
(
L
)
)
{
i_ret
=
dialog_ExtensionU
pdate
(
vlclua_get_this
(
L
),
p_dlg
);
i_ret
=
vlc_ext_dialog_u
pdate
(
vlclua_get_this
(
L
),
p_dlg
);
lua_SetDialogUpdate
(
L
,
0
);
}
...
...
@@ -996,7 +997,7 @@ static int vlclua_dialog_delete_widget( lua_State *L )
p_widget
->
b_kill
=
true
;
lua_SetDialogUpdate
(
L
,
0
);
// Reset update flag
int
i_ret
=
dialog_ExtensionU
pdate
(
p_mgr
,
p_dlg
);
int
i_ret
=
vlc_ext_dialog_u
pdate
(
p_mgr
,
p_dlg
);
if
(
i_ret
!=
VLC_SUCCESS
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment