Commit de024680 authored by Cyril Deguet's avatar Cyril Deguet

* all: removed obsolete b_blocking in intf_dialogs_arg_t

parent c8016ca1
...@@ -90,11 +90,6 @@ struct intf_dialog_args_t ...@@ -90,11 +90,6 @@ struct intf_dialog_args_t
{ {
char *psz_title; char *psz_title;
vlc_bool_t b_blocking;
vlc_bool_t b_ready;
vlc_mutex_t lock;
vlc_cond_t wait;
char **psz_results; char **psz_results;
int i_results; int i_results;
......
...@@ -167,8 +167,6 @@ void Dialogs::showChangeSkin() ...@@ -167,8 +167,6 @@ void Dialogs::showChangeSkin()
(intf_dialog_args_t *)malloc( sizeof(intf_dialog_args_t) ); (intf_dialog_args_t *)malloc( sizeof(intf_dialog_args_t) );
memset( p_arg, 0, sizeof(intf_dialog_args_t) ); memset( p_arg, 0, sizeof(intf_dialog_args_t) );
p_arg->b_blocking = false;
p_arg->psz_title = strdup( _("Open a skin file") ); p_arg->psz_title = strdup( _("Open a skin file") );
p_arg->psz_extensions = p_arg->psz_extensions =
strdup( _("Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|") ); strdup( _("Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|") );
......
...@@ -316,14 +316,6 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event ) ...@@ -316,14 +316,6 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
p_arg->pf_callback( p_arg ); p_arg->pf_callback( p_arg );
} }
/* Blocking or not ? */
if( p_arg->b_blocking )
{
vlc_mutex_lock( &p_arg->lock );
p_arg->b_ready = 1;
vlc_cond_signal( &p_arg->wait );
}
if( p_arg->psz_results ) if( p_arg->psz_results )
{ {
for( int i = 0; i < p_arg->i_results; i++ ) for( int i = 0; i < p_arg->i_results; i++ )
...@@ -335,14 +327,7 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event ) ...@@ -335,14 +327,7 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
if( p_arg->psz_title ) free( p_arg->psz_title ); if( p_arg->psz_title ) free( p_arg->psz_title );
if( p_arg->psz_extensions ) free( p_arg->psz_extensions ); if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
if( p_arg->b_blocking ) free( p_arg );
{
vlc_mutex_unlock( &p_arg->lock );
}
else
{
free( p_arg );
}
} }
void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event ) void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
......
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