From de0246807e7e7ffee8a29b0049d1a26e54609261 Mon Sep 17 00:00:00 2001 From: Cyril Deguet Date: Tue, 24 Aug 2004 18:43:41 +0000 Subject: [PATCH] * all: removed obsolete b_blocking in intf_dialogs_arg_t --- include/vlc_interface.h | 5 ----- modules/gui/skins2/src/dialogs.cpp | 2 -- modules/gui/wxwindows/dialogs.cpp | 17 +---------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/include/vlc_interface.h b/include/vlc_interface.h index e2af220641..9182e3a6b2 100644 --- 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 e08097af08..c6900ed7ea 100644 --- 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 c5bce255f3..df521450bb 100644 --- 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 ) -- 2.39.2