Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
4d8b6d10
Commit
4d8b6d10
authored
Nov 18, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MacOS X: fix preferences for ModulesConfig
Close #5024
parent
1600cff8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
16 deletions
+11
-16
modules/gui/macosx/prefs_widgets.m
modules/gui/macosx/prefs_widgets.m
+11
-16
No files found.
modules/gui/macosx/prefs_widgets.m
View file @
4d8b6d10
...
@@ -1313,6 +1313,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
...
@@ -1313,6 +1313,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
localizedString:
(
char
*
)
p_item
->
psz_text
];
localizedString:
(
char
*
)
p_item
->
psz_text
];
else
else
o_labelString
=
[
NSString
stringWithString
:
@""
];
o_labelString
=
[
NSString
stringWithString
:
@""
];
ADD_LABEL
(
o_label
,
mainFrame
,
0
,
-
1
,
o_labelString
,
o_popupTooltip
)
ADD_LABEL
(
o_label
,
mainFrame
,
0
,
-
1
,
o_labelString
,
o_popupTooltip
)
[
o_label
setAutoresizingMask
:
NSViewNotSizable
];
[
o_label
setAutoresizingMask
:
NSViewNotSizable
];
[
self
addSubview
:
o_label
];
[
self
addSubview
:
o_label
];
...
@@ -1378,18 +1379,17 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
...
@@ -1378,18 +1379,17 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
}
}
else
else
{
{
int
i
;
if
(
module_is_main
(
p_parser
)
)
if
(
module_is_main
(
p_parser
)
)
continue
;
continue
;
unsigned
int
confsize
,
unused
;
unsigned
int
confsize
;
module_config_t
*
p_config
=
module_config_get
(
p_parser
,
&
confsize
);
module_config_t
*
p_config
=
module_config_get
(
p_parser
,
&
confsize
);
for
(
i
=
0
;
i
<
confsize
;
i
++
)
for
(
size_t
i
=
0
;
i
<
confsize
;
i
++
)
{
{
module_config_t
*
p_
item
=
p_config
+
i
;
module_config_t
*
p_
cfg
=
p_config
+
i
;
/* Hack: required subcategory is stored in i_min */
/* Hack: required subcategory is stored in i_min */
if
(
p_
item
->
i_type
==
CONFIG_SUBCATEGORY
&&
if
(
p_
cfg
->
i_type
==
CONFIG_SUBCATEGORY
&&
p_
item
->
value
.
i
==
p_item
->
min
.
i
)
p_
cfg
->
value
.
i
==
p_cfg
->
min
.
i
)
{
{
NSString
*
o_description
=
[[
VLCMain
sharedInstance
]
NSString
*
o_description
=
[[
VLCMain
sharedInstance
]
localizedString:
module_get_name
(
p_parser
,
TRUE
)];
localizedString:
module_get_name
(
p_parser
,
TRUE
)];
...
@@ -1436,30 +1436,25 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
...
@@ -1436,30 +1436,25 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
}
}
else
else
{
{
int
i
;
if
(
module_is_main
(
p_parser
)
)
if
(
module_is_main
(
p_parser
)
)
continue
;
continue
;
unsigned
int
confsize
;
unsigned
int
confsize
;
unsigned
int
unused
;
module_config_t
*
p_configlist
=
module_config_get
(
p_parser
,
&
confsize
);
module_config_t
*
p_configlist
=
module_config_get
(
p_parser
,
&
confsize
);
for
(
i
=
0
;
i
<
confsize
;
i
++
)
for
(
size_t
i
=
0
;
i
<
confsize
;
i
++
)
{
{
module_config_t
*
p_config
=
&
p_configlist
[
i
];
module_config_t
*
p_config
=
&
p_configlist
[
i
];
/* Hack: required subcategory is stored in i_min */
/* Hack: required subcategory is stored in i_min */
if
(
p_config
->
i_type
==
CONFIG_SUBCATEGORY
&&
if
(
p_config
->
i_type
==
CONFIG_SUBCATEGORY
&&
config_GetInt
(
VLCIntf
,
p_item
->
psz_name
)
==
p_item
->
min
.
i
)
p_config
->
value
.
i
==
p_item
->
min
.
i
)
{
{
NSString
*
o_description
=
[[
VLCMain
sharedInstance
]
NSString
*
o_description
=
[[
VLCMain
sharedInstance
]
localizedString:
module_get_name
(
p_parser
,
TRUE
)];
localizedString:
module_get_name
(
p_parser
,
TRUE
)];
[
o_popup
addItemWithTitle
:
o_description
];
[
o_popup
addItemWithTitle
:
o_description
];
char
*
psz_value
=
config_GetPsz
(
VLCIntf
,
p_item
->
psz_name
);
if
(
p
sz_value
&&
!
strcmp
(
psz_value
,
if
(
p
_item
->
value
.
psz
&&
!
strcmp
(
p_item
->
value
.
psz
,
module_get_object
(
p_parser
))
)
module_get_object
(
p_parser
))
)
[
o_popup
selectItem
:[
o_popup
lastItem
]];
[
o_popup
selectItem
:[
o_popup
lastItem
]];
free
(
psz_value
);
}
}
}
}
module_config_free
(
p_configlist
);
module_config_free
(
p_configlist
);
...
...
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