* all: removed obsolete b_blocking in intf_dialogs_arg_t

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index e2af220641e46f3428da3a19394a8644a262ef78..9182e3a6b240882a15470ba64c1d82a1675721b7 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -90,11 +90,6 @@ struct intf_dialog_args_t
 {
     char *psz_title;
 
-    vlc_bool_t  b_blocking;
-    vlc_bool_t  b_ready;
-    vlc_mutex_t lock;
-    vlc_cond_t  wait;
-
     char **psz_results;
     int  i_results;
 

diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index e08097af08191213e9c9ed877a524171d99401dd..c6900ed7ea54c1bed80698807fabe7875cd2efd6 100644 (file)
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -167,8 +167,6 @@ void Dialogs::showChangeSkin()
             (intf_dialog_args_t *)malloc( 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_extensions =
             strdup( _("Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml|") );

diff --git a/modules/gui/wxwindows/dialogs.cpp b/modules/gui/wxwindows/dialogs.cpp
index c5bce255f3ec8bc1f1924b1e6140a979dd72b6ec..df521450bbef9ff24f04970d13f7ae320ec556af 100644 (file)
--- a/modules/gui/wxwindows/dialogs.cpp
+++ b/modules/gui/wxwindows/dialogs.cpp
@@ -316,14 +316,6 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
         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 )
     {
         for( int i = 0; i < p_arg->i_results; i++ )
@@ -335,14 +327,7 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
     if( p_arg->psz_title ) free( p_arg->psz_title );
     if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
 
-    if( p_arg->b_blocking )
-    {
-        vlc_mutex_unlock( &p_arg->lock );
-    }
-    else
-    {
-        free( p_arg );
-    }
+    free( p_arg );
 }
 
 void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )