Skip to content

V
vlc-1.1
Commit 0fb33f81 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Cosmetic

parent 30410784
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/interface/interaction.c
View file @ 0fb33f81
...@@ -263,7 +263,7 @@ int __intf_Progress( vlc_object_t *p_this, const char *psz_title, ...@@ -263,7 +263,7 @@ int __intf_Progress( vlc_object_t *p_this, const char *psz_title,
p_new->psz_description = strdup( psz_status ); p_new->psz_description = strdup( psz_status );
p_new->val.f_float = f_pos; p_new->val.f_float = f_pos;
p_new->i_timeToGo = i_time; p_new->i_timeToGo = i_time;
p_new->psz_alternate_button = strdup( _("Cancel" ) ); p_new->psz_alternate_button = strdup( _( "Cancel" ) );
if( psz_title ) if( psz_title )
{ {
...@@ -310,6 +310,8 @@ void __intf_ProgressUpdate( vlc_object_t *p_this, int i_id, ...@@ -310,6 +310,8 @@ void __intf_ProgressUpdate( vlc_object_t *p_this, int i_id,
p_dialog->i_status = UPDATED_DIALOG; p_dialog->i_status = UPDATED_DIALOG;
vlc_mutex_unlock( &p_interaction->object_lock) ; vlc_mutex_unlock( &p_interaction->object_lock) ;
playlist_Signal( pl_Get( p_this ) );
} }
/** Helper function to communicate dialogue cancellations between the /** Helper function to communicate dialogue cancellations between the
...@@ -565,7 +567,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog ) ...@@ -565,7 +567,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) // Wait for answer if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) // Wait for answer
{ {
playlist_Signal( pl_Get(p_this) ); playlist_Signal( pl_Get( p_this ) );
while( p_dialog->i_status != ANSWERED_DIALOG && while( p_dialog->i_status != ANSWERED_DIALOG &&
p_dialog->i_status != HIDING_DIALOG && p_dialog->i_status != HIDING_DIALOG &&
p_dialog->i_status != HIDDEN_DIALOG && p_dialog->i_status != HIDDEN_DIALOG &&
...@@ -582,7 +584,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog ) ...@@ -582,7 +584,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
} }
p_dialog->i_flags |= DIALOG_GOT_ANSWER; p_dialog->i_flags |= DIALOG_GOT_ANSWER;
vlc_mutex_unlock( &p_interaction->object_lock ); vlc_mutex_unlock( &p_interaction->object_lock );
playlist_Signal( pl_Get(p_this) ); playlist_Signal( pl_Get( p_this ) );
return p_dialog->i_return; return p_dialog->i_return;
} }
else else
...@@ -590,7 +592,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog ) ...@@ -590,7 +592,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
// Pretend we already retrieved the "answer" // Pretend we already retrieved the "answer"
p_dialog->i_flags |= DIALOG_GOT_ANSWER; p_dialog->i_flags |= DIALOG_GOT_ANSWER;
vlc_mutex_unlock( &p_interaction->object_lock ); vlc_mutex_unlock( &p_interaction->object_lock );
playlist_Signal( pl_Get(p_this) ); playlist_Signal( pl_Get( p_this ) );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
} }
......
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