ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/project64/project64 

Conflicts:
	Source/Project64-audio/AudioMain.cpp
This commit is contained in:
zilmar 2017-09-25 22:01:28 +10:00
parent a6661e460b 2dd8a7b82f
commit 892aed6dad
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Project64.rdb
View File

@ -313,14 +313,14 @@ Culling=1
RDRAM Size=8 RDRAM Size=8
[E6A95A4F-BAD2EA23-C:45] [E6A95A4F-BAD2EA23-C:45]
Good Name=Aidyn Chronicles - The First Mage (U)[!](V1.0) Good Name=Aidyn Chronicles - The First Mage (U) [!] (V1.0)
Internal Name=AIDYN_CHRONICLES Internal Name=AIDYN_CHRONICLES
Status=Compatible Status=Compatible
Culling=1 Culling=1
RDRAM Size=8 RDRAM Size=8
[112051D2-68BEF8AC-C:45] [112051D2-68BEF8AC-C:45]
Good Name=Aidyn Chronicles - The First Mage (U)[!](V1.1) Good Name=Aidyn Chronicles - The First Mage (U) [!] (V1.1)
Internal Name=AIDYN_CHRONICLES Internal Name=AIDYN_CHRONICLES
Status=Compatible Status=Compatible
Culling=1 Culling=1

14
Config/Project64.rdx
View File

@ -173,7 +173,7 @@ Players=4
ForceFeedback=No ForceFeedback=No
[2DC4FFCC-C8FF5A21-C:50] [2DC4FFCC-C8FF5A21-C:50]
Good Name=Aidyn Chronicles - The First Mage (E)[!] Good Name=Aidyn Chronicles - The First Mage (E) [!]
Developer=H2O Entertainment Developer=H2O Entertainment
ReleaseDate=2001/08/03 ReleaseDate=2001/08/03
Genre=RPG Genre=RPG
@ -181,7 +181,7 @@ Players=1
ForceFeedback=No ForceFeedback=No
[E6A95A4F-BAD2EA23-C:45] [E6A95A4F-BAD2EA23-C:45]
Good Name=Aidyn Chronicles - The First Mage (U)[!](V1.0) Good Name=Aidyn Chronicles - The First Mage (U) [!] (V1.0)
Developer=H2O Entertainment Developer=H2O Entertainment
ReleaseDate=2001/03/14 ReleaseDate=2001/03/14
Genre=RPG Genre=RPG
@ -189,7 +189,7 @@ Players=1
ForceFeedback=No ForceFeedback=No
[112051D2-68BEF8AC-C:45] [112051D2-68BEF8AC-C:45]
Good Name=Aidyn Chronicles - The First Mage (U)[!](V1.1) Good Name=Aidyn Chronicles - The First Mage (U) [!] (V1.1)
Developer=H2O Entertainment Developer=H2O Entertainment
ReleaseDate=2001/??/?? ReleaseDate=2001/??/??
Genre=RPG Genre=RPG
@ -1032,7 +1032,7 @@ Players=4
ForceFeedback=Yes ForceFeedback=Yes
[F8009DB0-6B291823-C:4A] [F8009DB0-6B291823-C:4A]
Good Name=City-Tour GP-All Japan Grand Touring Car Championship (J)[!] Good Name=City-Tour GP-All Japan Grand Touring Car Championship (J) [!]
Developer=Imaginner Developer=Imaginner
ReleaseDate=1998/10/30 ReleaseDate=1998/10/30
Genre=Racing-Car Genre=Racing-Car
@ -7103,7 +7103,7 @@ Players=1
ForceFeedback=Yes ForceFeedback=Yes
[D43DA81F-021E1E19-C:4A] [D43DA81F-021E1E19-C:4A]
Good Name=Zelda no Densetsu - Toki no Ocarina (J)(V1.1) Good Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.1)
Developer=Nintendo Developer=Nintendo
ReleaseDate=????/??/?? ReleaseDate=????/??/??
Genre=Action-Adventure Genre=Action-Adventure
@ -7111,7 +7111,7 @@ Players=1
ForceFeedback=Yes ForceFeedback=Yes
[693BA2AE-B7F14E9F-C:4A] [693BA2AE-B7F14E9F-C:4A]
Good Name=Zelda no Densetsu - Toki no Ocarina (J)(V1.2) Good Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.2)
Developer=Nintendo Developer=Nintendo
ReleaseDate=????/??/?? ReleaseDate=????/??/??
Genre=Action-Adventure Genre=Action-Adventure
@ -7174,4 +7174,4 @@ Genre=RPG
Players=1 Players=1
ForceFeedback=No ForceFeedback=No
//------------------------- EOF --------------------------// //------------------------- EOF --------------------------//

7
Source/Project64-audio/Driver/SoundBase.cpp
View File

@ -188,6 +188,11 @@ void SoundDriverBase::BufferAudio()
WriteTrace(TraceAudioDriver, TraceVerbose, "Done (m_BufferRemaining: 0x%08X)", m_BufferRemaining); WriteTrace(TraceAudioDriver, TraceVerbose, "Done (m_BufferRemaining: 0x%08X)", m_BufferRemaining);
} }
uint32_t SoundDriverBase::AI_ReadLength()
{
return (m_AI_DMAPrimaryBytes & ~ 3);
}
void SoundDriverBase::SetFrequency(uint32_t /*Frequency*/) void SoundDriverBase::SetFrequency(uint32_t /*Frequency*/)
{ {
} }
@ -198,4 +203,4 @@ void SoundDriverBase::StartAudio()
void SoundDriverBase::StopAudio() void SoundDriverBase::StopAudio()
{ {
} }

2
Source/Project64-audio/Driver/SoundBase.h
View File

@ -53,4 +53,4 @@ private:
uint32_t m_CurrentWriteLoc; // Currently writing Buffer uint32_t m_CurrentWriteLoc; // Currently writing Buffer
uint8_t m_Buffer[MAX_SIZE]; // Emulated buffers uint8_t m_Buffer[MAX_SIZE]; // Emulated buffers
bool m_SyncAudio; bool m_SyncAudio;
}; };