Add FLAC CDDA support via miniaudio to mkpsxiso (#5)

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tinyxml2"]
 	path = tinyxml2
 	url = https://github.com/leethomason/tinyxml2
+[submodule "miniaudio"]
+	path = miniaudio
+	url = https://github.com/mackron/miniaudio

CMakeLists.txt

@@ -26,6 +26,10 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/tinyxml2/tinyxml2.cpp)
 	message(FATAL_ERROR "The tinyxml2 directory is empty. Run 'git submodule update --init --recursive' to populate it.")
 endif()
 
+if(NOT EXISTS ${PROJECT_SOURCE_DIR}/miniaudio/miniaudio.h)
+	message(FATAL_ERROR "The miniaudio directory is empty. Run 'git submodule update --init --recursive' to populate it.")
+endif()
+
 # Build tinyxml2. I didn't bother with tinyxml2's actual CMake integration
 # because it's far easier do do this. It is a single-file library after all.
 add_library               (tinyxml2 STATIC tinyxml2/tinyxml2.cpp)
@@ -46,6 +50,7 @@ add_executable(mkpsxiso
 	${mkpsxiso_dir}/iso.cpp
 	${mkpsxiso_dir}/main.cpp
 )
+target_include_directories(mkpsxiso PUBLIC "miniaudio")
 target_link_libraries(mkpsxiso tinyxml2 iso_shared)
 
 add_executable(dumpsxiso

src/mkpsxiso/cdwriter.cpp

@@ -257,7 +257,7 @@ size_t cd::IsoWriter::WriteBytesXA(void* data, size_t bytes, int edcEccEncode) {
 
 }
 
-size_t cd::IsoWriter::WriteBytesRaw(void* data, size_t bytes) {
+size_t cd::IsoWriter::WriteBytesRaw(const void* data, size_t bytes) {
 
     size_t writeBytes = 0;
 
@@ -305,6 +305,18 @@ size_t cd::IsoWriter::WriteBytesRaw(void* data, size_t bytes) {
 
 }
 
+size_t  cd::IsoWriter::WriteBlankSectors(const size_t count)
+{
+	const char blank[CD_SECTOR_SIZE] {};
+
+	size_t bytesWritten = 0;
+	for(size_t i = 0; i < count; i++)
+	{
+		bytesWritten += WriteBytesRaw( blank, CD_SECTOR_SIZE );
+	}
+	return bytesWritten;
+}
+
 int cd::IsoWriter::CurrentSector() {
 
 	return currentSector;

src/mkpsxiso/cdwriter.h

@@ -56,7 +56,8 @@ class IsoWriter {
 
 		size_t	WriteBytes(void* data, size_t bytes, int edcEccEncode);
 		size_t	WriteBytesXA(void* data, size_t bytes, int edcEccEncode);
-		size_t	WriteBytesRaw(void* data, size_t bytes);
+		size_t	WriteBytesRaw(const void* data, size_t bytes);
+		size_t  WriteBlankSectors(const size_t count);
 
 		void	Close();
 

src/mkpsxiso/iso.cpp

@@ -135,7 +135,7 @@ int iso::DirTreeClass::GetWavSize(const std::filesystem::path& wavFile)
 	return 2352*((WAV_Subchunk2.len+2351)/2352);
 }
 
-int iso::DirTreeClass::PackWaveFile(cd::IsoWriter* writer, const std::filesystem::path& wavFile, bool pregap)
+int iso::DirTreeClass::PackWaveFile(cd::IsoWriter* writer, const std::filesystem::path& wavFile)
 {
 	FILE *fp;
 	int waveLen;
@@ -162,16 +162,6 @@ int iso::DirTreeClass::PackWaveFile(cd::IsoWriter* writer, const std::filesystem
 	{
 
 		// File must be a raw, pack it anyway
-		memset(buff, 0x00, CD_SECTOR_SIZE);
-
-		if ( pregap ) {
-
-			// Write pregap region
-			for ( int i=0; i<150; i++ ) {
-				writer->WriteBytesRaw(buff, CD_SECTOR_SIZE);
-			}
-
-		}
 
 		// Write data
 		fseek(fp, 0, SEEK_END);
@@ -268,16 +258,6 @@ int iso::DirTreeClass::PackWaveFile(cd::IsoWriter* writer, const std::filesystem
 
 	waveLen = WAV_Subchunk2.len;
 
-	// Write pregap region
-	memset(buff, 0x00, CD_SECTOR_SIZE);
-	if ( pregap )
-	{
-		for ( int i=0; i<150; i++ )
-		{
-			writer->WriteBytesRaw(buff, CD_SECTOR_SIZE);
-		}
-	}
-
 	// Write data
 	while ( waveLen > 0 )
 	{
@@ -862,19 +842,9 @@ int iso::DirTreeClass::WriteDirectoryRecords(cd::IsoWriter* writer, const DIRENT
 
 int iso::DirTreeClass::WriteFiles(cd::IsoWriter* writer)
 {
-	bool firstDAWritten = false;
-
 	for ( const DIRENTRY& entry : entries )
 	{
-		// TODO: Configurable pregap
-		if ( ( entry.type == EntryType::EntryDA ) && firstDAWritten )
-		{
-			writer->SeekToSector( entry.lba-150 );
-		}
-		else
-		{
-			writer->SeekToSector( entry.lba );
-		}
+		writer->SeekToSector( entry.lba );
 
 		// Write files as regular data sectors
 		if ( entry.type == EntryType::EntryFile )
@@ -1036,7 +1006,9 @@ int iso::DirTreeClass::WriteFiles(cd::IsoWriter* writer)
 			}
 
 			// TODO: Configurable pregap
-			if ( PackWaveFile( writer, entry.srcfile, true/*!firstDAWritten*/ ) )
+			writer->WriteBlankSectors(150);
+
+			if ( PackWaveFile( writer, entry.srcfile) )
 			{
 				if (!global::QuietMode)
 				{
@@ -1145,18 +1117,10 @@ int iso::DirTreeClass::WriteCueEntries(FILE* fp, int* trackNum) const
 			fprintf( fp, "  TRACK %02d AUDIO\n", *trackNum );
 
 			int trackLBA = entry.lba;
-
-			// TODO: Configurable pregap?
-			/*if ( *trackNum == 2 )
-			{
-				fprintf( fp, "    PREGAP 00:02:00\n" );
-			}
-			else*/
-			{
-				fprintf( fp, "    INDEX 00 %02d:%02d:%02d\n",
+            // TODO: Configurable pregap?
+			fprintf( fp, "    INDEX 00 %02d:%02d:%02d\n",
 					(trackLBA/75)/60, (trackLBA/75)%60,
 					trackLBA%75 );
-			}
 
 			trackLBA += 150;
 

src/mkpsxiso/iso.h

@@ -112,7 +112,7 @@ namespace iso
 		std::unique_ptr<PathTableClass> GenPathTableSub(unsigned short& index, unsigned short parentIndex) const;
 
 		int GetWavSize(const std::filesystem::path& wavFile);
-		int PackWaveFile(cd::IsoWriter* writer, const std::filesystem::path& wavFile, bool pregap);
+		int PackWaveFile(cd::IsoWriter* writer, const std::filesystem::path& wavFile);
 
 	public: