Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
a6a9c37e
Commit
a6a9c37e
authored
May 15, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't bother with vlc_object_get() when you can keep pointers!
parent
84d0f814
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
modules/gui/wxwidgets/dialogs/preferences.cpp
modules/gui/wxwidgets/dialogs/preferences.cpp
+5
-6
No files found.
modules/gui/wxwidgets/dialogs/preferences.cpp
View file @
a6a9c37e
...
@@ -134,6 +134,7 @@ public:
...
@@ -134,6 +134,7 @@ public:
PrefsPanel
*
panel
;
PrefsPanel
*
panel
;
wxBoxSizer
*
sizer
;
wxBoxSizer
*
sizer
;
module_t
*
p_module
;
int
i_object_id
;
int
i_object_id
;
int
i_subcat_id
;
int
i_subcat_id
;
int
i_type
;
int
i_type
;
...
@@ -584,9 +585,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
...
@@ -584,9 +585,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
config_data->b_submodule = module_IsSubModule(p_module);
config_data->b_submodule = module_IsSubModule(p_module);
#endif
#endif
config_data
->
i_type
=
TYPE_MODULE
;
config_data
->
i_type
=
TYPE_MODULE
;
config_data
->
i_object_id
=
config_data
->
b_submodule
?
config_data
->
p_module
=
config_data
->
b_submodule
?
((
vlc_object_t
*
)
p_module
)
->
p_parent
->
i_object_id
:
p_module
->
p_parent
:
p_module
;
((
vlc_object_t
*
)
p_module
)
->
i_object_id
;
config_data
->
psz_help
=
NULL
;
config_data
->
psz_help
=
NULL
;
/* WXMSW doesn't know image -1 ... FIXME */
/* WXMSW doesn't know image -1 ... FIXME */
...
@@ -769,7 +769,7 @@ ConfigTreeData *PrefsTreeCtrl::FindModuleConfig( ConfigTreeData *config_data )
...
@@ -769,7 +769,7 @@ ConfigTreeData *PrefsTreeCtrl::FindModuleConfig( ConfigTreeData *config_data )
{
{
config_new
=
(
ConfigTreeData
*
)
GetItemData
(
module
);
config_new
=
(
ConfigTreeData
*
)
GetItemData
(
module
);
if
(
config_new
&&
!
config_new
->
b_submodule
&&
if
(
config_new
&&
!
config_new
->
b_submodule
&&
config_new
->
i_object_id
==
config_data
->
i_object_id
)
config_new
->
p_module
==
config_data
->
p_module
)
{
{
return
config_new
;
return
config_new
;
}
}
...
@@ -899,8 +899,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
...
@@ -899,8 +899,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
/* Get a pointer to the module */
/* Get a pointer to the module */
if
(
config_data
->
i_type
==
TYPE_MODULE
)
if
(
config_data
->
i_type
==
TYPE_MODULE
)
{
{
p_module
=
(
module_t
*
)
p_module
=
config_data
->
p_module
;
vlc_object_get
(
config_data
->
i_object_id
);
}
}
else
else
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment