Changeset 43e94311a661030d085e48e395f9a9bc35dae89f
- Timestamp:
- 19/12/04 12:08:18
(4 years ago)
- Author:
- Clément Stenac <zorglub@videolan.org>
- git-committer:
- Clément Stenac <zorglub@videolan.org> 1103454498 +0000
- git-parent:
[7231885dc1bbb00ea7bb4c4ff32d412f3214ee9d]
- git-author:
- Clément Stenac <zorglub@videolan.org> 1103454498 +0000
- Message:
Fix bugs with psz_shortname
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| ra90a19a |
r43e9431 |
|
| 478 | 478 | new AutoBuiltPanel( notebook, this, p_intf, p_module ); |
|---|
| 479 | 479 | input_tab_array.Add( autopanel ); |
|---|
| 480 | | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ), |
|---|
| | 480 | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? |
|---|
| | 481 | p_module->psz_shortname : p_module->psz_object_name ), |
|---|
| 481 | 482 | i_access_method == CAPTURE_ACCESS ); |
|---|
| 482 | 483 | } |
|---|
| … | … | |
| 488 | 489 | new AutoBuiltPanel( notebook, this, p_intf, p_module ); |
|---|
| 489 | 490 | input_tab_array.Add( autopanel ); |
|---|
| 490 | | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ), |
|---|
| | 491 | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? |
|---|
| | 492 | p_module->psz_shortname : p_module->psz_object_name ), |
|---|
| 491 | 493 | i_access_method == CAPTURE_ACCESS ); |
|---|
| 492 | 494 | } |
|---|
| … | … | |
| 498 | 500 | new AutoBuiltPanel( notebook, this, p_intf, p_module ); |
|---|
| 499 | 501 | input_tab_array.Add( autopanel ); |
|---|
| 500 | | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ), |
|---|
| | 502 | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? |
|---|
| | 503 | p_module->psz_shortname : p_module->psz_object_name ), |
|---|
| 501 | 504 | i_access_method == CAPTURE_ACCESS ); |
|---|
| 502 | 505 | } |
|---|
| … | … | |
| 508 | 511 | new AutoBuiltPanel( notebook, this, p_intf, p_module ); |
|---|
| 509 | 512 | input_tab_array.Add( autopanel ); |
|---|
| 510 | | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ), |
|---|
| | 513 | notebook->AddPage( autopanel, wxU( p_module->psz_shortname ? |
|---|
| | 514 | p_module->psz_shortname : p_module->psz_object_name ), |
|---|
| 511 | 515 | i_access_method == CAPTURE_ACCESS ); |
|---|
| 512 | 516 | } |
|---|
| rc3550b5 |
r43e9431 |
|
| 1384 | 1384 | p_sd_menu->AppendCheckItem( FirstSD_Event + i_number , |
|---|
| 1385 | 1385 | wxU( p_parser->psz_longname ? p_parser->psz_longname : |
|---|
| 1386 | | p_parser->psz_shortname ) ); |
|---|
| | 1386 | ( p_parser->psz_shortname ? |
|---|
| | 1387 | p_parser->psz_shortname :p_parser->psz_object_name)) ); |
|---|
| 1387 | 1388 | |
|---|
| 1388 | 1389 | if( playlist_IsServicesDiscoveryLoaded( p_playlist, |
|---|
| 1389 | | p_parser->psz_shortname ) ) |
|---|
| | 1390 | p_parser->psz_object_name ) ) |
|---|
| 1390 | 1391 | { |
|---|
| 1391 | 1392 | p_sd_menu->Check( FirstSD_Event + i_number, TRUE ); |
|---|
| … | … | |
| 1393 | 1394 | |
|---|
| 1394 | 1395 | INSERT_ELEM( (void**)pp_sds, i_number, i_number, |
|---|
| 1395 | | (void*)p_parser->psz_shortname ); |
|---|
| | 1396 | (void*)p_parser->psz_object_name ); |
|---|
| 1396 | 1397 | } |
|---|
| 1397 | 1398 | } |
|---|
| … | … | |
| 1425 | 1426 | Playlist::PopupMenu( node_popup, |
|---|
| 1426 | 1427 | ScreenToClient( wxGetMousePosition() ) ); |
|---|
| 1427 | | |
|---|
| 1428 | 1428 | } |
|---|
| 1429 | 1429 | } |
|---|
| r8b61d4e |
r43e9431 |
|
| 157 | 157 | } |
|---|
| 158 | 158 | |
|---|
| 159 | | if( p_intf->b_block && strncmp( p_intf->p_module->psz_shortname, "clivlc", 6) ) |
|---|
| | 159 | if( p_intf->b_block && strncmp( p_intf->p_module->psz_object_name, |
|---|
| | 160 | "clivlc", 6) ) |
|---|
| 160 | 161 | { |
|---|
| 161 | 162 | o_pool = [[NSAutoreleasePool alloc] init]; |
|---|
| 162 | | [VLCApplication sharedApplication]; |
|---|
| 163 | | } |
|---|
| 164 | | |
|---|
| 165 | | if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_shortname, "macosx" , 6 ) || |
|---|
| | 163 | [VLCApplication sharedApplication]; |
|---|
| | 164 | } |
|---|
| | 165 | |
|---|
| | 166 | if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) || |
|---|
| 166 | 167 | !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) ) |
|---|
| 167 | 168 | { |
|---|
| r906b68f |
r43e9431 |
|
| 1166 | 1166 | free( p_module->psz_object_name ); |
|---|
| 1167 | 1167 | free( p_module->psz_capability ); |
|---|
| 1168 | | free( p_module->psz_shortname ); |
|---|
| | 1168 | if( p_module->psz_shortname ) free( p_module->psz_shortname ); |
|---|
| 1169 | 1169 | free( p_module->psz_longname ); |
|---|
| 1170 | 1170 | |
|---|