summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-content-media-nsAudioStream.cpp
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-01-10 22:29:23 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-01-10 22:29:23 +0000
commite676e2910f592704af67424758ebd4cfdff9ebcd (patch)
treedd14b47bf2d53036668a1976cb68d74952705242 /www/firefox/files/patch-content-media-nsAudioStream.cpp
parent- bump PORTREVISION since shlib version of gflags was changed (diff)
- update www/firefox to 18.0
- update www/firefox-esr to 17.0.2 - update www/seamonkey to 2.15 (enigmail to 1.5.0) - remove QT4 option to avoid confusion (it turned out to be too experimental) In collaboration with: Jan Beich <jbeich@tormail.org> Security: http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
Notes
Notes: svn path=/head/; revision=310207
Diffstat (limited to 'www/firefox/files/patch-content-media-nsAudioStream.cpp')
-rw-r--r--www/firefox/files/patch-content-media-nsAudioStream.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/www/firefox/files/patch-content-media-nsAudioStream.cpp b/www/firefox/files/patch-content-media-nsAudioStream.cpp
index bd0f0d4963db..f65a6678b05a 100644
--- a/www/firefox/files/patch-content-media-nsAudioStream.cpp
+++ b/www/firefox/files/patch-content-media-nsAudioStream.cpp
@@ -1,14 +1,11 @@
--- content/media/nsAudioStream.cpp~
+++ content/media/nsAudioStream.cpp
-@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
- gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull));
+@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
+ gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
}
} else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
-+#if defined(__FreeBSD__) && __FreeBSD_version < 800097
-+ bool value = Preferences::GetBool(aPref, false);
-+#else
+-#ifdef MOZ_WIDGET_GONK
++#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097
+ bool value = Preferences::GetBool(aPref, false);
+ #else
bool value = Preferences::GetBool(aPref, true);
-+#endif
- mozilla::MutexAutoLock lock(*gAudioPrefsLock);
- gUseCubeb = value;
- } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) {