From a34745036b4ac105d2a8e53807fabdf722149046 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 1 Sep 2019 21:19:49 -0700
Subject: Sync with upstream

---
 PKGBUILD  | 4 ++--
 vendor.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 6837699..d5f8794 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
-pkgver=20190717
+pkgver=20190901
 pkgrel=1
 pkgdesc="Vendor.js for Firefox (Basic)"
 arch=(x86_64)
@@ -17,7 +17,7 @@ makedepends=()
 conflicts=(firefox-preferences)
 provides=(firefox-preferences)
 source=(vendor.js)
-sha512sums=('7d2c6cf38d9d61d79e82b034ae2a6df36c498835b5f5ff05514532ca69db1fe6e52b969794102b26d5127959fb4d7703a178ed03b38737fdbbd7827d988be73a')
+sha512sums=('50a3c5b0648ce0da1cac511fd790acab889c70faafdcd05c9e33e5c3296e43a0edc3f71678cdb9e9720284a75b82364e6803ea546bef77a8afb65c35fec5bade')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index 5c00134..bc061ce 100644
--- a/vendor.js
+++ b/vendor.js
@@ -382,9 +382,10 @@ pref("lightweightThemes.recommendedThemes", "");  //Conflict
 pref("mathml.disabled", true);
 
 pref("media.audio_data.enabled", false);
-pref("media.autoplay.enabled", false);
 //pref("media.autoplay.default", 0);
-pref("media.autoplay.default", 1);  //Conflict
+pref("media.autoplay.default", 5);  //Conflict
+pref("media.autoplay.enabled", false);
+pref("media.autoplay.allow-muted", false);
 pref("media.autoplay.enabled.user-gestures-needed", false);
 pref("media.benchmark.vp9.threshold", 0);
 pref("media.block-autoplay-until-in-foreground", true);
@@ -523,8 +524,6 @@ pref("permissions.memory_only", false);  //Conflict
 
 pref("plugin.disable", true);
 pref("plugin.expose_full_path", false);
-//pref("plugin.sessionPermissionNow.intervalInMinutes", 60);
-pref("plugin.sessionPermissionNow.intervalInMinutes", 0);  //Conflict
 //pref("plugin.state.flash", 1);
 pref("plugin.state.flash", 0);  //Conflict
 
-- 
cgit v1.2.1