From 87f13cbe4b3ead697ffa335831b8884c15dce695 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Sun, 15 Nov 2015 11:35:38 +1100
Subject: [PATCH] [Project64] Get Audio plugin to use standard types

---
 Source/Project64/N64 System/Mips/Audio.cpp | 24 +++++++++++--------
 Source/Project64/N64 System/Mips/Audio.h   | 27 ++++++++++++----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Source/Project64/N64 System/Mips/Audio.cpp b/Source/Project64/N64 System/Mips/Audio.cpp
index 65402fc42..adc81c47c 100644
--- a/Source/Project64/N64 System/Mips/Audio.cpp	
+++ b/Source/Project64/N64 System/Mips/Audio.cpp	
@@ -9,6 +9,9 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+#include "Audio.h"
+#include <Project64\N64 System\System Globals.h>
+#include <Project64\N64 System\N64 Class.h>
 
 CAudio::CAudio()
 {
@@ -29,10 +32,10 @@ void CAudio::Reset()
     m_FramesPerSecond = 60;
 }
 
-DWORD CAudio::GetLength()
+uint32_t CAudio::GetLength()
 {
     WriteTraceF(TraceAudio, __FUNCTION__ ": Start (m_SecondBuff = %d)", m_SecondBuff);
-    DWORD TimeLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt), Res = 0;
+    uint32_t TimeLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt), Res = 0;
     if (TimeLeft > 0)
     {
         Res = (TimeLeft / m_CountsPerByte);
@@ -41,7 +44,7 @@ DWORD CAudio::GetLength()
     return (Res + 3)&~3;
 }
 
-DWORD CAudio::GetStatus()
+uint32_t CAudio::GetStatus()
 {
     WriteTraceF(TraceAudio, __FUNCTION__ ": m_Status = %X", m_Status);
     return m_Status;
@@ -56,9 +59,10 @@ void CAudio::LenChanged()
         {
             WriteTraceF(TraceAudio, __FUNCTION__ ": *** Ignoring Write, To Large (%X)", g_Reg->AI_LEN_REG);
         }
-        else {
+        else
+        {
             m_Status |= ai_busy;
-            DWORD AudioLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt);
+            uint32_t AudioLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt);
             if (m_SecondBuff == 0)
             {
                 if (AudioLeft == 0)
@@ -124,19 +128,19 @@ void CAudio::BusyTimerDone()
     m_Status &= ~ai_busy;
 }
 
-void CAudio::SetViIntr(DWORD VI_INTR_TIME)
+void CAudio::SetViIntr(uint32_t VI_INTR_TIME)
 {
-    double CountsPerSecond = (DWORD)((double)VI_INTR_TIME * m_FramesPerSecond);
+    double CountsPerSecond = (uint32_t)((double)VI_INTR_TIME * m_FramesPerSecond);
     if (m_BytesPerSecond != 0 && (g_System->AiCountPerBytes() == 0))
     {
-        m_CountsPerByte = (int)((double)CountsPerSecond / (double)m_BytesPerSecond);
+        m_CountsPerByte = (int32_t)((double)CountsPerSecond / (double)m_BytesPerSecond);
     }
 }
 
-void CAudio::SetFrequency(DWORD Dacrate, DWORD System)
+void CAudio::SetFrequency(uint32_t Dacrate, uint32_t System)
 {
     WriteTraceF(TraceAudio, __FUNCTION__ "(Dacrate: %X System: %d): AI_BITRATE_REG = %X", Dacrate, System, g_Reg->AI_BITRATE_REG);
-    DWORD Frequency;
+    uint32_t Frequency;
 
     switch (System)
     {
diff --git a/Source/Project64/N64 System/Mips/Audio.h b/Source/Project64/N64 System/Mips/Audio.h
index c5cd0bd12..872a8b0d1 100644
--- a/Source/Project64/N64 System/Mips/Audio.h	
+++ b/Source/Project64/N64 System/Mips/Audio.h	
@@ -21,19 +21,22 @@ public:
     CAudio();
     ~CAudio();
 
-    DWORD GetLength();
-    DWORD GetStatus();
-    void  LenChanged();
+    uint32_t GetLength         ();
+    uint32_t GetStatus         ();
+    void  LenChanged        ();
     void  InterruptTimerDone();
-    void  BusyTimerDone();
-    void  Reset();
-    void  SetViIntr(DWORD VI_INTR_TIME);
-    void  SetFrequency(DWORD Dacrate, DWORD System);
+    void  BusyTimerDone     ();
+    void  Reset             ();
+    void  SetViIntr         ( uint32_t VI_INTR_TIME );
+    void  SetFrequency      ( uint32_t Dacrate, uint32_t System );
 
 private:
-    DWORD  m_SecondBuff;
-    DWORD  m_Status;
-    DWORD  m_BytesPerSecond;
-    int    m_CountsPerByte;
-    int    m_FramesPerSecond;
+    CAudio(const CAudio&);            // Disable copy constructor
+    CAudio& operator=(const CAudio&); // Disable assignment
+
+    uint32_t  m_SecondBuff;
+    uint32_t  m_Status;
+    uint32_t  m_BytesPerSecond;
+    int32_t   m_CountsPerByte;
+    int32_t   m_FramesPerSecond;
 };