[SVN-Commit] r1053 - in trunk: mail/thunderbird www/firefox-nightly/files www/firefox/files www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Oct  2 08:44:00 2012
New Revision: 1053

Log:
disable libcubeb by default on 7.x

__FreeBSD_version defined via sydney_audio.h

Added:
   trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp
   trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
   trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp
   trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp

Added: trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/patch-mozilla-content-media-nsAudioStream.cpp	Tue Oct  2 08:44:00 2012	(r1053)
@@ -0,0 +1,14 @@
+--- mozilla/content/media/nsAudioStream.cpp~
++++ mozilla/content/media/nsAudioStream.cpp
+@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
+       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull));
+     }
+   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
++#if 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) {

Added: trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp	Tue Oct  2 08:44:00 2012	(r1053)
@@ -0,0 +1,11 @@
+--- content/media/nsAudioStream.cpp~
++++ content/media/nsAudioStream.cpp
+@@ -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) {
+-#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);

Added: trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp	Tue Oct  2 08:44:00 2012	(r1053)
@@ -0,0 +1,14 @@
+--- 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));
+     }
+   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
++#if 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) {

Added: trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp	Tue Oct  2 08:44:00 2012	(r1053)
@@ -0,0 +1,14 @@
+--- mozilla/content/media/nsAudioStream.cpp~
++++ mozilla/content/media/nsAudioStream.cpp
+@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
+       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull));
+     }
+   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
++#if 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) {