Commit 43e94311 authored by Clément Stenac's avatar Clément Stenac

Fix bugs with psz_shortname

parent 7231885d
......@@ -477,7 +477,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
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 );
}
......@@ -487,7 +488,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
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 );
}
......@@ -497,7 +499,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
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 );
}
......@@ -507,7 +510,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
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 );
}
......
......@@ -1383,16 +1383,17 @@ wxMenu *Playlist::SDMenu()
{
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 );
......@@ -1424,7 +1425,6 @@ void Playlist::OnPopup( wxContextMenuEvent& event )
else
Playlist::PopupMenu( node_popup,
ScreenToClient( wxGetMousePosition() ) );
}
}
......
......@@ -156,13 +156,14 @@ int intf_RunThread( intf_thread_t *p_intf )
}
}
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 */
......
......@@ -1165,7 +1165,7 @@ static void UndupModule( module_t *p_module )
free( p_module->psz_object_name );
free( p_module->psz_capability );
free( p_module->psz_shortname );
if( p_module->psz_shortname ) free( p_module->psz_shortname );
free( p_module->psz_longname );
if( p_module->psz_program != NULL )
......
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