Changeset 0ea547ed15f5fcaad9cec61bbe4c73e3a0ef2626
- Timestamp:
- 05/07/08 17:33:47
(3 months ago)
- Author:
- Pierre d'Herbemont <pdherbemont@videolan.org>
- git-committer:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1215272027 +0200
- git-parent:
[1468c26bba992693155aa7ea88cca07a4c9b8d5f]
- git-author:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1215270891 +0200
- Message:
qt4: use module_GetMainModule.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r449fd28 |
r0ea547e |
|
| 76 | 76 | |
|---|
| 77 | 77 | /* Build the tree for the main module */ |
|---|
| 78 | | const module_t *p_module = NULL; |
|---|
| 79 | | vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, |
|---|
| 80 | | FIND_ANYWHERE ); |
|---|
| 81 | | if( !p_list ) return; |
|---|
| 82 | | |
|---|
| 83 | | /* Find the main module */ |
|---|
| 84 | | for( unsigned i = 0; p_module == NULL; i++ ) |
|---|
| 85 | | { |
|---|
| 86 | | assert (i < (unsigned)p_list->i_count); |
|---|
| 87 | | |
|---|
| 88 | | const module_t *p_main = (module_t *)p_list->p_values[i].p_object; |
|---|
| 89 | | if( strcmp( module_GetObjName( p_main ), "main" ) == 0 ) |
|---|
| 90 | | p_module = p_main; |
|---|
| 91 | | } |
|---|
| | 78 | const module_t *p_module = module_GetMainModule( p_intf ); |
|---|
| 92 | 79 | |
|---|
| 93 | 80 | /* Initialisation and get the confsize */ |
|---|
| … | … | |
| 207 | 194 | } |
|---|
| 208 | 195 | module_PutConfig( p_config ); |
|---|
| 209 | | |
|---|
| | 196 | vlc_object_release( (vlc_object_t*)p_module ); |
|---|
| | 197 | |
|---|
| | 198 | |
|---|
| | 199 | vlc_list_t *p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, |
|---|
| | 200 | FIND_ANYWHERE ); |
|---|
| 210 | 201 | /* Build the tree of plugins */ |
|---|
| 211 | 202 | for( int i_index = 0; i_index < p_list->i_count; i_index++ ) |
|---|
| … | … | |
| 215 | 206 | |
|---|
| 216 | 207 | // Main module excluded |
|---|
| 217 | | if( !strcmp( module_GetObjName( p_module ), "main" ) ) continue; |
|---|
| | 208 | if( module_IsMainModule( p_module) ) continue; |
|---|
| 218 | 209 | |
|---|
| 219 | 210 | unsigned i_subcategory = 0, i_category = 0, confsize; |
|---|
