Cleaning up asserts and file/line macros.

src/xenia/apu/audio_system.cc

@@ -82,7 +82,7 @@ void AudioSystem::ThreadStart() {
     auto result = WaitForMultipleObjectsEx(maximum_client_count_, client_wait_handles_, FALSE, INFINITE, FALSE);
     if (result == WAIT_FAILED) {
       DWORD err = GetLastError();
-      XEASSERTALWAYS();
+      assert_always();
       break;
     }
 
@@ -131,7 +131,7 @@ void AudioSystem::Shutdown() {
 
 X_STATUS AudioSystem::RegisterClient(
     uint32_t callback, uint32_t callback_arg, size_t* out_index) {
-  XEASSERTTRUE(unused_clients_.size());
+  assert_true(unused_clients_.size());
   xe_mutex_lock(lock_);
 
   auto index = unused_clients_.front();
@@ -143,7 +143,7 @@ X_STATUS AudioSystem::RegisterClient(
   if (XFAILED(result)) {
     return result;
   }
-  XEASSERTNOTNULL(driver != NULL);
+  assert_not_null(driver);
 
   unused_clients_.pop();
 
@@ -165,8 +165,8 @@ void AudioSystem::SubmitFrame(size_t index, uint32_t samples_ptr) {
   SCOPE_profile_cpu_f("apu");
 
   xe_mutex_lock(lock_);
-  XEASSERTTRUE(index < maximum_client_count_);
-  XEASSERTTRUE(clients_[index].driver != NULL);
+  assert_true(index < maximum_client_count_);
+  assert_true(clients_[index].driver != NULL);
   (clients_[index].driver)->SubmitFrame(samples_ptr);
   ResetEvent(client_wait_handles_[index]);
   xe_mutex_unlock(lock_);
@@ -176,7 +176,7 @@ void AudioSystem::UnregisterClient(size_t index) {
   SCOPE_profile_cpu_f("apu");
 
   xe_mutex_lock(lock_);
-  XEASSERTTRUE(index < maximum_client_count_);
+  assert_true(index < maximum_client_count_);
   DestroyDriver(clients_[index].driver);
   clients_[index] = { 0 };
   unused_clients_.push(index);
@@ -199,4 +199,4 @@ void AudioSystem::WriteRegister(uint64_t addr, uint64_t value) {
   uint32_t r = addr & 0xFFFF;
   XELOGAPU("WriteRegister(%.4X, %.8X)", r, value);
   // 1804h is written to with 0x02000000 and 0x03000000 around a lock operation
-}
+}

src/xenia/apu/nop/nop_audio_system.cc

@@ -29,5 +29,5 @@ X_STATUS NopAudioSystem::CreateDriver(size_t index, HANDLE wait_handle, AudioDri
 }
 
 void NopAudioSystem::DestroyDriver(AudioDriver* driver) {
-  XEASSERTALWAYS();
+  assert_always();
 }

src/xenia/apu/xaudio2/xaudio2_audio_driver.cc

@@ -67,7 +67,7 @@ void XAudio2AudioDriver::Initialize() {
   hr = XAudio2Create(&audio_, 0, XAUDIO2_DEFAULT_PROCESSOR);
   if (FAILED(hr)) {
     XELOGE("XAudio2Create failed with %.8X", hr);
-    XEASSERTALWAYS();
+    assert_always();
     return;
   }
 
@@ -83,7 +83,7 @@ void XAudio2AudioDriver::Initialize() {
   hr = audio_->CreateMasteringVoice(&mastering_voice_);
   if (FAILED(hr)) {
     XELOGE("CreateMasteringVoice failed with %.8X", hr);
-    XEASSERTALWAYS();
+    assert_always();
     return;
   }
 
@@ -106,14 +106,14 @@ void XAudio2AudioDriver::Initialize() {
                                  voice_callback_);
   if (FAILED(hr)) {
     XELOGE("CreateSourceVoice failed with %.8X", hr);
-    XEASSERTALWAYS();
+    assert_always();
     return;
   }
 
   hr = pcm_voice_->Start();
   if (FAILED(hr)) {
     XELOGE("Start failed with %.8X", hr);
-    XEASSERTALWAYS();
+    assert_always();
     return;
   }
 
@@ -148,7 +148,7 @@ void XAudio2AudioDriver::SubmitFrame(uint32_t frame_ptr) {
   hr = pcm_voice_->SubmitSourceBuffer(&buffer);
   if (FAILED(hr)) {
     XELOGE("SubmitSourceBuffer failed with %.8X", hr);
-    XEASSERTALWAYS();
+    assert_always();
     return;
   }
 }

src/xenia/apu/xaudio2/xaudio2_audio_system.cc

@@ -31,7 +31,7 @@ void XAudio2AudioSystem::Initialize() {
 }
 
 X_STATUS XAudio2AudioSystem::CreateDriver(size_t index, HANDLE wait, AudioDriver** out_driver) {
-  XEASSERTNOTNULL(out_driver);
+  assert_not_null(out_driver);
   auto driver = new XAudio2AudioDriver(emulator_, wait);
   driver->Initialize();
   *out_driver = driver;
@@ -39,9 +39,9 @@ X_STATUS XAudio2AudioSystem::CreateDriver(size_t index, HANDLE wait, AudioDriver
 }
 
 void XAudio2AudioSystem::DestroyDriver(AudioDriver* driver) {
-  XEASSERTNOTNULL(driver);
+  assert_not_null(driver);
   auto xdriver = static_cast<XAudio2AudioDriver*>(driver);
   xdriver->Shutdown();
-  XEASSERTNOTNULL(xdriver);
+  assert_not_null(xdriver);
   delete xdriver;
 }