Merge pull request #242 from MadDeCoDeR/frappedia

Merge latest commit by the Admin

Author: MadDeCoDeR

.github/workflows/auto_pr.yml

@@ -8,11 +8,26 @@ jobs:
     autopr:
         runs-on: ubuntu-latest
         steps:
+            - name: Check if PR exists
+              id: check
+              env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                prs=$(gh pr list \
+                    --repo "$GITHUB_REPOSITORY" \
+                    --head 'dev' \
+                    --base 'master' \
+                    --json title \
+                    --jq 'length')
+                if ((prs > 0)); then
+                    echo "skip=true" >> "$GITHUB_OUTPUT"
+                fi
             - name: pull repo
               uses: actions/checkout@v5
               with:
                 ref: frappedia
             - name: autopr
+              if: '!steps.check.outputs.skip'
               working-directory: ${{ github.workspace }}
               run: gh pr create -B master -H frappedia --title 'Merge latest commit by the Admin' --body 'Automatic'
               env:

doomclassic/doom/constructs.h

@@ -975,4 +975,6 @@ ::g->totalmus = 68;
 
 	::g->engineHeight = 0;
 
-	::g->mouselock = false;
+	::g->mouselock = false;
+
+	::g->extportMusic = false;

doomclassic/doom/d_main.cpp

@@ -679,6 +679,8 @@ void D_DoomMain(void)
 	//GK begin
 	::g->classichUsed = false;
 	::g->warpUsed = false;
+
+	::g->extportMusic = M_CheckParm("-exportMusic");
 	//GK: Check here for deathmatch
 	if (!initonce) {
 		::g->devparm = M_CheckParm("-devparm");

doomclassic/doom/i_sound_openal.cpp

@@ -911,6 +911,31 @@ namespace {
 	unsigned char midiConversionBuffer[MaxMidiConversionSize];
 }
 
+
+void MakeWaveHeader(unsigned char* data, int len) {
+	memcpy(data, "RIFF", 4);
+	uint32_t fileSize = 36 + len;
+	memcpy(data + 4, &fileSize, 4);
+	memcpy(data + 8, "WAVE", 4);
+	memcpy(data + 12, "fmt ", 4);
+	uint32_t chunkSize = 16;
+	memcpy(data + 16, &chunkSize, 4);
+	uint16_t format = idWaveFile::FORMAT_PCM;
+	memcpy(data + 20, &format, 2);
+	uint32_t channels = MIDI_CHANNELS;
+	memcpy(data + 22, &channels, 4);
+	uint32_t samplerate = MIDI_RATE;
+	memcpy(data + 24, &samplerate, 4);
+	uint16_t formatBytes = MIDI_CHANNELS * 8 / 8;
+	uint32_t timeBytes = MIDI_RATE * formatBytes;
+	memcpy(data + 28, &timeBytes, 4);
+	memcpy(data + 32, &formatBytes, 2);
+	uint16_t formatBits = 8;
+	memcpy(data + 34, &formatBits, 2);
+	memcpy(data + 36, "data", 4);
+	memcpy(data + 40, &len, 4);
+}
+
 /*
 ======================
 I_LoadSong
@@ -983,6 +1008,15 @@ bool I_LoadSong( const char * songname )
 		Timidity_Stop();
 		Timidity_FreeSong( doomMusic );
 		use_avi = false;
+		if(::g->extportMusic) {
+			idStr filePath = "midi/" + lumpName + ".wav";
+			unsigned char* waveMusBuffer = (unsigned char*)malloc(44 + totalBufferSize);
+			MakeWaveHeader(waveMusBuffer, totalBufferSize);
+			memcpy(waveMusBuffer + 44, musicBuffer, totalBufferSize);
+
+			fileSystem->WriteFile(filePath, waveMusBuffer, totalBufferSize);
+			free(waveMusBuffer);
+		}
 	}
 	else {
 			use_avi = DecodeALAudio(&musFile,&mus_size,&av_rate,&av_sample); //GK: Simplified

doomclassic/doom/vars.h

@@ -1196,4 +1196,6 @@ bool eventSkip; //GK: The menu ATE the EVENT
 int engineWidth;
 int engineHeight;
 
-qboolean mouselock; //KG: NIS FO NOCI no kooleerf elbasiD
+qboolean mouselock; //KG: NIS FO NOCI no kooleerf elbasiD
+
+qboolean extportMusic; //GK: Music export from TIMIDITY render