Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
3b20c97b
Commit
3b20c97b
authored
Jul 06, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: constify char* parameters for setVideoFilter*
parent
689f67e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
18 deletions
+18
-18
modules/gui/macosx/CoreInteraction.h
modules/gui/macosx/CoreInteraction.h
+5
-5
modules/gui/macosx/CoreInteraction.m
modules/gui/macosx/CoreInteraction.m
+7
-7
modules/gui/macosx/VideoEffects.m
modules/gui/macosx/VideoEffects.m
+6
-6
No files found.
modules/gui/macosx/CoreInteraction.h
View file @
3b20c97b
...
...
@@ -80,9 +80,9 @@
-
(
BOOL
)
fixPreferences
;
-
(
void
)
setVideoFilter
:
(
char
*
)
psz_name
on
:(
BOOL
)
b_on
;
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
integer
:
(
int
)
i_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
float
:
(
float
)
f_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
string
:
(
const
char
*
)
psz_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
boolean
:
(
BOOL
)
b_value
;
-
(
void
)
setVideoFilter
:
(
c
onst
c
har
*
)
psz_name
on
:(
BOOL
)
b_on
;
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
integer
:
(
int
)
i_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
float
:
(
float
)
f_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
string
:
(
const
char
*
)
psz_value
;
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
boolean
:
(
BOOL
)
b_value
;
@end
modules/gui/macosx/CoreInteraction.m
View file @
3b20c97b
...
...
@@ -680,7 +680,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
#pragma mark - video filter handling
-
(
const
char
*
)
getFilterType
:(
char
*
)
psz_name
-
(
const
char
*
)
getFilterType
:(
c
onst
c
har
*
)
psz_name
{
module_t
*
p_obj
=
module_find
(
psz_name
);
if
(
!
p_obj
)
{
...
...
@@ -701,7 +701,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
}
}
-
(
void
)
setVideoFilter
:
(
char
*
)
psz_name
on
:(
BOOL
)
b_on
-
(
void
)
setVideoFilter
:
(
c
onst
c
har
*
)
psz_name
on
:(
BOOL
)
b_on
{
intf_thread_t
*
p_intf
=
VLCIntf
;
if
(
!
p_intf
)
...
...
@@ -765,7 +765,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
free
(
psz_string
);
}
-
(
void
)
restartFilterIfNeeded
:
(
c
har
*
)
psz_filter
option
:
(
char
*
)
psz_name
-
(
void
)
restartFilterIfNeeded
:
(
c
onst
char
*
)
psz_filter
option
:
(
const
char
*
)
psz_name
{
vout_thread_t
*
p_vout
=
getVout
();
intf_thread_t
*
p_intf
=
VLCIntf
;
...
...
@@ -819,7 +819,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
}
}
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
integer
:
(
int
)
i_value
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
integer
:
(
int
)
i_value
{
vout_thread_t
*
p_vout
=
getVout
();
vlc_object_t
*
p_filter
;
...
...
@@ -845,7 +845,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
}
}
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
float
:
(
float
)
f_value
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
float
:
(
float
)
f_value
{
vout_thread_t
*
p_vout
=
getVout
();
vlc_object_t
*
p_filter
;
...
...
@@ -871,7 +871,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
}
}
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
string
:
(
const
char
*
)
psz_value
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
string
:
(
const
char
*
)
psz_value
{
char
*
psz_new_value
=
strdup
(
psz_value
);
vout_thread_t
*
p_vout
=
getVout
();
...
...
@@ -900,7 +900,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
free
(
psz_new_value
);
}
-
(
void
)
setVideoFilterProperty
:
(
c
har
*
)
psz_name
forFilter
:
(
char
*
)
psz_filter
boolean
:
(
BOOL
)
b_value
-
(
void
)
setVideoFilterProperty
:
(
c
onst
char
*
)
psz_name
forFilter
:
(
const
char
*
)
psz_filter
boolean
:
(
BOOL
)
b_value
{
vout_thread_t
*
p_vout
=
getVout
();
vlc_object_t
*
p_filter
;
...
...
modules/gui/macosx/VideoEffects.m
View file @
3b20c97b
...
...
@@ -585,7 +585,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
tempArray
=
[
tempString
componentsSeparatedByString
:
@":"
];
count
=
[
tempArray
count
];
for
(
NSUInteger
x
=
0
;
x
<
count
;
x
++
)
[
vci_si
setVideoFilter
:
(
char
*
)
[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
[
vci_si
setVideoFilter
:[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
}
tempString
=
B64DecNSStr
([
items
objectAtIndex
:
1
]);
...
...
@@ -595,7 +595,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
tempArray
=
[
tempString
componentsSeparatedByString
:
@":"
];
count
=
[
tempArray
count
];
for
(
NSUInteger
x
=
0
;
x
<
count
;
x
++
)
[
vci_si
setVideoFilter
:
(
char
*
)
[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
[
vci_si
setVideoFilter
:[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
}
tempString
=
B64DecNSStr
([
items
objectAtIndex
:
2
]);
...
...
@@ -605,7 +605,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
tempArray
=
[
tempString
componentsSeparatedByString
:
@":"
];
count
=
[
tempArray
count
];
for
(
NSUInteger
x
=
0
;
x
<
count
;
x
++
)
[
vci_si
setVideoFilter
:
(
char
*
)
[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
[
vci_si
setVideoFilter
:[[
tempArray
objectAtIndex
:
x
]
UTF8String
]
on
:
YES
];
}
/* try to set filter values on-the-fly and store them appropriately */
...
...
@@ -1138,14 +1138,14 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[
o_addtext_text_lbl
setEnabled
:
b_state
];
[
o_addtext_text_fld
setEnabled
:
b_state
];
[
vci_si
setVideoFilter
:
"marq"
on
:
b_state
];
[
vci_si
setVideoFilterProperty
:
"marq-marquee"
forFilter
:
"marq"
string
:
(
char
*
)
[[
o_addtext_text_fld
stringValue
]
UTF8String
]];
[
vci_si
setVideoFilterProperty
:
"marq-marquee"
forFilter
:
"marq"
string
:
[[
o_addtext_text_fld
stringValue
]
UTF8String
]];
[
vci_si
setVideoFilterProperty
:
"marq-position"
forFilter
:
"marq"
integer
:
[[
o_addtext_pos_pop
selectedItem
]
tag
]];
}
-
(
IBAction
)
addTextModifierChanged
:(
id
)
sender
{
if
(
sender
==
o_addtext_text_fld
)
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"marq-marquee"
forFilter
:
"marq"
string
:
(
char
*
)
[[
o_addtext_text_fld
stringValue
]
UTF8String
]];
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"marq-marquee"
forFilter
:
"marq"
string
:
[[
o_addtext_text_fld
stringValue
]
UTF8String
]];
else
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"marq-position"
forFilter
:
"marq"
integer
:
[[
o_addtext_pos_pop
selectedItem
]
tag
]];
}
...
...
@@ -1166,7 +1166,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
-
(
IBAction
)
addLogoModifierChanged
:(
id
)
sender
{
if
(
sender
==
o_addlogo_logo_fld
)
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"logo-file"
forFilter
:
"logo"
string
:
(
char
*
)
[[
o_addlogo_logo_fld
stringValue
]
UTF8String
]];
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"logo-file"
forFilter
:
"logo"
string
:
[[
o_addlogo_logo_fld
stringValue
]
UTF8String
]];
else
if
(
sender
==
o_addlogo_pos_pop
)
[[
VLCCoreInteraction
sharedInstance
]
setVideoFilterProperty
:
"logo-position"
forFilter
:
"logo"
integer
:
[[
o_addlogo_pos_pop
selectedItem
]
tag
]];
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