decoder/mikmod: Add loop configuration parameter

This patch allows the user to configure the mikmod decoder plugin to loop modules. It adds a configuration parameter to the mikmod decoder called "loop" which can be "no" (the old behaviour, default) or "yes" to allow modules to use backward loops.

decoder/mikmod: Add loop configuration parameter
b6ac249c · Sebastian Thorarensen · Max Kellermann · 5e103b5f · b6ac249c · b6ac249c
Commit b6ac249c authored Oct 18, 2013 by Sebastian Thorarensen Committed by Max Kellermann Oct 18, 2013
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

NEWS NEWS +1 -0

user.xml doc/user.xml +10 -0

MikmodDecoderPlugin.cxx src/decoder/MikmodDecoderPlugin.cxx +3 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ ver 0.18 (2012/??/??)
  - flac: support FLAC files inside archives
  - opus: new decoder plugin for the Opus codec
  - vorbis: skip 16 bit quantisation, provide float samples
+  - mikmod: add "loop" configuration parameter
  - mp4ff: obsolete plugin removed
 * encoder:
  - opus: new encoder plugin for the Opus codec

--- a/doc/user.xml
+++ b/doc/user.xml
@@ -978,6 +978,16 @@ systemctl start mpd.socket</programlisting>
            <tbody>
              <row>
                <entry>
+                  <varname>loop</varname>
+                  <parameter>yes|no</parameter>
+                </entry>
+                <entry>
+                  Allow backward loops in modules.  Default is
+		  <parameter>no</parameter>.
+                </entry>
+              </row>
+              <row>
+                <entry>
                  <varname>sample_rate</varname>
                </entry>
                <entry>

--- a/src/decoder/MikmodDecoderPlugin.cxx
+++ b/src/decoder/MikmodDecoderPlugin.cxx
@@ -104,6 +104,7 @@ static MDRIVER drv_mpd = {
 	VC_VoiceRealVolume
 };
+static bool mikmod_loop;
 static unsigned mikmod_sample_rate;
 static bool
@@ -111,6 +112,7 @@ mikmod_decoder_init(const config_param &param)
 {
 	static char params[] = "";
+	mikmod_loop = param.GetBlockValue("loop", false);
 	mikmod_sample_rate = param.GetBlockValue("sample_rate", 44100u);
 	if (!audio_valid_sample_rate(mikmod_sample_rate))
 		FormatFatalError("Invalid sample rate in line %d: %u",
@@ -161,8 +163,7 @@ mikmod_decoder_file_decode(struct decoder *decoder, const char *path_fs)
 		return;
 	}
-	/* Prevent module from looping forever */
+	handle->loop = mikmod_loop;
-	handle->loop = 0;
 	const AudioFormat audio_format(mikmod_sample_rate, SampleFormat::S16, 2);
 	assert(audio_format.IsValid());