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
e955c93c
Commit
e955c93c
authored
Jun 13, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* code and GUI improvements
parent
7d92213a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
90 additions
and
150 deletions
+90
-150
extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib
...s/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib
+3
-3
extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib
extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib
+3
-3
extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib
...OSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib
+0
-0
modules/gui/macosx/sfilters.h
modules/gui/macosx/sfilters.h
+4
-4
modules/gui/macosx/sfilters.m
modules/gui/macosx/sfilters.m
+80
-140
No files found.
extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib
View file @
e955c93c
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
"o_logo_opaque_lbl" = id;
"o_logo_opaque_lbl" = id;
"o_logo_opaque_sld" = id;
"o_logo_opaque_sld" = id;
"o_logo_pos_lbl" = id;
"o_logo_pos_lbl" = id;
"o_logo_pos_r
el_pop
" = id;
"o_logo_pos_r
adio
" = id;
"o_marq_color_lbl" = id;
"o_marq_color_lbl" = id;
"o_marq_color_pop" = id;
"o_marq_color_pop" = id;
"o_marq_enabled_ckb" = id;
"o_marq_enabled_ckb" = id;
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
"o_marq_opaque_lbl" = id;
"o_marq_opaque_lbl" = id;
"o_marq_opaque_sld" = id;
"o_marq_opaque_sld" = id;
"o_marq_pos_lbl" = id;
"o_marq_pos_lbl" = id;
"o_marq_pos_r
el_pop
" = id;
"o_marq_pos_r
adio
" = id;
"o_marq_size_inPx_lbl" = id;
"o_marq_size_inPx_lbl" = id;
"o_marq_size_lbl" = id;
"o_marq_size_lbl" = id;
"o_marq_size_pop" = id;
"o_marq_size_pop" = id;
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
"o_time_opaque_lbl" = id;
"o_time_opaque_lbl" = id;
"o_time_opaque_sld" = id;
"o_time_opaque_sld" = id;
"o_time_pos_lbl" = id;
"o_time_pos_lbl" = id;
"o_time_pos_r
el_pop
" = id;
"o_time_pos_r
adio
" = id;
"o_time_size_inPx_lbl" = id;
"o_time_size_inPx_lbl" = id;
"o_time_size_lbl" = id;
"o_time_size_lbl" = id;
"o_time_size_pop" = id;
"o_time_size_pop" = id;
...
...
extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib
View file @
e955c93c
...
@@ -3,14 +3,14 @@
...
@@ -3,14 +3,14 @@
<plist
version=
"1.0"
>
<plist
version=
"1.0"
>
<dict>
<dict>
<key>
IBDocumentLocation
</key>
<key>
IBDocumentLocation
</key>
<string>
6
9 67
356 240 0 0 1440 878
</string>
<string>
6
3 19
356 240 0 0 1440 878
</string>
<key>
IBFramework Version
</key>
<key>
IBFramework Version
</key>
<string>
4
37.0
</string>
<string>
4
46.1
</string>
<key>
IBOpenObjects
</key>
<key>
IBOpenObjects
</key>
<array>
<array>
<integer>
5
</integer>
<integer>
5
</integer>
</array>
</array>
<key>
IBSystem Version
</key>
<key>
IBSystem Version
</key>
<string>
8
F46
</string>
<string>
8
I127
</string>
</dict>
</dict>
</plist>
</plist>
extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib
View file @
e955c93c
No preview for this file type
modules/gui/macosx/sfilters.h
View file @
e955c93c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* sfilter.h: MacOS X Subpicture filters dialogue
* sfilter.h: MacOS X Subpicture filters dialogue
*****************************************************************************
*****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team
* Copyright (C) 2005-2006 the VideoLAN team
* $Id
:
$
* $Id$
*
*
* Authors: Felix Kühne <fkuehne@users.sf.net>
* Authors: Felix Kühne <fkuehne@users.sf.net>
*
*
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
IBOutlet
id
o_logo_opaque_lbl
;
IBOutlet
id
o_logo_opaque_lbl
;
IBOutlet
id
o_logo_opaque_sld
;
IBOutlet
id
o_logo_opaque_sld
;
IBOutlet
id
o_logo_pos_lbl
;
IBOutlet
id
o_logo_pos_lbl
;
IBOutlet
id
o_logo_pos_r
el_pop
;
IBOutlet
id
o_logo_pos_r
adio
;
/* marquee section */
/* marquee section */
IBOutlet
id
o_marq_enabled_ckb
;
IBOutlet
id
o_marq_enabled_ckb
;
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
IBOutlet
id
o_marq_opaque_lbl
;
IBOutlet
id
o_marq_opaque_lbl
;
IBOutlet
id
o_marq_opaque_sld
;
IBOutlet
id
o_marq_opaque_sld
;
IBOutlet
id
o_marq_pos_lbl
;
IBOutlet
id
o_marq_pos_lbl
;
IBOutlet
id
o_marq_pos_r
el_pop
;
IBOutlet
id
o_marq_pos_r
adio
;
IBOutlet
id
o_marq_size_inPx_lbl
;
IBOutlet
id
o_marq_size_inPx_lbl
;
IBOutlet
id
o_marq_size_lbl
;
IBOutlet
id
o_marq_size_lbl
;
IBOutlet
id
o_marq_size_pop
;
IBOutlet
id
o_marq_size_pop
;
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
IBOutlet
id
o_time_opaque_lbl
;
IBOutlet
id
o_time_opaque_lbl
;
IBOutlet
id
o_time_opaque_sld
;
IBOutlet
id
o_time_opaque_sld
;
IBOutlet
id
o_time_pos_lbl
;
IBOutlet
id
o_time_pos_lbl
;
IBOutlet
id
o_time_pos_r
el_pop
;
IBOutlet
id
o_time_pos_r
adio
;
IBOutlet
id
o_time_size_inPx_lbl
;
IBOutlet
id
o_time_size_inPx_lbl
;
IBOutlet
id
o_time_size_lbl
;
IBOutlet
id
o_time_size_lbl
;
IBOutlet
id
o_time_size_pop
;
IBOutlet
id
o_time_size_pop
;
...
...
modules/gui/macosx/sfilters.m
View file @
e955c93c
...
@@ -74,38 +74,24 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -74,38 +74,24 @@ static VLCsFilters *_o_sharedInstance = nil;
[
o_sfilter_saveSettings_ckb
setTitle
:
_NS
(
"Save settings"
)];
[
o_sfilter_saveSettings_ckb
setTitle
:
_NS
(
"Save settings"
)];
[
o_logo_image_btn
setTitle
:
_NS
(
"Browse..."
)];
[
o_logo_image_btn
setTitle
:
_NS
(
"Browse..."
)];
[
o_logo_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_logo_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_logo_image_lbl
setStringValue
:
[
_NS
(
"Image"
)
\
[
o_logo_image_lbl
setStringValue
:
_NS
(
"Image:"
)];
stringByAppendingString
:
@":"
]];
[
o_logo_pos_lbl
setStringValue
:
_NS
(
"Position:"
)];
[
o_logo_pos_lbl
setStringValue
:
[
_NS
(
"Position"
)
\
[
o_logo_opaque_lbl
setStringValue
:
_NS
(
"Opaqueness"
)];
stringByAppendingString
:
@":"
]];
[
o_logo_opaque_lbl
setStringValue
:
[
_NS
(
"Opaqueness"
)
\
stringByAppendingString
:
@":"
]];
[
o_time_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_time_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_time_stamp_lbl
setStringValue
:
[
_NS
(
"Timestamp"
)
\
[
o_time_stamp_lbl
setStringValue
:
_NS
(
"Timestamp:"
)];
stringByAppendingString
:
@":"
]];
[
o_time_size_lbl
setStringValue
:
_NS
(
"Size:"
)];
[
o_time_size_lbl
setStringValue
:
[
_NS
(
"Size"
)
\
[
o_time_color_lbl
setStringValue
:
_NS
(
"Color:"
)];
stringByAppendingString
:
@":"
]];
[
o_time_opaque_lbl
setStringValue
:
_NS
(
"Opaqueness:"
)];
[
o_time_color_lbl
setStringValue
:
[
_NS
(
"Color"
)
\
[
o_time_pos_lbl
setStringValue
:
_NS
(
"Position:"
)];
stringByAppendingString
:
@":"
]];
[
o_time_opaque_lbl
setStringValue
:
[
_NS
(
"Opaqueness"
)
\
stringByAppendingString
:
@":"
]];
[
o_time_pos_lbl
setStringValue
:
[
_NS
(
"Position"
)
\
stringByAppendingString
:
@":"
]];
[
o_time_size_inPx_lbl
setStringValue
:
_NS
(
"(in pixels)"
)];
[
o_time_size_inPx_lbl
setStringValue
:
_NS
(
"(in pixels)"
)];
[
o_marq_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_marq_enabled_ckb
setTitle
:
_NS
(
"Enabled"
)];
[
o_marq_color_lbl
setStringValue
:
[
_NS
(
"Color"
)
\
[
o_marq_color_lbl
setStringValue
:
_NS
(
"Color:"
)];
stringByAppendingString
:
@":"
]];
[
o_marq_marq_lbl
setStringValue
:
_NS
(
"Marquee:"
)];
[
o_marq_marq_lbl
setStringValue
:
[
_NS
(
"Marquee"
)
\
[
o_marq_opaque_lbl
setStringValue
:
_NS
(
"Opaqueness"
)];
stringByAppendingString
:
@":"
]];
[
o_marq_tmOut_lbl
setStringValue
:
_NS
(
"Timeout:"
)];
[
o_marq_opaque_lbl
setStringValue
:
[
_NS
(
"Opaqueness"
)
\
stringByAppendingString
:
@":"
]];
[
o_marq_tmOut_lbl
setStringValue
:
[
_NS
(
"Timeout"
)
\
stringByAppendingString
:
@":"
]];
[
o_marq_tmOut_ms_lbl
setStringValue
:
_NS
(
"ms"
)];
[
o_marq_tmOut_ms_lbl
setStringValue
:
_NS
(
"ms"
)];
[
o_marq_pos_lbl
setStringValue
:
[
_NS
(
"Position"
)
\
[
o_marq_pos_lbl
setStringValue
:
_NS
(
"Position:"
)];
stringByAppendingString
:
@":"
]];
[
o_marq_size_lbl
setStringValue
:
_NS
(
"Size:"
)];
[
o_marq_size_lbl
setStringValue
:
[
_NS
(
"Size"
)
\
stringByAppendingString
:
@":"
]];
[
o_time_color_lbl
setStringValue
:
_NS
(
"(in pixels)"
)];
[
o_time_color_lbl
setStringValue
:
_NS
(
"(in pixels)"
)];
}
}
...
@@ -148,8 +134,8 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -148,8 +134,8 @@ static VLCsFilters *_o_sharedInstance = nil;
o_navy
=
[
NSArray
arrayWithObjects
:
_NS
(
"Navy"
),
@"0x000080"
,
nil
];
o_navy
=
[
NSArray
arrayWithObjects
:
_NS
(
"Navy"
),
@"0x000080"
,
nil
];
o_blue
=
[
NSArray
arrayWithObjects
:
_NS
(
"Blue"
),
@"0x0000FF"
,
nil
];
o_blue
=
[
NSArray
arrayWithObjects
:
_NS
(
"Blue"
),
@"0x0000FF"
,
nil
];
o_aqua
=
[
NSArray
arrayWithObjects
:
_NS
(
"Aqua"
),
@"0x00FFFF"
,
nil
];
o_aqua
=
[
NSArray
arrayWithObjects
:
_NS
(
"Aqua"
),
@"0x00FFFF"
,
nil
];
o_colors
=
[[
NSArray
alloc
]
initWithObjects
:
o_default
,
o_black
,
o_gray
,
\
o_colors
=
[[
NSArray
alloc
]
initWithObjects
:
o_default
,
o_black
,
o_gray
,
o_silver
,
o_white
,
o_maroon
,
o_red
,
o_fuchsia
,
o_yellow
,
o_olive
,
\
o_silver
,
o_white
,
o_maroon
,
o_red
,
o_fuchsia
,
o_yellow
,
o_olive
,
o_green
,
o_teal
,
o_lime
,
o_purple
,
o_navy
,
o_blue
,
o_aqua
,
nil
];
o_green
,
o_teal
,
o_lime
,
o_purple
,
o_navy
,
o_blue
,
o_aqua
,
nil
];
unsigned
int
x
=
0
;
unsigned
int
x
=
0
;
...
@@ -160,11 +146,11 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -160,11 +146,11 @@ static VLCsFilters *_o_sharedInstance = nil;
* the menu was sorted */
* the menu was sorted */
while
(
x
!=
[
o_colors
count
])
while
(
x
!=
[
o_colors
count
])
{
{
[
o_marq_color_pop
addItemWithTitle
:
[[
o_colors
objectAtIndex
:
x
]
\
[
o_marq_color_pop
addItemWithTitle
:
[[
o_colors
objectAtIndex
:
x
]
objectAtIndex:
0
]];
objectAtIndex:
0
]];
[[
o_marq_color_pop
lastItem
]
setTag
:
x
];
[[
o_marq_color_pop
lastItem
]
setTag
:
x
];
[
o_time_color_pop
addItemWithTitle
:
[[
o_colors
objectAtIndex
:
x
]
\
[
o_time_color_pop
addItemWithTitle
:
[[
o_colors
objectAtIndex
:
x
]
objectAtIndex:
0
]];
objectAtIndex:
0
]];
[[
o_time_color_pop
lastItem
]
setTag
:
x
];
[[
o_time_color_pop
lastItem
]
setTag
:
x
];
...
@@ -177,7 +163,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -177,7 +163,7 @@ static VLCsFilters *_o_sharedInstance = nil;
/* define the relative positions and copy them to the menues
/* define the relative positions and copy them to the menues
* we can destroy the array afterwards, because we are saving the ints
* we can destroy the array afterwards, because we are saving the ints
* as tags to the menu-items */
* as tags to the menu-items */
NSArray
*
o_cnt_cnt
;
/*
NSArray * o_cnt_cnt;
NSArray * o_lft_cnt;
NSArray * o_lft_cnt;
NSArray * o_rht_cnt;
NSArray * o_rht_cnt;
NSArray * o_cnt_top;
NSArray * o_cnt_top;
...
@@ -196,8 +182,8 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -196,8 +182,8 @@ static VLCsFilters *_o_sharedInstance = nil;
o_cnt_btm = [NSArray arrayWithObjects: _NS("Center-Bottom"), @"8", nil];
o_cnt_btm = [NSArray arrayWithObjects: _NS("Center-Bottom"), @"8", nil];
o_lft_btm = [NSArray arrayWithObjects: _NS("Left-Bottom"), @"9", nil];
o_lft_btm = [NSArray arrayWithObjects: _NS("Left-Bottom"), @"9", nil];
o_rht_btm = [NSArray arrayWithObjects: _NS("Right-Bottom"), @"10", nil];
o_rht_btm = [NSArray arrayWithObjects: _NS("Right-Bottom"), @"10", nil];
o_positions
=
[[
NSArray
alloc
]
initWithObjects
:
o_cnt_cnt
,
o_lft_cnt
,
\
o_positions = [[NSArray alloc] initWithObjects: o_cnt_cnt, o_lft_cnt,
o_rht_cnt
,
o_cnt_top
,
o_lft_top
,
o_rht_top
,
o_cnt_btm
,
o_lft_btm
,
\
o_rht_cnt, o_cnt_top, o_lft_top, o_rht_top, o_cnt_btm, o_lft_btm,
o_rht_btm, nil];
o_rht_btm, nil];
x = 0;
x = 0;
...
@@ -205,29 +191,29 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -205,29 +191,29 @@ static VLCsFilters *_o_sharedInstance = nil;
[o_marq_pos_rel_pop removeAllItems];
[o_marq_pos_rel_pop removeAllItems];
[o_logo_pos_rel_pop removeAllItems];
[o_logo_pos_rel_pop removeAllItems];
/* we are adding a tag here, so we can easily select an item later on */
* we are adding a tag here, so we can easily select an item later on *
while ( x != [o_positions count] )
while ( x != [o_positions count] )
{
{
[
o_time_pos_rel_pop
addItemWithTitle
:
[[
o_positions
objectAtIndex
:
x
]
\
[o_time_pos_rel_pop addItemWithTitle: [[o_positions objectAtIndex:x]
objectAtIndex:0]];
objectAtIndex:0]];
[[
o_time_pos_rel_pop
lastItem
]
setTag
:
[[[
o_positions
objectAtIndex
:
x
]
\
[[o_time_pos_rel_pop lastItem] setTag: [[[o_positions objectAtIndex:x]
objectAtIndex:1] intValue]];
objectAtIndex:1] intValue]];
[
o_marq_pos_rel_pop
addItemWithTitle
:
[[
o_positions
objectAtIndex
:
x
]
\
[o_marq_pos_rel_pop addItemWithTitle: [[o_positions objectAtIndex:x]
objectAtIndex:0]];
objectAtIndex:0]];
[[
o_marq_pos_rel_pop
lastItem
]
setTag
:
[[[
o_positions
objectAtIndex
:
x
]
\
[[o_marq_pos_rel_pop lastItem] setTag: [[[o_positions objectAtIndex:x]
objectAtIndex:1] intValue]];
objectAtIndex:1] intValue]];
[
o_logo_pos_rel_pop
addItemWithTitle
:
[[
o_positions
objectAtIndex
:
x
]
\
[o_logo_pos_rel_pop addItemWithTitle: [[o_positions objectAtIndex:x]
objectAtIndex:0]];
objectAtIndex:0]];
[[
o_logo_pos_rel_pop
lastItem
]
setTag
:
[[[
o_positions
objectAtIndex
:
x
]
\
[[o_logo_pos_rel_pop lastItem] setTag: [[[o_positions objectAtIndex:x]
objectAtIndex:1] intValue]];
objectAtIndex:1] intValue]];
x = (x + 1);
x = (x + 1);
}
}
[
o_positions
release
];
[o_positions release];
*/
NSArray
*
o_sizes
;
NSArray
*
o_sizes
;
o_sizes
=
[[
NSArray
alloc
]
initWithObjects
:
@"6"
,
@"8"
,
@"10"
,
@"11"
,
@"12"
,
\
o_sizes
=
[[
NSArray
alloc
]
initWithObjects
:
@"6"
,
@"8"
,
@"10"
,
@"11"
,
@"12"
,
\
@"14"
,
@"13"
,
@"16"
,
@"18"
,
@"24"
,
@"36"
,
@"48"
,
@"64"
,
@"72"
,
@"96"
,
\
@"14"
,
@"13"
,
@"16"
,
@"18"
,
@"24"
,
@"36"
,
@"48"
,
@"64"
,
@"72"
,
@"96"
,
@"144"
,
@"288"
,
nil
];
@"144"
,
@"288"
,
nil
];
[
o_marq_size_pop
removeAllItems
];
[
o_marq_size_pop
removeAllItems
];
[
o_marq_size_pop
addItemsWithTitles
:
o_sizes
];
[
o_marq_size_pop
addItemsWithTitles
:
o_sizes
];
...
@@ -247,7 +233,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -247,7 +233,7 @@ static VLCsFilters *_o_sharedInstance = nil;
/* retrieve the marquee settings */
/* retrieve the marquee settings */
int
x
=
0
;
int
x
=
0
;
int
tempInt
=
config_GetInt
(
p_intf
,
"marq-color"
);
int
tempInt
=
config_GetInt
(
p_intf
,
"marq-color"
);
while
(
strtol
([[[
o_colors
objectAtIndex
:
x
]
objectAtIndex
:
1
]
UTF8String
],
\
while
(
strtol
([[[
o_colors
objectAtIndex
:
x
]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
)
!=
tempInt
)
NULL
,
0
)
!=
tempInt
)
{
{
x
=
(
x
+
1
);
x
=
(
x
+
1
);
...
@@ -259,40 +245,23 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -259,40 +245,23 @@ static VLCsFilters *_o_sharedInstance = nil;
}
}
}
}
[
o_marq_color_pop
selectItemAtIndex
:
x
];
[
o_marq_color_pop
selectItemAtIndex
:
x
];
[
o_marq_marq_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
\
[
o_marq_marq_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
config_GetPsz
(
p_intf
,
"marq-marquee"
)]];
config_GetPsz
(
p_intf
,
"marq-marquee"
)]];
[
o_marq_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"marq-opacity"
)];
[
o_marq_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"marq-opacity"
)];
x
=
0
;
[
o_marq_pos_radio
selectCellWithTag
:
config_GetInt
(
p_intf
,
"marq-position"
)];
tempInt
=
config_GetInt
(
p_intf
,
"marq-position"
);
/* FIXME: the following line doesn't work with "-1", which is the default
while
(
tempInt
!=
[[
o_marq_pos_rel_pop
itemAtIndex
:
x
]
tag
]
)
* value */
{
[
o_marq_size_pop
selectItemWithTitle
:
x
=
(
x
+
1
);
[[
NSNumber
numberWithInt
:
config_GetInt
(
p_intf
,
"marq-size"
)]
stringValue
]];
if
(
x
>=
[
o_marq_pos_rel_pop
numberOfItems
]
)
{
x
=
0
;
return
;
}
}
[
o_marq_pos_rel_pop
selectItemAtIndex
:
x
];
x
=
0
;
tempInt
=
config_GetInt
(
p_intf
,
"marq-size"
);
while
(
[[[
o_marq_size_pop
itemAtIndex
:
x
]
title
]
intValue
]
!=
tempInt
)
x
=
(
x
+
1
);
if
(
x
>=
[
o_marq_size_pop
numberOfItems
]
)
{
x
=
0
;
return
;
}
[
o_marq_size_pop
selectItemAtIndex
:
x
];
[
o_marq_size_pop
selectItemAtIndex
:
x
];
[
o_marq_tmOut_fld
setStringValue
:
[[
NSNumber
numberWithInt
:
\
[
o_marq_tmOut_fld
setStringValue
:
[[
NSNumber
numberWithInt
:
config_GetInt
(
p_intf
,
"marq-timeout"
)]
stringValue
]];
config_GetInt
(
p_intf
,
"marq-timeout"
)]
stringValue
]];
/* retrieve the time settings */
/* retrieve the time settings */
x
=
0
;
x
=
0
;
tempInt
=
config_GetInt
(
p_intf
,
"time-color"
);
tempInt
=
config_GetInt
(
p_intf
,
"time-color"
);
while
(
strtol
([[[
o_colors
objectAtIndex
:
x
]
objectAtIndex
:
1
]
UTF8String
],
\
while
(
strtol
([[[
o_colors
objectAtIndex
:
x
]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
)
!=
tempInt
)
NULL
,
0
)
!=
tempInt
)
{
{
x
=
(
x
+
1
);
x
=
(
x
+
1
);
...
@@ -304,84 +273,50 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -304,84 +273,50 @@ static VLCsFilters *_o_sharedInstance = nil;
}
}
}
}
[
o_time_color_pop
selectItemAtIndex
:
x
];
[
o_time_color_pop
selectItemAtIndex
:
x
];
[
o_time_stamp_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
\
[
o_time_stamp_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
config_GetPsz
(
p_intf
,
"time-format"
)]];
config_GetPsz
(
p_intf
,
"time-format"
)]];
[
o_time_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"time-opacity"
)];
[
o_time_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"time-opacity"
)];
x
=
0
;
/* FIXME: the following line doesn't work with "-1", which is the default
tempInt
=
config_GetInt
(
p_intf
,
"time-size"
);
* value */
while
(
[[[
o_time_size_pop
itemAtIndex
:
x
]
title
]
intValue
]
!=
tempInt
)
[
o_time_size_pop
selectItemWithTitle
:
x
=
(
x
+
1
);
[[
NSNumber
numberWithInt
:
config_GetInt
(
p_intf
,
"time-size"
)]
stringValue
]];
if
(
x
>=
[
o_time_size_pop
numberOfItems
]
)
[
o_time_pos_radio
selectCellWithTag
:
config_GetInt
(
p_intf
,
"time-position"
)];
{
x
=
0
;
return
;
}
[
o_time_size_pop
selectItemAtIndex
:
x
];
x
=
0
;
tempInt
=
config_GetInt
(
p_intf
,
"time-position"
);
while
(
tempInt
!=
[[
o_time_pos_rel_pop
itemAtIndex
:
x
]
tag
]
)
{
x
=
(
x
+
1
);
if
(
x
>=
[
o_time_pos_rel_pop
numberOfItems
]
)
{
x
=
0
;
return
;
}
}
/* retrieve the logo settings */
/* retrieve the logo settings */
[
o_logo_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"logo-transparency"
)];
[
o_logo_opaque_sld
setIntValue
:
config_GetInt
(
p_intf
,
"logo-transparency"
)];
/* in case that no path has been saved yet */
/* in case that no path has been saved yet */
NSString
*
tempString
=
[[
NSString
alloc
]
initWithUTF8String
:
\
if
(
config_GetPsz
(
p_intf
,
"logo-file"
)
)
config_GetPsz
(
p_intf
,
"logo-file"
)];
[
o_logo_image_fld
setStringValue
:
[
NSString
stringWithUTF8String
:
if
(
[
tempString
length
]
==
0
)
config_GetPsz
(
p_intf
,
"logo-file"
)]];
{
[
o_logo_image_fld
setStringValue
:
@""
];
}
else
else
{
[
o_logo_image_fld
setStringValue
:
@""
];
[
o_logo_image_fld
setStringValue
:
tempString
];
[
o_logo_pos_radio
selectCellWithTag
:
config_GetInt
(
p_intf
,
"logo-position"
)];
}
[
tempString
release
];
x
=
0
;
tempInt
=
config_GetInt
(
p_intf
,
"logo-position"
);
while
(
tempInt
!=
[[
o_logo_pos_rel_pop
itemAtIndex
:
x
]
tag
]
)
{
x
=
(
x
+
1
);
if
(
x
>=
[
o_logo_pos_rel_pop
numberOfItems
]
)
{
x
=
0
;
return
;
}
}
/* enable the
wan
ted filters */
/* enable the
reques
ted filters */
char
*
psz_subfilters
;
char
*
psz_subfilters
;
psz_subfilters
=
config_GetPsz
(
p_intf
,
"sub-filter"
);
psz_subfilters
=
config_GetPsz
(
p_intf
,
"sub-filter"
);
if
(
psz_subfilters
)
if
(
psz_subfilters
)
{
{
[
o_marq_enabled_ckb
setState
:
(
int
)
strstr
(
psz_subfilters
,
"marq"
)];
[
o_marq_enabled_ckb
setState
:
(
bool
)
strstr
(
psz_subfilters
,
"marq"
)];
[
o_logo_enabled_ckb
setState
:
(
int
)
strstr
(
psz_subfilters
,
"logo"
)];
[
o_logo_enabled_ckb
setState
:
(
bool
)
strstr
(
psz_subfilters
,
"logo"
)];
[
o_time_enabled_ckb
setState
:
(
int
)
strstr
(
psz_subfilters
,
"time"
)];
[
o_time_enabled_ckb
setState
:
(
bool
)
strstr
(
psz_subfilters
,
"time"
)];
}
[
self
enableMarq
];
[
self
enableMarq
];
[
self
enableLogo
];
[
self
enableLogo
];
[
self
enableTime
];
[
self
enableTime
];
}
}
}
-
(
IBAction
)
logo_selectFile
:(
id
)
sender
-
(
IBAction
)
logo_selectFile
:(
id
)
sender
{
{
NSOpenPanel
*
openPanel
=
[
NSOpenPanel
openPanel
];
NSOpenPanel
*
openPanel
=
[
NSOpenPanel
openPanel
];
SEL
sel
=
@selector
(
logo_getFile
:
returnCode
:
contextInfo
:
);
SEL
sel
=
@selector
(
logo_getFile
:
returnCode
:
contextInfo
:
);
[
openPanel
beginSheetForDirectory
:
nil
file
:
nil
types
:
[
NSArray
\
[
openPanel
beginSheetForDirectory
:
nil
file
:
nil
types
:
[
NSArray
arrayWithObjects
:
@"png"
,
@"PNG"
,
@"'PNGf'"
,
nil
]
modalForWindow
:
\
arrayWithObjects:
@"png"
,
@"PNG"
,
@"'PNGf'"
,
nil
]
modalForWindow
:
o_sfilter_win
modalDelegate
:
self
didEndSelector
:
sel
contextInfo
:
nil
];
o_sfilter_win
modalDelegate
:
self
didEndSelector
:
sel
contextInfo
:
nil
];
}
}
-
(
void
)
logo_getFile
:
(
NSOpenPanel
*
)
sheet
returnCode
:
\
-
(
void
)
logo_getFile
:
(
NSOpenPanel
*
)
sheet
returnCode
:
(
int
)
returnCode
contextInfo
:
(
void
*
)
contextInfo
(
int
)
returnCode
contextInfo
:
(
void
*
)
contextInfo
{
{
if
(
returnCode
==
NSOKButton
)
if
(
returnCode
==
NSOKButton
)
...
@@ -393,7 +328,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -393,7 +328,7 @@ static VLCsFilters *_o_sharedInstance = nil;
-
(
IBAction
)
propertyChanged
:(
id
)
sender
-
(
IBAction
)
propertyChanged
:(
id
)
sender
{
{
intf_thread_t
*
p_intf
=
VLCIntf
;
intf_thread_t
*
p_intf
=
VLCIntf
;
input_thread_t
*
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_intf
,
\
input_thread_t
*
p_input
=
(
input_thread_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_INPUT
,
FIND_ANYWHERE
);
VLC_OBJECT_INPUT
,
FIND_ANYWHERE
);
vlc_value_t
val
;
vlc_value_t
val
;
...
@@ -422,9 +357,9 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -422,9 +357,9 @@ static VLCsFilters *_o_sharedInstance = nil;
config_PutPsz
(
p_intf
,
"marq-marquee"
,
val
.
psz_string
);
config_PutPsz
(
p_intf
,
"marq-marquee"
,
val
.
psz_string
);
}
}
else
if
(
sender
==
o_marq_pos_r
el_pop
)
else
if
(
sender
==
o_marq_pos_r
adio
)
{
{
val
.
i_int
=
[[
o_marq_pos_r
el_pop
selectedItem
]
tag
];
val
.
i_int
=
[[
o_marq_pos_r
adio
selectedCell
]
tag
];
if
(
p_input
)
if
(
p_input
)
var_Set
(
p_input
->
p_libvlc
,
"marq-position"
,
val
);
var_Set
(
p_input
->
p_libvlc
,
"marq-position"
,
val
);
...
@@ -434,7 +369,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -434,7 +369,7 @@ static VLCsFilters *_o_sharedInstance = nil;
else
if
(
sender
==
o_marq_color_pop
)
else
if
(
sender
==
o_marq_color_pop
)
{
{
val
.
i_int
=
strtol
(
[[[
o_colors
objectAtIndex
:
[
o_marq_color_pop
\
val
.
i_int
=
strtol
(
[[[
o_colors
objectAtIndex
:
[
o_marq_color_pop
indexOfSelectedItem
]]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
);
indexOfSelectedItem
]]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
);
if
(
p_input
)
if
(
p_input
)
...
@@ -492,9 +427,9 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -492,9 +427,9 @@ static VLCsFilters *_o_sharedInstance = nil;
config_PutPsz
(
p_intf
,
"time-format"
,
val
.
psz_string
);
config_PutPsz
(
p_intf
,
"time-format"
,
val
.
psz_string
);
}
}
else
if
(
sender
==
o_time_pos_r
el_pop
)
else
if
(
sender
==
o_time_pos_r
adio
)
{
{
val
.
i_int
=
[[
o_time_pos_r
el_pop
selectedItem
]
tag
];
val
.
i_int
=
[[
o_time_pos_r
adio
selectedCell
]
tag
];
if
(
p_input
)
if
(
p_input
)
var_Set
(
p_input
->
p_libvlc
,
"time-position"
,
val
);
var_Set
(
p_input
->
p_libvlc
,
"time-position"
,
val
);
...
@@ -504,7 +439,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -504,7 +439,7 @@ static VLCsFilters *_o_sharedInstance = nil;
else
if
(
sender
==
o_time_color_pop
)
else
if
(
sender
==
o_time_color_pop
)
{
{
val
.
i_int
=
strtol
(
[[[
o_colors
objectAtIndex
:
[
o_time_color_pop
\
val
.
i_int
=
strtol
(
[[[
o_colors
objectAtIndex
:
[
o_time_color_pop
indexOfSelectedItem
]]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
);
indexOfSelectedItem
]]
objectAtIndex
:
1
]
UTF8String
],
NULL
,
0
);
if
(
p_input
)
if
(
p_input
)
...
@@ -544,15 +479,20 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -544,15 +479,20 @@ static VLCsFilters *_o_sharedInstance = nil;
config_PutInt
(
p_intf
,
"logo-transparency"
,
val
.
i_int
);
config_PutInt
(
p_intf
,
"logo-transparency"
,
val
.
i_int
);
}
}
else
if
(
sender
==
o_logo_pos_r
el_pop
)
else
if
(
sender
==
o_logo_pos_r
adio
)
{
{
val
.
i_int
=
[[
o_logo_pos_r
el_pop
selectedItem
]
tag
];
val
.
i_int
=
[[
o_logo_pos_r
adio
selectedCell
]
tag
];
if
(
p_input
)
if
(
p_input
)
var_Set
(
p_input
->
p_libvlc
,
"logo-position"
,
val
);
var_Set
(
p_input
->
p_libvlc
,
"logo-position"
,
val
);
config_PutInt
(
p_intf
,
"logo-position"
,
val
.
i_int
);
config_PutInt
(
p_intf
,
"logo-position"
,
val
.
i_int
);
}
}
else
{
/* just in case */
msg_Err
(
p_intf
,
"couldn't find any action for sender"
);
}
/* clean up */
/* clean up */
if
(
p_input
)
if
(
p_input
)
...
@@ -609,7 +549,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -609,7 +549,7 @@ static VLCsFilters *_o_sharedInstance = nil;
[
o_marq_opaque_sld
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_opaque_sld
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_size_pop
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_size_pop
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_tmOut_fld
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_tmOut_fld
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_pos_r
el_pop
setEnabled
:
[
o_marq_enabled_ckb
state
]];
[
o_marq_pos_r
adio
setEnabled
:
[
o_marq_enabled_ckb
state
]];
}
}
-
(
void
)
enableTime
-
(
void
)
enableTime
...
@@ -618,7 +558,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -618,7 +558,7 @@ static VLCsFilters *_o_sharedInstance = nil;
[
o_time_stamp_fld
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_stamp_fld
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_opaque_sld
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_opaque_sld
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_size_pop
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_size_pop
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_pos_r
el_pop
setEnabled
:
[
o_time_enabled_ckb
state
]];
[
o_time_pos_r
adio
setEnabled
:
[
o_time_enabled_ckb
state
]];
}
}
-
(
void
)
enableLogo
-
(
void
)
enableLogo
...
@@ -626,7 +566,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -626,7 +566,7 @@ static VLCsFilters *_o_sharedInstance = nil;
[
o_logo_image_btn
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_image_btn
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_image_fld
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_image_fld
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_opaque_sld
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_opaque_sld
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_pos_r
el_pop
setEnabled
:
[
o_logo_enabled_ckb
state
]];
[
o_logo_pos_r
adio
setEnabled
:
[
o_logo_enabled_ckb
state
]];
}
}
-
(
void
)
changeFiltersString
:(
char
*
)
psz_name
onOrOff
:(
vlc_bool_t
)
b_add
-
(
void
)
changeFiltersString
:(
char
*
)
psz_name
onOrOff
:(
vlc_bool_t
)
b_add
...
@@ -683,7 +623,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -683,7 +623,7 @@ static VLCsFilters *_o_sharedInstance = nil;
/* Try to set on the fly */
/* Try to set on the fly */
/* FIXME: enable this once we support on-the-fly addition of this kind of
/* FIXME: enable this once we support on-the-fly addition of this kind of
* filters...
* filters...
*/
vout_thread_t
*
p_vout
;
vout_thread_t
*
p_vout
;
p_vout
=
(
vout_thread_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
p_vout
=
(
vout_thread_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
FIND_ANYWHERE
);
FIND_ANYWHERE
);
...
@@ -691,7 +631,7 @@ static VLCsFilters *_o_sharedInstance = nil;
...
@@ -691,7 +631,7 @@ static VLCsFilters *_o_sharedInstance = nil;
{
{
var_SetString
(
p_vout
,
"sub-filter"
,
psz_string
);
var_SetString
(
p_vout
,
"sub-filter"
,
psz_string
);
vlc_object_release
(
p_vout
);
vlc_object_release
(
p_vout
);
}
*/
}
free
(
psz_string
);
free
(
psz_string
);
...
...
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