AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+ notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+ p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS );
}
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+ notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+ p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS );
}
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+ notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+ p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS );
}
AutoBuiltPanel *autopanel =
new AutoBuiltPanel( notebook, this, p_intf, p_module );
input_tab_array.Add( autopanel );
- notebook->AddPage( autopanel, wxU( p_module->psz_shortname ),
+ notebook->AddPage( autopanel, wxU( p_module->psz_shortname ?
+ p_module->psz_shortname : p_module->psz_object_name ),
i_access_method == CAPTURE_ACCESS );
}
{
p_sd_menu->AppendCheckItem( FirstSD_Event + i_number ,
wxU( p_parser->psz_longname ? p_parser->psz_longname :
- p_parser->psz_shortname ) );
+ ( p_parser->psz_shortname ?
+ p_parser->psz_shortname :p_parser->psz_object_name)) );
if( playlist_IsServicesDiscoveryLoaded( p_playlist,
- p_parser->psz_shortname ) )
+ p_parser->psz_object_name ) )
{
p_sd_menu->Check( FirstSD_Event + i_number, TRUE );
}
INSERT_ELEM( (void**)pp_sds, i_number, i_number,
- (void*)p_parser->psz_shortname );
+ (void*)p_parser->psz_object_name );
}
}
vlc_list_release( p_list );
else
Playlist::PopupMenu( node_popup,
ScreenToClient( wxGetMousePosition() ) );
-
}
}
}
}
- if( p_intf->b_block && strncmp( p_intf->p_module->psz_shortname, "clivlc", 6) )
+ if( p_intf->b_block && strncmp( p_intf->p_module->psz_object_name,
+ "clivlc", 6) )
{
o_pool = [[NSAutoreleasePool alloc] init];
- [VLCApplication sharedApplication];
+ [VLCApplication sharedApplication];
}
- if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_shortname, "macosx" , 6 ) ||
+ if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
!strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
{
/* VLC in normal primary interface mode */