Switch back to std:: muteces. mutices. mutexen.

src/xenia/apu/xma_context.cc

@@ -99,7 +99,7 @@ int XmaContext::Setup(uint32_t id, Memory* memory, uint32_t guest_ptr) {
 }
 
 void XmaContext::Work() {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
   if (!is_allocated() || !is_enabled()) {
     return;
   }
@@ -113,7 +113,7 @@ void XmaContext::Work() {
 }
 
 void XmaContext::Enable() {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
 
   auto context_ptr = memory()->TranslateVirtual(guest_ptr());
   XMA_CONTEXT_DATA data(context_ptr);
@@ -141,7 +141,7 @@ bool XmaContext::Block(bool poll) {
 }
 
 void XmaContext::Clear() {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
   XELOGAPU("XmaContext: reset context %d", id());
 
   auto context_ptr = memory()->TranslateVirtual(guest_ptr());
@@ -158,14 +158,14 @@ void XmaContext::Clear() {
 }
 
 void XmaContext::Disable() {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
   XELOGAPU("XmaContext: disabling context %d", id());
   set_is_enabled(false);
 }
 
 void XmaContext::Release() {
   // Lock it in case the decoder thread is working on it now.
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
   assert_true(is_allocated_ == true);
 
   set_is_allocated(false);

src/xenia/apu/xma_context.h

@@ -11,9 +11,9 @@
 #define XENIA_APU_XMA_CONTEXT_H_
 
 #include <atomic>
+#include <mutex>
 #include <queue>
 
-#include "xenia/base/mutex.h"
 #include "xenia/memory.h"
 #include "xenia/xbox.h"
 
@@ -192,7 +192,7 @@ class XmaContext {
 
   uint32_t id_ = 0;
   uint32_t guest_ptr_ = 0;
-  xe::mutex lock_;
+  std::mutex lock_;
   bool is_allocated_ = false;
   bool is_enabled_ = false;
 

src/xenia/apu/xma_decoder.cc

@@ -163,7 +163,7 @@ int XmaDecoder::GetContextId(uint32_t guest_ptr) {
 }
 
 uint32_t XmaDecoder::AllocateContext() {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
 
   for (uint32_t n = 0; n < kContextCount; n++) {
     XmaContext& context = contexts_[n];
@@ -177,7 +177,7 @@ uint32_t XmaDecoder::AllocateContext() {
 }
 
 void XmaDecoder::ReleaseContext(uint32_t guest_ptr) {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
 
   auto context_id = GetContextId(guest_ptr);
   assert_true(context_id >= 0);
@@ -187,7 +187,7 @@ void XmaDecoder::ReleaseContext(uint32_t guest_ptr) {
 }
 
 bool XmaDecoder::BlockOnContext(uint32_t guest_ptr, bool poll) {
-  std::lock_guard<xe::mutex> lock(lock_);
+  std::lock_guard<std::mutex> lock(lock_);
 
   auto context_id = GetContextId(guest_ptr);
   assert_true(context_id >= 0);

src/xenia/apu/xma_decoder.h

@@ -11,10 +11,10 @@
 #define XENIA_APU_XMA_DECODER_H_
 
 #include <atomic>
+#include <mutex>
 #include <queue>
 
 #include "xenia/apu/xma_context.h"
-#include "xenia/base/mutex.h"
 #include "xenia/kernel/objects/xthread.h"
 #include "xenia/xbox.h"
 
@@ -66,7 +66,7 @@ class XmaDecoder {
   kernel::object_ref<kernel::XHostThread> worker_thread_;
   xe::threading::Fence worker_fence_;
 
-  xe::mutex lock_;
+  std::mutex lock_;
 
   // Stored little endian, accessed through 0x7FEA....
   union {