Skip to content

V
vlc-gpu
Commit c10115a7 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

make use of new module_* API

parent 17413bf6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 14 deletions
modules/gui/wxwidgets/dialogs/open.cpp
View file @ c10115a7
...@@ -219,7 +219,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog, ...@@ -219,7 +219,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog,
intf_thread_t *_p_intf, intf_thread_t *_p_intf,
const module_t *p_module ) const module_t *p_module )
: wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize ), : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize ),
name( wxU(p_module->psz_object_name) ), name( wxU( module_GetObjName(p_module) ) ),
p_advanced_mrl_combo( NULL ), p_advanced_mrl_combo( NULL ),
p_intf( _p_intf ), p_open_dialog( dialog ), p_advanced_dialog( NULL ) p_intf( _p_intf ), p_open_dialog( dialog ), p_advanced_dialog( NULL )
{ {
...@@ -259,7 +259,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog, ...@@ -259,7 +259,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog,
/* Build the advanced dialog */ /* Build the advanced dialog */
p_advanced_dialog = p_advanced_dialog =
new wxDialog( this, -1, ((wxString)wxU(_("Advanced options"))) + new wxDialog( this, -1, ((wxString)wxU(_("Advanced options"))) +
wxT(" (") + wxU( p_module->psz_longname ) + wxT(")"), wxT(" (") + wxU( module_GetLongName(p_module) ) + wxT(")"),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ); wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
...@@ -502,47 +502,43 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -502,47 +502,43 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
notebook->AddPage( NetPanel( notebook ), wxU(_("Network")), notebook->AddPage( NetPanel( notebook ), wxU(_("Network")),
i_access_method == NET_ACCESS ); i_access_method == NET_ACCESS );
module_t *p_module = config_FindModule( VLC_OBJECT(p_intf), "v4l" ); module_t *p_module = module_Find( VLC_OBJECT(p_intf), "v4l" );
if( p_module ) if( p_module )
{ {
AutoBuiltPanel *autopanel = AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module ); new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel ); input_tab_array.Add( autopanel );
notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? notebook->AddPage( autopanel, wxU( module_GetName(p_module, VLC_FALSE) ),
p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS ); i_access_method == CAPTURE_ACCESS );
} }
p_module = config_FindModule( VLC_OBJECT(p_intf), "pvr" ); p_module = module_Find( VLC_OBJECT(p_intf), "pvr" );
if( p_module ) if( p_module )
{ {
AutoBuiltPanel *autopanel = AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module ); new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel ); input_tab_array.Add( autopanel );
notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? notebook->AddPage( autopanel, wxU( module_GetName(p_module, VLC_FALSE) ),
p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS ); i_access_method == CAPTURE_ACCESS );
} }
p_module = config_FindModule( VLC_OBJECT(p_intf), "dvb" ); p_module = module_Find( VLC_OBJECT(p_intf), "dvb" );
if( p_module ) if( p_module )
{ {
AutoBuiltPanel *autopanel = AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module ); new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel ); input_tab_array.Add( autopanel );
notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? notebook->AddPage( autopanel, wxU( module_GetName(p_module, VLC_FALSE) ),
p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS ); i_access_method == CAPTURE_ACCESS );
} }
p_module = config_FindModule( VLC_OBJECT(p_intf), "dshow" ); p_module = module_Find( VLC_OBJECT(p_intf), "dshow" );
if( p_module ) if( p_module )
{ {
AutoBuiltPanel *autopanel = AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module ); new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel ); input_tab_array.Add( autopanel );
notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? notebook->AddPage( autopanel, wxU( module_GetName(p_module, VLC_FALSE) ),
p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS ); i_access_method == CAPTURE_ACCESS );
} }
......
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