Add : Assist functions, Fix : the function can't be used

Author: caphosra

WaveFileManagerCPP/AssistFunc.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "DefineClass.h"
+
+#define _USE_MATH_DEFINES
+#include<math.h>
+
+// Return  sounds data (length : samplesPerSec * 2)
+void GenerateSoundMonaural16bits(Int16* sound, double herth, int samplesPerSec = 44100)
+{
+	for (int i = 0; i < samplesPerSec * 2; i++)
+	{
+		sound[i] = ((short)(sin(i / (double)samplesPerSec * 2 * M_PI * herth) * 30000));
+	}
+}

WaveFileManagerCPP/CreateInstance.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "DefineClass.h"
+
+MusicPropertyMonaural16bit GenerateMonaural16bits(Int16* data, UInt32 length)
+{
+	MusicPropertyMonaural16bit w;
+
+	w.m_FileSize = 36 + (sizeof(Int16) * length);
+	w.m_PCMWAVEFORMAT_Size = 16;
+	WAVEFORMATEX waveformat;
+	w.m_WaveFormatEx = waveformat.GetMonaural16bitsDefault();
+	MusicDataMonaural16bit data16bit;
+	data16bit.m_DataSize = (sizeof(Int16) * length);
+	std::vector<Int16> v;
+	v.assign(data, data + length);
+	data16bit.m_Data = v;
+	w.m_MusicData = data16bit;
+
+	return w;
+}
+
+MusicPropertyMonaural8bit GenerateMonaural8bits(Int8* data, UInt32 length)
+{
+	MusicPropertyMonaural8bit w;
+
+	w.m_FileSize = 36 + (sizeof(Int8) * length);
+	w.m_PCMWAVEFORMAT_Size = 16;
+	WAVEFORMATEX waveformat;
+	w.m_WaveFormatEx = waveformat.GetMonaural8bitsDefault();
+	MusicDataMonaural8bit data8bit;
+	data8bit.m_DataSize = (sizeof(Int8) * length);
+	std::vector<Int8> v;
+	v.assign(data, data + length);
+	data8bit.m_Data = v;
+	w.m_MusicData = data8bit;
+
+	return w;
+}

WaveFileManagerCPP/DefineClass.h

@@ -11,40 +11,6 @@ typedef char Int8;
 typedef unsigned int UInt32;
 typedef unsigned short UInt16;
 
-class MusicProperty
-{
-public:
-	Int32 m_FileSize;
-	Int32 m_PCMWAVEFORMAT_Size;
-	WAVEFORMATEX m_WaveFormatEx;
-};
-
-class MusicPropertyMonaural16bit : public MusicProperty
-{
-public:
-	MusicDataMonaural16bit m_MusicData;
-};
-
-class MusicPropertyMonaural8bit : public MusicProperty
-{
-public:
-	MusicDataMonaural8bit m_MusicData;
-};
-
-struct MusicDataMonaural16bit
-{
-public:
-	Int32 m_DataSize;
-	vector<Int16> m_Data;
-};
-
-struct MusicDataMonaural8bit
-{
-public:
-	Int32 m_DataSize;
-	vector<Int8> m_Data;
-};
-
 class WAVEFORMATEX
 {
 public:
@@ -94,8 +60,43 @@ WAVEFORMATEX WAVEFORMATEX::GetMonaural8bitsDefault()
 
 #pragma endregion
 
+struct MusicDataMonaural16bit
+{
+public:
+	Int32 m_DataSize;
+	vector<Int16> m_Data;
+};
+
+struct MusicDataMonaural8bit
+{
+public:
+	Int32 m_DataSize;
+	vector<Int8> m_Data;
+};
+
+class MusicProperty
+{
+public:
+	Int32 m_FileSize;
+	Int32 m_PCMWAVEFORMAT_Size;
+	WAVEFORMATEX m_WaveFormatEx;
+};
+
+class MusicPropertyMonaural16bit : public MusicProperty
+{
+public:
+	MusicDataMonaural16bit m_MusicData;
+};
+
+class MusicPropertyMonaural8bit : public MusicProperty
+{
+public:
+	MusicDataMonaural8bit m_MusicData;
+};
+
 class WaveFileManager
 {
+public:
 	MusicPropertyMonaural16bit LoadFileMonaural16bits(string path);
 
 	void CreateFile(string path, MusicPropertyMonaural16bit prop);

WaveFileManagerCPP/LoadWaveFile.h

@@ -77,7 +77,7 @@ MusicPropertyMonaural16bit WaveFileManager::LoadFileMonaural16bits(string path)
 	#pragma endregion
 
 	WAVEFORMATEX format;
-	format = format.GetMonaural16bitsDefault;
+	format = format.GetMonaural16bitsDefault();
 
 	#pragma region フォーマットタグ
 
@@ -214,11 +214,14 @@ void WaveFileManager::CreateFile(string path, MusicPropertyMonaural16bit prop)
 		ConvertToLittleEndian(int8array, musicData.m_DataSize);
 		fs.write(int8array, sizeof(Int32));
 
+#pragma warning(push)
+#pragma warning(disable:4018)
 		for (int i = 0; i < musicData.m_Data.size(); i++)
 		{
 			ConvertToLittleEndian(int8array, musicData.m_Data[i]);
 			fs.write(int8array, sizeof(Int16));
 		}
+#pragma warning(pop)
 	}
 
 	//閉じる
@@ -248,11 +251,14 @@ void WaveFileManager::CreateFile(string path, MusicPropertyMonaural8bit prop)
 		ConvertToLittleEndian(int8array, musicData.m_DataSize);
 		fs.write(int8array, 4);
 
+#pragma warning(push)
+#pragma warning(disable:4018)
 		for (int i = 0; i < musicData.m_Data.size(); i++)
 		{
 			ConvertToLittleEndian(int8array, musicData.m_Data[i]);
 			fs.write(int8array, sizeof(Int8));
 		}
+#pragma warning(pop)
 	}
 
 	//閉じる

WaveFileManagerCPP/WaveFileManager.h

@@ -1,3 +1,8 @@
 #pragma once
 
-#include"LoadWaveFile.h"
+#include"LoadWaveFile.h"
+
+#if !NO_ASSIST_WAVEFILEMANAGER
+#include"AssistFunc.h"
+#include"CreateInstance.h"
+#endif

WaveFileManagerCPP/WaveFileManagerCPP.vcxproj

@@ -115,6 +115,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="AssistFunc.h" />
+    <ClInclude Include="CreateInstance.h" />
     <ClInclude Include="DefineClass.h" />
     <ClInclude Include="LoadWaveFile.h" />
     <ClInclude Include="WaveFileManager.h" />

WaveFileManagerCPP/WaveFileManagerCPP.vcxproj.filters

@@ -24,5 +24,11 @@
     <ClInclude Include="DefineClass.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="CreateInstance.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="AssistFunc.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>