Cleaning up apu/ and renaming -private files to _flags.

Part of #296.

src/xenia/apu/nop/nop_apu.cc

@@ -1,40 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#include "xenia/apu/nop/nop_apu.h"
-
-#include "xenia/apu/nop/nop_audio_system.h"
-
-using namespace xe;
-using namespace xe::apu;
-using namespace xe::apu::nop;
-
-namespace {
-void InitializeIfNeeded();
-void CleanupOnShutdown();
-
-void InitializeIfNeeded() {
-  static bool has_initialized = false;
-  if (has_initialized) {
-    return;
-  }
-  has_initialized = true;
-
-  //
-
-  atexit(CleanupOnShutdown);
-}
-
-void CleanupOnShutdown() {}
-}
-
-std::unique_ptr<AudioSystem> xe::apu::nop::Create(Emulator* emulator) {
-  InitializeIfNeeded();
-  return std::make_unique<NopAudioSystem>(emulator);
-}

src/xenia/apu/nop/nop_apu_flags.cc

@@ -0,0 +1,10 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/apu/nop/nop_apu_flags.h"

src/xenia/apu/nop/nop_apu_flags.h

@@ -7,19 +7,9 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_APU_NOP_NOP_APU_PRIVATE_H_
-#define XENIA_APU_NOP_NOP_APU_PRIVATE_H_
+#ifndef XENIA_APU_NOP_NOP_APU_FLAGS_H_
+#define XENIA_APU_NOP_NOP_APU_FLAGS_H_
 
-#include "xenia/apu/nop/nop_apu.h"
+#include <gflags/gflags.h>
 
-namespace xe {
-namespace apu {
-namespace nop {
-
-//
-
-}  // namespace nop
-}  // namespace apu
-}  // namespace xe
-
-#endif  // XENIA_APU_NOP_NOP_APU_PRIVATE_H_
+#endif  // XENIA_APU_NOP_NOP_APU_FLAGS_H_

src/xenia/apu/nop/nop_audio_system.cc

@@ -9,15 +9,19 @@
 
 #include "xenia/apu/nop/nop_audio_system.h"
 
-#include "xenia/apu/apu-private.h"
+#include "xenia/apu/apu_flags.h"
 
-using namespace xe;
-using namespace xe::apu;
-using namespace xe::apu::nop;
+namespace xe {
+namespace apu {
+namespace nop {
+
+std::unique_ptr<AudioSystem> NopAudioSystem::Create(Emulator* emulator) {
+  return std::make_unique<NopAudioSystem>(emulator);
+}
 
 NopAudioSystem::NopAudioSystem(Emulator* emulator) : AudioSystem(emulator) {}
 
-NopAudioSystem::~NopAudioSystem() {}
+NopAudioSystem::~NopAudioSystem() = default;
 
 X_STATUS NopAudioSystem::CreateDriver(size_t index, HANDLE wait_handle,
                                       AudioDriver** out_driver) {
@@ -25,3 +29,7 @@ X_STATUS NopAudioSystem::CreateDriver(size_t index, HANDLE wait_handle,
 }
 
 void NopAudioSystem::DestroyDriver(AudioDriver* driver) { assert_always(); }
+
+}  // namespace nop
+}  // namespace apu
+}  // namespace xe

src/xenia/apu/nop/nop_audio_system.h

@@ -11,7 +11,6 @@
 #define XENIA_APU_NOP_NOP_AUDIO_SYSTEM_H_
 
 #include "xenia/apu/audio_system.h"
-#include "xenia/apu/nop/nop_apu-private.h"
 
 namespace xe {
 namespace apu {
@@ -20,11 +19,13 @@ namespace nop {
 class NopAudioSystem : public AudioSystem {
  public:
   NopAudioSystem(Emulator* emulator);
-  virtual ~NopAudioSystem();
+  ~NopAudioSystem() override;
 
-  virtual X_STATUS CreateDriver(size_t index, HANDLE wait_handle,
-                                AudioDriver** out_driver);
-  virtual void DestroyDriver(AudioDriver* driver);
+  static std::unique_ptr<AudioSystem> Create(Emulator* emulator);
+
+  X_STATUS CreateDriver(size_t index, HANDLE wait_handle,
+                        AudioDriver** out_driver) override;
+  void DestroyDriver(AudioDriver* driver) override;
 };
 
 }  // namespace nop