Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
a8a9ca26
Commit
a8a9ca26
authored
Mar 24, 2014
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playback: set deinterlace option through libvlc API instead of argc/argv
parent
028f1630
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
Resources/Settings.bundle/Root.inApp.plist
Resources/Settings.bundle/Root.inApp.plist
+0
-2
Resources/Settings.bundle/Root.plist
Resources/Settings.bundle/Root.plist
+0
-2
Sources/VLCMovieViewController.m
Sources/VLCMovieViewController.m
+8
-3
No files found.
Resources/Settings.bundle/Root.inApp.plist
View file @
a8a9ca26
...
...
@@ -106,13 +106,11 @@
<key>
Titles
</key>
<array>
<string>
SETTINGS_DEINTERLACE_ON
</string>
<string>
SETTINGS_DEINTERLACE_AUTO
</string>
<string>
SETTINGS_DEINTERLACE_OFF
</string>
</array>
<key>
Values
</key>
<array>
<integer>
1
</integer>
<integer>
-1
</integer>
<integer>
0
</integer>
</array>
</dict>
...
...
Resources/Settings.bundle/Root.plist
View file @
a8a9ca26
...
...
@@ -96,13 +96,11 @@
<key>
Titles
</key>
<array>
<string>
SETTINGS_DEINTERLACE_ON
</string>
<string>
SETTINGS_DEINTERLACE_AUTO
</string>
<string>
SETTINGS_DEINTERLACE_OFF
</string>
</array>
<key>
Values
</key>
<array>
<integer>
1
</integer>
<integer>
-1
</integer>
<integer>
0
</integer>
</array>
</dict>
...
...
Sources/VLCMovieViewController.m
View file @
a8a9ca26
...
...
@@ -405,11 +405,16 @@
return
;
}
_listPlayer
=
[[
VLCMediaListPlayer
alloc
]
initWithOptions:
@[[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFont
,
[
self
_resolveFontName
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFontColor
,
[
defaults
objectForKey
:
kVLCSettingSubtitlesFontColor
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFontSize
,
[
defaults
objectForKey
:
kVLCSettingSubtitlesFontSize
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingDeinterlace
,
[
defaults
objectForKey
:
kVLCSettingDeinterlace
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingNetworkCaching
,
[
defaults
objectForKey
:
kVLCSettingNetworkCaching
]]]];
NSMutableDictionary
*
mediaDictionary
=
[[
NSMutableDictionary
alloc
]
init
];
_listPlayer
=
[[
VLCMediaListPlayer
alloc
]
initWithOptions
:@[[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFont
,
[
self
_resolveFontName
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFontColor
,
[
defaults
objectForKey
:
kVLCSettingSubtitlesFontColor
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingSubtitlesFontSize
,
[
defaults
objectForKey
:
kVLCSettingSubtitlesFontSize
]],
[
NSString
stringWithFormat
:
@"--%@=%@"
,
kVLCSettingNetworkCaching
,
[
defaults
objectForKey
:
kVLCSettingNetworkCaching
]]]];
_mediaPlayer
=
_listPlayer
.
mediaPlayer
;
[
_mediaPlayer
setDelegate
:
self
];
[
_mediaPlayer
setDrawable
:
self
.
movieView
];
if
([[
defaults
objectForKey
:
kVLCSettingDeinterlace
]
intValue
]
!=
0
)
[
_mediaPlayer
setDeinterlaceFilter
:
@"blend"
];
else
[
_mediaPlayer
setDeinterlaceFilter
:
nil
];
self
.
trackNameLabel
.
text
=
self
.
artistNameLabel
.
text
=
self
.
albumNameLabel
.
text
=
@""
;
VLCMedia
*
media
;
...
...
@@ -424,7 +429,7 @@
[
media
parse
];
}
NSMutableDictionary
*
mediaDictionary
=
[[
NSMutableDictionary
alloc
]
init
];
[
mediaDictionary
setObject
:[[
defaults
objectForKey
:
kVLCSettingStretchAudio
]
boolValue
]
?
kVLCSettingStretchAudioOnValue
:
kVLCSettingStretchAudioOffValue
forKey
:
kVLCSettingStretchAudio
];
[
mediaDictionary
setObject
:[
defaults
objectForKey
:
kVLCSettingTextEncoding
]
forKey
:
kVLCSettingTextEncoding
];
...
...
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