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
6a25e4f9
Commit
6a25e4f9
authored
Feb 01, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Interaction: remove dummy new state
parent
33614823
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
include/vlc_interface.h
include/vlc_interface.h
+1
-2
src/interface/interaction.c
src/interface/interaction.c
+6
-9
No files found.
include/vlc_interface.h
View file @
6a25e4f9
...
...
@@ -252,8 +252,7 @@ enum
/** Possible status */
enum
{
NEW_DIALOG
,
///< Just created
SENT_DIALOG
,
///< Sent to interface
SENT_DIALOG
=
1
,
///< Sent to interface
UPDATED_DIALOG
,
///< Update to send
ANSWERED_DIALOG
,
///< Got "answer"
HIDING_DIALOG
,
///< Hiding requested
...
...
src/interface/interaction.c
View file @
6a25e4f9
...
...
@@ -77,7 +77,7 @@ static int DialogSend( interaction_dialog_t * );
if( !p_new ) return err; \
p_new->p_parent = vlc_object_hold( p_this ); \
p_new->b_cancelled = false; \
p_new->i_status =
NEW_DIALOG;
\
p_new->i_status =
SENT_DIALOG;
\
p_new->i_flags = 0; \
p_new->i_type = INTERACT_DIALOG_##type; \
p_new->psz_returned[0] = NULL; \
...
...
@@ -502,7 +502,12 @@ static int DialogSend( interaction_dialog_t *p_dialog )
p_dialog
->
i_flags
&
DIALOG_BLOCKING_ERROR
||
p_dialog
->
i_flags
&
DIALOG_NONBLOCKING_ERROR
)
{
vlc_value_t
val
;
p_dialog
->
p_interaction
=
p_interaction
;
p_dialog
->
i_action
=
INTERACT_NEW
;
val
.
p_address
=
p_dialog
;
var_Set
(
p_dialog
->
p_interface
,
"interaction"
,
val
);
/* Check if we have already added this dialog */
vlc_object_lock
(
p_interaction
);
...
...
@@ -612,14 +617,6 @@ static void InteractionManage( interaction_t *p_interaction )
i_index
--
;
DialogDestroy
(
p_dialog
);
break
;
case
NEW_DIALOG
:
/* This is truly a new dialog, send it. */
p_dialog
->
i_action
=
INTERACT_NEW
;
val
.
p_address
=
p_dialog
;
var_Set
(
p_dialog
->
p_interface
,
"interaction"
,
val
);
p_dialog
->
i_status
=
SENT_DIALOG
;
break
;
}
}
}
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