Fix interaction between pad_start, trim_start, and loop

qwertymodo · Apr 20, 2024 · 0336543 · 0336543
1 parent 0b1a624
commit 0336543
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/msupcm++/AudioBase.cpp b/msupcm++/AudioBase.cpp
@@ -301,8 +301,8 @@ void AudioBase::render()
 			sox->normalize(m_normalization);
 			sox->fade(m_fade_in, m_fade_out);
 			sox->tempo(m_tempo);
+			sox->loop(m_trim_start + m_start_offset, m_loop);
 			sox->pad(m_pad_start, m_pad_end);
-			sox->loop(m_trim_start + m_start_offset, m_loop + m_pad_start);
 			sox->dither(m_dither_type);
 			sox->finalize();
 		}

diff --git a/msupcm++/AudioSubChannel.cpp b/msupcm++/AudioSubChannel.cpp
@@ -261,8 +261,8 @@ void AudioSubChannel::render()
 			sox->normalize(m_normalization);
 			sox->fade(m_fade_in, m_fade_out);
 			sox->tempo(m_tempo);
+			sox->loop(m_trim_start + m_start_offset, m_loop);
 			sox->pad(m_pad_start, m_pad_end);
-			sox->loop(m_trim_start + m_start_offset, m_loop + m_pad_start);
 			sox->dither(m_dither_type);
 			sox->finalize();
 		}

diff --git a/msupcm++/AudioSubTrack.cpp b/msupcm++/AudioSubTrack.cpp
@@ -258,8 +258,8 @@ void AudioSubTrack::render()
 			sox->normalize(m_normalization);
 			sox->fade(m_fade_in, m_fade_out);
 			sox->tempo(m_tempo);
+			sox->loop(m_trim_start + m_start_offset, m_loop);
 			sox->pad(m_pad_start, m_pad_end);
-			sox->loop(m_trim_start + m_start_offset, m_loop + m_pad_start);
 			sox->dither(m_dither_type);
 			sox->finalize();
 		}

diff --git a/msupcm++/SoxWrapper.cpp b/msupcm++/SoxWrapper.cpp
@@ -240,6 +240,9 @@ bool SoxWrapper::pad(size_t start, size_t end)
 		delete[] args[0];
 		delete[] args[1];
 
+		if (m_loop)
+			m_loop += start;
+
 		return ret;
 	}