mirror of
https://github.com/mkwong98/HDNes.git
synced 2024-06-01 19:08:05 -04:00
Audio GUI
This commit is contained in:
mkwong98
parent
cd157624d6
commit
c6d842ccd6
|
|
@ -3281,10 +3281,10 @@
|
|||
"common.h"
|
||||
<wx\wx.h>
|
||||
|
||||
1478601045 source:c:\work\hdnesr\trunk\rewrite\wx\mainframe.cpp
|
||||
1479806181 source:c:\work\hdnesr\trunk\rewrite\wx\mainframe.cpp
|
||||
"mainFrame.h"
|
||||
|
||||
1479525171 c:\work\hdnesr\trunk\rewrite\wx\mainframe.h
|
||||
1479806181 c:\work\hdnesr\trunk\rewrite\wx\mainframe.h
|
||||
<wx/artprov.h>
|
||||
<wx/xrc/xmlres.h>
|
||||
<wx/string.h>
|
||||
|
|
@ -3341,7 +3341,7 @@
|
|||
"wx/imaglist.h"
|
||||
"wx/window.h"
|
||||
|
||||
1479525101 c:\work\hdnesr\trunk\rewrite\wx\mainframeimp.h
|
||||
1479808936 c:\work\hdnesr\trunk\rewrite\wx\mainframeimp.h
|
||||
"../classList.h"
|
||||
"mainFrame.h"
|
||||
|
||||
|
|
@ -3412,23 +3412,25 @@
|
|||
"../emu/gameFile.h"
|
||||
"../emu/input.h"
|
||||
|
||||
1474965180 source:c:\work\hdnesr\trunk\rewrite\emu\audio.cpp
|
||||
1479807588 source:c:\work\hdnesr\trunk\rewrite\emu\audio.cpp
|
||||
"audio.h"
|
||||
"../gameManager.h"
|
||||
|
||||
1476432110 c:\work\hdnesr\trunk\rewrite\emu\audio.h
|
||||
1479807381 c:\work\hdnesr\trunk\rewrite\emu\audio.h
|
||||
"emuPart.h"
|
||||
|
||||
1478854256 source:c:\work\hdnesr\trunk\rewrite\emu\video.cpp
|
||||
1479804745 source:c:\work\hdnesr\trunk\rewrite\emu\video.cpp
|
||||
<GL/glew.h>
|
||||
"video.h"
|
||||
"../gameManager.h"
|
||||
|
||||
1476432110 c:\work\hdnesr\trunk\rewrite\emu\video.h
|
||||
1479804745 c:\work\hdnesr\trunk\rewrite\emu\video.h
|
||||
"../classList.h"
|
||||
"emuPart.h"
|
||||
|
||||
1478583679 c:\work\hdnesr\trunk\rewrite\classlist.h
|
||||
|
||||
1475249934 c:\work\include\gl\glew.h
|
||||
1474972550 c:\work\include\gl\glew.h
|
||||
<stddef.h>
|
||||
<inttypes.h>
|
||||
<stdint.h>
|
||||
|
|
@ -3440,7 +3442,7 @@
|
|||
1478602156 c:\work\hdnesr\trunk\rewrite\emu\emupart.h
|
||||
"../common.h"
|
||||
|
||||
1479524031 c:\work\hdnesr\trunk\rewrite\gamemanager.h
|
||||
1479806715 c:\work\hdnesr\trunk\rewrite\gamemanager.h
|
||||
<wx\wx.h>
|
||||
"common.h"
|
||||
"classList.h"
|
||||
|
|
@ -3454,7 +3456,7 @@
|
|||
1478602519 source:c:\work\hdnesr\trunk\rewrite\emu\emupart.cpp
|
||||
"emuPart.h"
|
||||
|
||||
1479524091 source:c:\work\hdnesr\trunk\rewrite\gamemanager.cpp
|
||||
1479807381 source:c:\work\hdnesr\trunk\rewrite\gamemanager.cpp
|
||||
"gameManager.h"
|
||||
"core\memBus.h"
|
||||
"core\cart.h"
|
||||
|
|
@ -3463,6 +3465,7 @@
|
|||
"core\ppu.h"
|
||||
"core\apu.h"
|
||||
"emu\video.h"
|
||||
"emu\audio.h"
|
||||
"emu\gameFile.h"
|
||||
"emu\input.h"
|
||||
"wx\mainFrameImp.h"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,181 @@
|
|||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="emu\audio.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<File name="core\ppu.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="309" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\gameFile.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="323" topLine="2" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\emuPart.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="225" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\corePart.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="161" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameManager.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="486" topLine="55" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrameImp.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="5380" topLine="162" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\input.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="10799" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\ppu.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="228" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\gameFile.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1333" topLine="24" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\input.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1949" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\audio.h" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="476" topLine="19" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cpu.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="136" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\video.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="595" topLine="13" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\apu.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="229" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainApp.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="352" topLine="1" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cart.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2580" topLine="84" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\video.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2316" topLine="106" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cart.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="86" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\frmWaitInputImp.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="0" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrameImp.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1047" topLine="26" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\corePart.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="82" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameManager.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6572" topLine="258" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\emuPart.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="40" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\mapper001.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="142" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\frmWaitInputImp.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="418" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainApp.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="158" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\memBus.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="850" topLine="14" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrame.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="26945" topLine="586" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainGUI.fbp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="74" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="classList.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="259" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrame.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="5968" topLine="171" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\audio.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="795" topLine="41" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="common.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="155" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\apu.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="194" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cpu.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="204" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\mapper001.h" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="152" topLine="0" />
|
||||
|
|
@ -22,169 +187,4 @@
|
|||
<Cursor1 position="317" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\corePart.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="161" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainGUI.fbp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="74" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\input.cpp" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="10799" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\apu.h" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="194" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\audio.h" open="0" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="56" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="common.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="155" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\apu.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="229" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cpu.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="136" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cart.cpp" open="0" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="2580" topLine="84" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\video.cpp" open="1" top="1" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="801" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\memBus.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="850" topLine="14" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\corePart.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="82" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\ppu.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="228" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\gameFile.h" open="0" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="323" topLine="2" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameManager.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="6007" topLine="220" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainApp.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="158" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cart.h" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="86" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\mapper001.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="142" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="mainApp.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="352" topLine="1" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="classList.h" open="0" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="259" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\emuPart.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="225" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrame.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="26945" topLine="591" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\emuPart.h" open="0" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="40" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\gameFile.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1333" topLine="24" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrame.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="5606" topLine="168" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\video.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="796" topLine="6" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="emu\input.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1949" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\ppu.cpp" open="0" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="309" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="gameManager.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1095" topLine="35" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrameImp.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="9510" topLine="207" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\frmWaitInputImp.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="0" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="wx\mainFrameImp.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="825" topLine="12" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="core\cpu.cpp" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="204" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,55 @@
|
|||
#include "audio.h"
|
||||
#include "../gameManager.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
audio::audio()
|
||||
{
|
||||
//ctor
|
||||
volume = 50;
|
||||
useHDPack = true;
|
||||
}
|
||||
|
||||
audio::~audio()
|
||||
{
|
||||
//dtor
|
||||
}
|
||||
|
||||
void audio::initGameConfig(){
|
||||
}
|
||||
|
||||
string audio::partName(){
|
||||
return string("audio");
|
||||
}
|
||||
|
||||
void audio::saveConfigLines(fstream* fs){
|
||||
saveConfigLine(fs, "volume", intToString(volume));
|
||||
saveConfigLine(fs, "useHDPack", (useHDPack ? "Y" : "N"));
|
||||
}
|
||||
|
||||
void audio::saveGameConfigLines(fstream* fs){
|
||||
}
|
||||
|
||||
void audio::loadConfigVal(const string& hdr, const string& value){
|
||||
if(hdr.compare("volume") == 0){
|
||||
volume = stringToInt(value);
|
||||
}
|
||||
else if(hdr.compare("useHDPack") == 0){
|
||||
useHDPack = (value.compare("Y") == 0);
|
||||
}
|
||||
}
|
||||
|
||||
void audio::startGame(){
|
||||
|
||||
}
|
||||
|
||||
void audio::endGame(){
|
||||
|
||||
}
|
||||
|
||||
void audio::setVolume(int vol){
|
||||
volume = vol;
|
||||
}
|
||||
|
||||
void audio::setUseHDPack(bool use){
|
||||
useHDPack = use;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,24 @@
|
|||
class audio : public emuPart
|
||||
{
|
||||
public:
|
||||
bool useHDPack;
|
||||
int volume;
|
||||
|
||||
audio();
|
||||
virtual ~audio();
|
||||
string partName();
|
||||
|
||||
void saveConfigLines(fstream* fs);
|
||||
void saveGameConfigLines(fstream* fs);
|
||||
void loadConfigVal(const string& hdr, const string& value);
|
||||
void initGameConfig();
|
||||
|
||||
void startGame();
|
||||
void endGame();
|
||||
|
||||
void setVolume(int vol);
|
||||
void setUseHDPack(bool use);
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "core\ppu.h"
|
||||
#include "core\apu.h"
|
||||
#include "emu\video.h"
|
||||
#include "emu\audio.h"
|
||||
#include "emu\gameFile.h"
|
||||
#include "emu\input.h"
|
||||
#include "wx\mainFrameImp.h"
|
||||
|
|
@ -21,6 +22,7 @@ gameManager::gameManager(){
|
|||
vid = new video();
|
||||
romF = new gameFile();
|
||||
inp = new input();
|
||||
aud = new audio();
|
||||
|
||||
loadConfig();
|
||||
//load game specific config
|
||||
|
|
@ -40,6 +42,8 @@ gameManager::~gameManager(){
|
|||
//destory emu parts
|
||||
delete(vid);
|
||||
delete(romF);
|
||||
delete(aud);
|
||||
delete(inp);
|
||||
}
|
||||
|
||||
void gameManager::showUI(){
|
||||
|
|
@ -60,6 +64,7 @@ void gameManager::runGame(){
|
|||
|
||||
//init emu parts
|
||||
vid->startGame();
|
||||
aud->startGame();
|
||||
romF->startGame();
|
||||
inp->startGame();
|
||||
|
||||
|
|
@ -79,6 +84,7 @@ void gameManager::runGame(){
|
|||
}
|
||||
|
||||
vid->endGame();
|
||||
aud->endGame();
|
||||
romF->endGame();
|
||||
inp->endGame();
|
||||
|
||||
|
|
@ -103,12 +109,15 @@ void gameManager::loadConfig(){
|
|||
if(lineHdr.compare(vid->partName()) == 0){
|
||||
vid->loadConfig(&fs);
|
||||
}
|
||||
if(lineHdr.compare(romF->partName()) == 0){
|
||||
else if(lineHdr.compare(romF->partName()) == 0){
|
||||
romF->loadConfig(&fs);
|
||||
}
|
||||
if(lineHdr.compare(inp->partName()) == 0){
|
||||
else if(lineHdr.compare(inp->partName()) == 0){
|
||||
inp->loadConfig(&fs);
|
||||
}
|
||||
else if(lineHdr.compare(aud->partName()) == 0){
|
||||
aud->loadConfig(&fs);
|
||||
}
|
||||
}
|
||||
fs.close();
|
||||
}
|
||||
|
|
@ -125,6 +134,7 @@ void gameManager::saveConfig(){
|
|||
vid->saveConfig(&fs);
|
||||
romF->saveConfig(&fs);
|
||||
inp->saveConfig(&fs);
|
||||
aud->saveConfig(&fs);
|
||||
fs.close();
|
||||
}
|
||||
|
||||
|
|
@ -136,6 +146,7 @@ void gameManager::romSelected(const string& romName){
|
|||
vid->initGameConfig();
|
||||
romF->initGameConfig();
|
||||
inp->initGameConfig();
|
||||
aud->initGameConfig();
|
||||
//load config for new game
|
||||
loadGameConfig();
|
||||
}
|
||||
|
|
@ -181,12 +192,15 @@ void gameManager::loadGameConfig(){
|
|||
if(lineHdr.compare(vid->partName()) == 0){
|
||||
vid->loadConfig(&fs);
|
||||
}
|
||||
if(lineHdr.compare(romF->partName()) == 0){
|
||||
else if(lineHdr.compare(romF->partName()) == 0){
|
||||
romF->loadConfig(&fs);
|
||||
}
|
||||
if(lineHdr.compare(inp->partName()) == 0){
|
||||
else if(lineHdr.compare(inp->partName()) == 0){
|
||||
inp->loadConfig(&fs);
|
||||
}
|
||||
else if(lineHdr.compare(aud->partName()) == 0){
|
||||
aud->loadConfig(&fs);
|
||||
}
|
||||
}
|
||||
fs.close();
|
||||
}
|
||||
|
|
@ -203,6 +217,7 @@ void gameManager::saveGameConfig(){
|
|||
vid->saveGameConfig(&fs);
|
||||
romF->saveGameConfig(&fs);
|
||||
inp->saveGameConfig(&fs);
|
||||
aud->saveGameConfig(&fs);
|
||||
fs.close();
|
||||
}
|
||||
|
||||
|
|
@ -246,5 +261,13 @@ void gameManager::setIgnoreEdge(bool use){
|
|||
vid->setIgnoreEdge(use);
|
||||
}
|
||||
|
||||
void gameManager::setUseMusicHDPack(bool use){
|
||||
aud->setUseHDPack(use);
|
||||
}
|
||||
|
||||
void gameManager::setVolume(int vol){
|
||||
aud->setVolume(vol);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ class gameManager
|
|||
video* vid;
|
||||
gameFile* romF;
|
||||
input* inp;
|
||||
audio* aud;
|
||||
|
||||
cart* rom;
|
||||
cpu* cp;
|
||||
|
|
@ -52,6 +53,8 @@ class gameManager
|
|||
void setGenHDData(bool use);
|
||||
void setIgnoreEdge(bool use);
|
||||
|
||||
void setUseMusicHDPack(bool use);
|
||||
void setVolume(int vol);
|
||||
protected:
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -710,6 +710,16 @@ mainFrame::mainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
|
|||
chkUseHDGraphicsPack->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::useGPackSelected ), NULL, this );
|
||||
chkGenHDData->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::autoCaptureForHDSelected ), NULL, this );
|
||||
chkIgnoreEdge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::ignoreEdgeSelected ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
chkUseHDMusicPack->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::useMPackSelected ), NULL, this );
|
||||
}
|
||||
|
||||
mainFrame::~mainFrame()
|
||||
|
|
@ -766,6 +776,16 @@ mainFrame::~mainFrame()
|
|||
chkUseHDGraphicsPack->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::useGPackSelected ), NULL, this );
|
||||
chkGenHDData->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::autoCaptureForHDSelected ), NULL, this );
|
||||
chkIgnoreEdge->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::ignoreEdgeSelected ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
sldVolume->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( mainFrame::volumeChanged ), NULL, this );
|
||||
chkUseHDMusicPack->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( mainFrame::useMPackSelected ), NULL, this );
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -176,6 +176,8 @@ class mainFrame : public wxFrame
|
|||
virtual void useGPackSelected( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void autoCaptureForHDSelected( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void ignoreEdgeSelected( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void volumeChanged( wxScrollEvent& event ) { event.Skip(); }
|
||||
virtual void useMPackSelected( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
#include "../emu/gameFile.h"
|
||||
#include "../emu/input.h"
|
||||
#include "../emu/video.h"
|
||||
#include "../emu/audio.h"
|
||||
|
||||
mainFrameImp::mainFrameImp( wxWindow* parent )
|
||||
:
|
||||
|
|
@ -168,6 +169,9 @@ void mainFrameImp::updateDisplay(){
|
|||
chkGenHDData->SetValue(gameManager::gm->vid->autoCaptureForHD);
|
||||
chkIgnoreEdge->SetValue(gameManager::gm->vid->ignoreEdge);
|
||||
|
||||
sldVolume->SetValue(gameManager::gm->aud->volume);
|
||||
chkUseHDMusicPack->SetValue(gameManager::gm->aud->useHDPack);
|
||||
|
||||
btnP1Up->SetLabel(wxString(gameManager::gm->inp->inputNameForKeyIdx(KEY_IDX_P1_UP)));
|
||||
btnP1Left->SetLabel(wxString(gameManager::gm->inp->inputNameForKeyIdx(KEY_IDX_P1_LEFT)));
|
||||
btnP1Right->SetLabel(wxString(gameManager::gm->inp->inputNameForKeyIdx(KEY_IDX_P1_RIGHT)));
|
||||
|
|
@ -232,3 +236,12 @@ void mainFrameImp::autoCaptureForHDSelected( wxCommandEvent& event ){
|
|||
void mainFrameImp::ignoreEdgeSelected( wxCommandEvent& event ){
|
||||
gameManager::gm->setIgnoreEdge(event.IsChecked());
|
||||
}
|
||||
|
||||
void mainFrameImp::volumeChanged( wxScrollEvent& event ){
|
||||
gameManager::gm->setVolume(event.GetInt());
|
||||
}
|
||||
|
||||
void mainFrameImp::useMPackSelected( wxCommandEvent& event ){
|
||||
gameManager::gm->setUseMusicHDPack(event.IsChecked());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@ class mainFrameImp : public mainFrame
|
|||
void useGPackSelected( wxCommandEvent& event );
|
||||
void autoCaptureForHDSelected( wxCommandEvent& event );
|
||||
void ignoreEdgeSelected( wxCommandEvent& event );
|
||||
void volumeChanged( wxScrollEvent& event );
|
||||
void useMPackSelected( wxCommandEvent& event );
|
||||
|
||||
|
||||
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -10219,7 +10219,7 @@
|
|||
<event name="OnRightDClick"></event>
|
||||
<event name="OnRightDown"></event>
|
||||
<event name="OnRightUp"></event>
|
||||
<event name="OnScroll"></event>
|
||||
<event name="OnScroll">volumeChanged</event>
|
||||
<event name="OnScrollBottom"></event>
|
||||
<event name="OnScrollChanged"></event>
|
||||
<event name="OnScrollLineDown"></event>
|
||||
|
|
@ -10299,7 +10299,7 @@
|
|||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnCheckBox"></event>
|
||||
<event name="OnCheckBox">useMPackSelected</event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnKeyDown"></event>
|
||||
|
|
|
|||
Loading…
Reference in a new issue