summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-03 14:14:19 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-03 14:14:19 -0500
commit732fe36241032a1793e09209ccc06cb720225b9e (patch)
tree77d9847d4ff4724d04c266d4ac6103be9e39dc94
parent6ee3467a6cfa5a4bd5ca252e00e1b58c469a5011 (diff)
downloadUXP-732fe36241032a1793e09209ccc06cb720225b9e.tar
UXP-732fe36241032a1793e09209ccc06cb720225b9e.tar.gz
UXP-732fe36241032a1793e09209ccc06cb720225b9e.tar.lz
UXP-732fe36241032a1793e09209ccc06cb720225b9e.tar.xz
UXP-732fe36241032a1793e09209ccc06cb720225b9e.zip
Revert "Issue #1267 - Part 2: fix libcubeb bindings in dom"
This reverts commit 22b35fa8e923d52a3fa785993c28c3e63cd1ee1e.
-rw-r--r--dom/media/CubebUtils.cpp4
-rw-r--r--dom/media/GraphDriver.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index 8f1ea0179..0f0167d9c 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -55,7 +55,6 @@ bool sCubebPlaybackLatencyPrefSet;
bool sCubebMSGLatencyPrefSet;
bool sAudioStreamInitEverSucceeded = false;
StaticAutoPtr<char> sBrandName;
-StaticAutoPtr<char> sCubebBackendName;
const char kBrandBundleURL[] = "chrome://branding/locale/brand.properties";
@@ -227,7 +226,7 @@ cubeb* GetCubebContextUnlocked()
sBrandName, "Did not initialize sbrandName, and not on the main thread?");
}
- int rv = cubeb_init(&sCubebContext, sBrandName, sCubebBackendName);
+ int rv = cubeb_init(&sCubebContext, sBrandName);
NS_WARNING_ASSERTION(rv == CUBEB_OK, "Could not get a cubeb context.");
sCubebState = (rv == CUBEB_OK) ? CubebState::Initialized : CubebState::Uninitialized;
@@ -293,7 +292,6 @@ void ShutdownLibrary()
sCubebContext = nullptr;
}
sBrandName = nullptr;
- sCubebBackendName = nullptr;
// This will ensure we don't try to re-create a context.
sCubebState = CubebState::Shutdown;
}
diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index aa75918f1..37c692a4b 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -656,7 +656,7 @@ AudioCallbackDriver::Init()
if (latencyPref) {
latency_frames = latencyPref.value();
} else {
- if (cubeb_get_min_latency(cubebContext, &output, &latency_frames) != CUBEB_OK) {
+ if (cubeb_get_min_latency(cubebContext, output, &latency_frames) != CUBEB_OK) {
NS_WARNING("Could not get minimal latency from cubeb.");
}
}