Add deinterlace option, off by default (close #8813)

04b5c7fa · Felix Paul Kühne · a016c0cc · 04b5c7fa · 04b5c7fa · 04b5c7fa
Commit 04b5c7fa authored Aug 10, 2013 by Felix Paul Kühne
28 changed files
--- a/AspenProject/VLCAppDelegate.m
+++ b/AspenProject/VLCAppDelegate.m
@@ -43,7 +43,7 @@
    else
        skipLoopFilterDefaultValue = kVLCSettingSkipLoopFilterNonRef;

-    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : @(NO), kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue, kVLCSettingSkipLoopFilter : skipLoopFilterDefaultValue, kVLCSettingSubtitlesFont : kVLCSettingSubtitlesFontDefaultValue, kVLCSettingSubtitlesFontColor : kVLCSettingSubtitlesFontColorDefaultValue, kVLCSettingSubtitlesFontSize : kVLCSettingSubtitlesFontSizeDefaultValue};
+    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : @(NO), kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue, kVLCSettingSkipLoopFilter : skipLoopFilterDefaultValue, kVLCSettingSubtitlesFont : kVLCSettingSubtitlesFontDefaultValue, kVLCSettingSubtitlesFontColor : kVLCSettingSubtitlesFontColorDefaultValue, kVLCSettingSubtitlesFontSize : kVLCSettingSubtitlesFontSizeDefaultValue, kVLCSettingDeinterlace : kVLCSettingDeinterlaceDefaultValue};

    [defaults registerDefaults:appDefaults];
 }

--- a/AspenProject/VLCConstants.h
+++ b/AspenProject/VLCConstants.h
@@ -29,6 +29,8 @@
 #define kVLCSettingSubtitlesFontSizeDefaultValue @"16"
 #define kVLCSettingSubtitlesFontColor @"quartztext-color"
 #define kVLCSettingSubtitlesFontColorDefaultValue @"16777215"
+#define kVLCSettingDeinterlace @"deinterlace"
+#define kVLCSettingDeinterlaceDefaultValue @"0"

 #define kVLCShowRemainingTime @"show-remaining-time"
 #define kVLCRecentURLs @"recent-urls"

--- a/AspenProject/VLCMovieViewController.m
+++ b/AspenProject/VLCMovieViewController.m
@@ -231,7 +231,7 @@

    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

-    _mediaPlayer = [[VLCMediaPlayer alloc] initWithOptions:@[[NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFont, [defaults objectForKey:kVLCSettingSubtitlesFont]], [NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFontColor, [defaults objectForKey:kVLCSettingSubtitlesFontColor]], [NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFontSize, [defaults objectForKey:kVLCSettingSubtitlesFontSize]]]];
+    _mediaPlayer = [[VLCMediaPlayer alloc] initWithOptions:@[[NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFont, [defaults objectForKey:kVLCSettingSubtitlesFont]], [NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFontColor, [defaults objectForKey:kVLCSettingSubtitlesFontColor]], [NSString stringWithFormat:@"--%@=%@", kVLCSettingSubtitlesFontSize, [defaults objectForKey:kVLCSettingSubtitlesFontSize]], [NSString stringWithFormat:@"--%@=%@", kVLCSettingDeinterlace, [defaults objectForKey:kVLCSettingDeinterlace]]]];
    [_mediaPlayer setDelegate:self];
    [_mediaPlayer setDrawable:self.movieView];


--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 * Add support for subtitles in non-western languages (#8991)
 * Improved Subtitles support with options to choose font, size, and color
 * Add Bonjour announcement for the WiFi Uploader's website (#8741)
+* Add Deinterlace option (off by default, #8813)
 * Device no longer goes to sleep during media downloads (#9062)
 * Improved video output on external screens (#9079)
 * New translations to Bosnian, Catalan, Galician, Marathi, Portuguese

--- a/Resources/Settings.bundle/Root.inApp.plist
+++ b/Resources/Settings.bundle/Root.inApp.plist
@@ -48,6 +48,28 @@
 				<integer>3</integer>
 			</array>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_DEINTERLACE</string>
+			<key>Key</key>
+			<string>deinterlace</string>
+			<key>DefaultValue</key>
+			<string>0</string>
+			<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>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>

--- a/Resources/Settings.bundle/Root.plist
+++ b/Resources/Settings.bundle/Root.plist
@@ -32,6 +32,28 @@
 				<integer>3</integer>
 			</array>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_DEINTERLACE</string>
+			<key>Key</key>
+			<string>deinterlace</string>
+			<key>DefaultValue</key>
+			<string>0</string>
+			<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>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>

--- a/Resources/Settings.bundle/bs.lproj/Root.strings
+++ b/Resources/Settings.bundle/bs.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/ca.lproj/Root.strings
+++ b/Resources/Settings.bundle/ca.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/da.lproj/Root.strings
+++ b/Resources/Settings.bundle/da.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/de.lproj/Root.strings
+++ b/Resources/Settings.bundle/de.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/en.lproj/Root.strings
+++ b/Resources/Settings.bundle/en.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/es.lproj/Root.strings
+++ b/Resources/Settings.bundle/es.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/fi.lproj/Root.strings
+++ b/Resources/Settings.bundle/fi.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/fr.lproj/Root.strings
+++ b/Resources/Settings.bundle/fr.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/gl.lproj/Root.strings
+++ b/Resources/Settings.bundle/gl.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/he.lproj/Root.strings
+++ b/Resources/Settings.bundle/he.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/id.lproj/Root.strings
+++ b/Resources/Settings.bundle/id.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/it.lproj/Root.strings
+++ b/Resources/Settings.bundle/it.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/ja.lproj/Root.strings
+++ b/Resources/Settings.bundle/ja.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/mr.lproj/Root.strings
+++ b/Resources/Settings.bundle/mr.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/nl.lproj/Root.strings
+++ b/Resources/Settings.bundle/nl.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/pt.lproj/Root.strings
+++ b/Resources/Settings.bundle/pt.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/ru.lproj/Root.strings
+++ b/Resources/Settings.bundle/ru.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/sk.lproj/Root.strings
+++ b/Resources/Settings.bundle/sk.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/tr.lproj/Root.strings
+++ b/Resources/Settings.bundle/tr.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/uk.lproj/Root.strings
+++ b/Resources/Settings.bundle/uk.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/vi.lproj/Root.strings
+++ b/Resources/Settings.bundle/vi.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */

--- a/Resources/Settings.bundle/zh-Hans.lproj/Root.strings
+++ b/Resources/Settings.bundle/zh-Hans.lproj/Root.strings
 B/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */