diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt index 39f4b2cd..9b545bc8 100644 --- a/mml2vgm/CHANGE.txt +++ b/mml2vgm/CHANGE.txt @@ -1,4 +1,9 @@ 更新履歴 +TAG724 2024/03/02 2nd + Core:XGM2:PCMの再生サンプリングレートを13.3kHzに調整。(MDSoundによるもの) + 13.3kHzの.wavファイルを読み込めるようにした。 + スクリプトにSOXによる13.3kHz変換を追加。 + TAG723 2024/03/02 Core:XGM2:Export,MDPlayerによる演奏時にはPCM発音を抑制するように修正(暫定) FM,DCSGで演奏時間が異なる場合は短いほうにWaitを追加して調整する処理追加 diff --git a/mml2vgm/Core/Common.cs b/mml2vgm/Core/Common.cs index 478ca3cb..754efcce 100644 --- a/mml2vgm/Core/Common.cs +++ b/mml2vgm/Core/Common.cs @@ -118,7 +118,7 @@ public static byte[] GetPCMDataFromFile(string path, string fileName, int vol, o } samplerate = buf[p + 4] + buf[p + 5] * 0x100 + buf[p + 6] * 0x10000 + buf[p + 7] * 0x1000000; - if (samplerate != 8000 && samplerate != 16000 && samplerate != 18500 && samplerate != 14000) + if (samplerate != 8000 && samplerate != 16000 && samplerate != 18500 && samplerate != 14000 && samplerate != 13300) { msgBox.setWrnMsg(string.Format(msg.get("E02006"), samplerate), new LinePos(null,"-")); //return null; diff --git a/mml2vgm/Core/MDSound.dll b/mml2vgm/Core/MDSound.dll index b88c50a9..35dd812b 100644 Binary files a/mml2vgm/Core/MDSound.dll and b/mml2vgm/Core/MDSound.dll differ diff --git a/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py b/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py index e7353f4e..e572c238 100644 --- a/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py +++ b/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py @@ -13,9 +13,11 @@ def title(self): return ( r"Information(log view)" + r"|Convert pcm(8bit,unsigned,8KHz,mono)" + + r"|Convert pcm(8bit,unsigned,13.3KHz,mono)" + r"|Convert pcm(8bit,unsigned,14KHz,mono)" + r"|Convert pcm(8bit,unsigned,16KHz,mono)" + r"|Convert pcm(8bit,unsigned,18.5KHz,mono)" + + r"|Convert pcm(16bit,signed,13.3KHz,mono)" + r"|Convert pcm(16bit,signed,14KHz,mono)" + r"|Convert pcm(16bit,signed,16KHz,mono)" + r"|Convert pcm(16bit,signed,18.5KHz,mono)" @@ -39,6 +41,8 @@ def scriptType(self): + r"|FromTreeViewContextMenu" + r"|FromTreeViewContextMenu" + r"|FromTreeViewContextMenu" + + r"|FromTreeViewContextMenu" + + r"|FromTreeViewContextMenu" ) #縺薙�繧ケ繧ッ繝ェ繝励ヨ縺後し繝昴�繝医☆繧九ヵ繧。繧、繝ォ諡。蠑オ蟄舌r|繧偵ョ繝ェ繝溘ち縺ィ縺励※蛻玲嫌縺吶k縲� @@ -55,6 +59,8 @@ def supportFileExt(self): + r"|.wav" + r"|.wav" + r"|.wav" + + r"|.wav" + + r"|.wav" ) #繧キ繝ァ繝シ繝医き繝�ヨ繧ュ繝シ繧貞ョ夂セゥ縺励∪縺吶� @@ -93,10 +99,12 @@ def run(self, Mml2vgmInfo, index): argList = [ "--i \"{0}{1}\"" - , "\"{0}{1}\" -r 8000 -b 8 -c 1 \"{0}_8k{1}\"" - , "\"{0}{1}\" -r 14000 -b 8 -c 1 \"{0}_14k{1}\"" - , "\"{0}{1}\" -r 16000 -b 8 -c 1 \"{0}_16k{1}\"" - , "\"{0}{1}\" -r 18500 -b 8 -c 1 \"{0}_18500{1}\"" + , "\"{0}{1}\" -r 8000 -b 8 -c 1 \"{0}_8b_8k{1}\"" + , "\"{0}{1}\" -r 13300 -b 8 -c 1 \"{0}_8b_13300{1}\"" + , "\"{0}{1}\" -r 14000 -b 8 -c 1 \"{0}_8b_14k{1}\"" + , "\"{0}{1}\" -r 16000 -b 8 -c 1 \"{0}_8b_16k{1}\"" + , "\"{0}{1}\" -r 18500 -b 8 -c 1 \"{0}_8b_18500{1}\"" + , "\"{0}{1}\" -b 16 -r 13300 -e signed-integer -c 1 \"{0}_16b_13300{1}\"" , "\"{0}{1}\" -b 16 -r 14000 -e signed-integer -c 1 \"{0}_16b_14k{1}\"" , "\"{0}{1}\" -b 16 -r 16000 -e signed-integer -c 1 \"{0}_16b_16k{1}\"" , "\"{0}{1}\" -b 16 -r 18500 -e signed-integer -c 1 \"{0}_16b_18500{1}\""