From f0cfb938a1cce336b61c370e8b756ff97a5b61ef Mon Sep 17 00:00:00 2001 From: Acro Date: Thu, 17 Oct 2024 11:50:33 -0400 Subject: [PATCH 1/3] Add support for swtiching combined waves from command line Cherry pick combined wave argument support --- src/args.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/args.cpp b/src/args.cpp index ad3a2ad..8f41cc7 100644 --- a/src/args.cpp +++ b/src/args.cpp @@ -413,6 +413,20 @@ int ConsolePlayer::args(int argc, const char *argv[]) m_frange = atof(&argv[i][9]); } } +#endif +#ifdef FEAT_CW_STRENGTH + else if (std::strcmp (&argv[i][1], "cww") == 0) + { + m_combinedWaveformsStrength = SidConfig::WEAK; + } + else if (std::strcmp (&argv[i][1], "cwa") == 0) + { + m_combinedWaveformsStrength = SidConfig::AVERAGE; + } + else if (std::strcmp (&argv[i][1], "cws") == 0) + { + m_combinedWaveformsStrength = SidConfig::STRONG; + } #endif // File format conversions else if (argv[i][1] == 'w') From 7ccd468d4fccbc7a9c62714ff8f2b62340ba8529 Mon Sep 17 00:00:00 2001 From: Acro <47704566+acrouzet@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:26:47 -0400 Subject: [PATCH 2/3] Update sidplayfp.pod --- doc/en/sidplayfp.pod | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/en/sidplayfp.pod b/doc/en/sidplayfp.pod index e7ba896..38ffe4b 100644 --- a/doc/en/sidplayfp.pod +++ b/doc/en/sidplayfp.pod @@ -199,6 +199,12 @@ Ranges from 0.0 (light) to 1.0 (dark), the default value is 0.5. If set to auto it will choose a predefined value for 6581 depending on the tune author. +=item B<-cw>I<< [f] >> + +Set the strength (width) of combined waveforms. +'w' for weak (thin) waves, 'a' for average waves, +and 's' for strong (wide) waves. + =item B<--noaudio> Run without an audio output device. From d742ad57f35c336f4437923650cdb2ca434bdf99 Mon Sep 17 00:00:00 2001 From: Acro <47704566+acrouzet@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:27:14 -0400 Subject: [PATCH 3/3] Update sidplayfp.pod --- doc/en/sidplayfp.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/sidplayfp.pod b/doc/en/sidplayfp.pod index 38ffe4b..a671247 100644 --- a/doc/en/sidplayfp.pod +++ b/doc/en/sidplayfp.pod @@ -199,7 +199,7 @@ Ranges from 0.0 (light) to 1.0 (dark), the default value is 0.5. If set to auto it will choose a predefined value for 6581 depending on the tune author. -=item B<-cw>I<< [f] >> +=item B<-cw>I<< >> Set the strength (width) of combined waveforms. 'w' for weak (thin) waves, 'a' for average waves,