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
8679868f
Commit
8679868f
authored
Mar 24, 2008
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implemented the Visualiser and Video Output module settings
parent
daa7c08f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
70 additions
and
19 deletions
+70
-19
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
...e/macosx/Resources/English.lproj/Preferences.nib/info.nib
+3
-2
extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
.../Resources/English.lproj/Preferences.nib/keyedobjects.nib
+0
-0
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+67
-17
No files found.
extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
View file @
8679868f
...
...
@@ -10,13 +10,14 @@
<integer>
5
</integer>
<key>
IBOpenObjects
</key>
<array>
<integer>
2668
</integer>
<integer>
2562
</integer>
<integer>
2410
</integer>
<integer>
2440
</integer>
<integer>
2311
</integer>
<integer>
2523
</integer>
<integer>
2330
</integer>
<integer>
2678
</integer>
<integer>
2668
</integer>
<integer>
2311
</integer>
</array>
<key>
IBSystem Version
</key>
<string>
9C31
</string>
...
...
extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
View file @
8679868f
No preview for this file type
modules/gui/macosx/simple_prefs.m
View file @
8679868f
...
...
@@ -294,7 +294,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[
o_video_enable_ckb
setTitle
:
_NS
(
"Enable Video"
)];
[
o_video_fullscreen_ckb
setTitle
:
_NS
(
"Fullscreen"
)];
[
o_video_onTop_ckb
setTitle
:
_NS
(
"Always on top"
)];
[
o_video_output_txt
setStringValue
:
_NS
(
"
Display devic
e"
)];
[
o_video_output_txt
setStringValue
:
_NS
(
"
Output modul
e"
)];
[
o_video_skipFrames_ckb
setTitle
:
_NS
(
"Skip frames"
)];
[
o_video_snap_box
setTitle
:
_NS
(
"Video snapshots"
)];
[
o_video_snap_folder_btn
setTitle
:
_NS
(
"Browse..."
)];
...
...
@@ -307,6 +307,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
-
(
void
)
resetControls
{
module_config_t
*
p_item
;
vlc_list_t
*
p_list
;
module_t
*
p_parser
;
int
i
,
y
=
0
;
char
*
psz_tmp
;
...
...
@@ -323,7 +325,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( p_item->value.i < [object numberOfItems] ) \
[object selectItemAtIndex: p_item->value.i]; \
else \
[object selectItemAtIndex: 0]
[object selectItemAtIndex: 0]; \
[object setToolTip: _NS( p_item->psz_longtext )]
#define SetupStringList( object, name ) \
[object removeAllItems]; \
...
...
@@ -335,7 +338,28 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) \
y = i; \
} \
[object selectItemAtIndex: y]
[object selectItemAtIndex: y]; \
[object setToolTip: _NS( p_item->psz_longtext )]
#define SetupModuleList( object, name ) \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
[object removeAllItems]; \
[object addItemWithTitle: _NS("Default")]; \
for( int i_index = 0; i_index < p_list->i_count; i_index++ ) \
{ \
p_parser = (module_t *)p_list->p_values[i_index].p_object ; \
\
if( module_IsCapable( p_parser, p_item->psz_type ) ) \
{ \
[object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser )]]; \
\
if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) \
[object selectItem: [object lastItem]]; \
} \
} \
vlc_list_release( p_list ); \
[object setToolTip: _NS(p_item->psz_longtext)]
/**********************
* interface settings *
...
...
@@ -367,8 +391,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[
o_audio_norm_ckb
setState
:
(
int
)
strstr
(
psz_tmp
,
"normvol"
)];
[
o_audio_norm_fld
setFloatValue
:
config_GetFloat
(
p_intf
,
"norm-max-level"
)];
// visualizer
msg_Warn
(
p_intf
,
"visualizer not implemented!"
);
SetupModuleList
(
o_audio_visual_pop
,
"audio-visual"
);
/* Last.FM is optional */
if
(
module_Exists
(
p_intf
,
"audioscrobbler"
)
)
...
...
@@ -391,7 +414,10 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[
o_video_skipFrames_ckb
setState
:
config_GetInt
(
p_intf
,
"skip-frames"
)];
[
o_video_black_ckb
setState
:
config_GetInt
(
p_intf
,
"macosx-black"
)];
msg_Warn
(
p_intf
,
"vout module and display device selectors not implemented!"
);
SetupModuleList
(
o_video_output_pop
,
"vout"
);
msg_Warn
(
p_intf
,
"display device selector not implemented!"
);
[
o_video_device_pop
removeAllItems
];
if
(
config_GetPsz
(
p_intf
,
"snapshot-path"
)
!=
NULL
)
[
o_video_snap_folder_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
config_GetPsz
(
p_intf
,
"snapshot-path"
)]];
...
...
@@ -578,6 +604,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
-
(
void
)
saveChangedSettings
{
module_config_t
*
p_item
;
vlc_list_t
*
p_list
;
module_t
*
p_parser
;
char
*
psz_tmp
;
int
i
;
...
...
@@ -595,6 +623,27 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
else \
config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) )
#define SaveModuleList( object, name ) \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
\
p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) \
{ \
p_parser = (module_t *)p_list->p_values[i_module_index].p_object; \
\
if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) ) \
{ \
if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) \
{ \
config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser ))); \
break; \
} \
} \
} \
vlc_list_release( p_list ); \
if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \
config_PutPsz( p_intf, name, "Default" )
/**********************
* interface settings *
**********************/
...
...
@@ -652,7 +701,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
}
config_PutFloat
(
p_intf
,
"norm-max-level"
,
[
o_audio_norm_fld
floatValue
]
);
msg_Warn
(
p_intf
,
"visualizer not implemented!
"
);
SaveModuleList
(
o_audio_visual_pop
,
"audio-visual
"
);
/* Last.FM is optional */
if
(
module_Exists
(
p_intf
,
"audioscrobbler"
)
)
...
...
@@ -690,7 +739,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
config_PutInt
(
p_intf
,
"skip-frames"
,
[
o_video_skipFrames_ckb
state
]
);
config_PutInt
(
p_intf
,
"macosx-black"
,
[
o_video_black_ckb
state
]
);
msg_Warn
(
p_intf
,
"vout module and display device selectors not implemented!"
);
SaveModuleList
(
o_video_output_pop
,
"vout"
);
msg_Warn
(
p_intf
,
"display device selector not implemented!"
);
config_PutPsz
(
p_intf
,
"snapshot-path"
,
[[
o_video_snap_folder_fld
stringValue
]
UTF8String
]
);
config_PutPsz
(
p_intf
,
"snapshot-prefix"
,
[[
o_video_snap_prefix_fld
stringValue
]
UTF8String
]
);
...
...
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