Skip to content

Commit

Permalink
Added help, changelog and HasIndependentRelease validation
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg68 committed Feb 24, 2024
1 parent b534f3a commit 8b79153
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- Added capability of playing release of percussive pipes with Pipe999HasIndependentRelease=Y https://github.com/GrandOrgue/grandorgue/issues/1385
- Added capability of loading only GUI panels without audio samples by specifying the "-g" switch from the command line https://github.com/GrandOrgue/grandorgue/issues/1602
- Removed support of MacOS 11 https://github.com/GrandOrgue/grandorgue/issues/1791
- Fixed crash on loading an organ with a crescendo in Add mode https://github.com/GrandOrgue/grandorgue/issues/1772
Expand Down
54 changes: 40 additions & 14 deletions help/grandorgue.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9909,9 +9909,22 @@ on which the pipes of the are placed.
<term>Percussive</term>
<listitem>
<para>
(boolean, required) If false, the samples are played as is (without
any loop/release handling)
</para>
(boolean, required) If false, the samples are played as is
(without any loop/release handling).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>HasIndependentRelease</term>
<listitem>
<para>
(boolean, default false or inherited from the Organ, Windchest or
Rank). If true than release is played independently on the attack.
</para>
<para>
If HasIndependentRelease is true then Percussive must also be set
to true.
</para>
</listitem>
</varlistentry>
<varlistentry>
Expand Down Expand Up @@ -9950,6 +9963,17 @@ The attributes of each pipe are prefixed with
attributes are:
</para>
<variablelist>
<varlistentry>
<term>Pipe999</term>
<listitem>
<para>
(string, required) Relative path to the sample WAV file of the first
attack. It may be listed as REF:aa:bb:cc too. In that case, it means
that this pipe is borrowed from manual aa, first rank of stop bb, the pipe cc.
It may contain DUMMY, which defines a non-sounding placeholder.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Pipe999Percussive</term>
<listitem>
Expand All @@ -9959,6 +9983,19 @@ played as is (without any loop/release handling)
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Pipe999HasIndependentRelease</term>
<listitem>
<para>
(boolean, default: rank HasIndependentRelease setting). If true
then the release is played independently on the attack.
</para>
<para>
If HasIndependentRelease is true then Pipe999Percussive must be
also true and Pipe999ReleaseCount must be greater than 0.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Pipe999AmplitudeLevel</term>
<listitem>
Expand Down Expand Up @@ -9992,17 +10029,6 @@ number of cents (in addition to the organ/rank factor).
<para>
(integer 0 - 10000, default: 0) Delay introduced by the tracker for
that pipe.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Pipe999</term>
<listitem>
<para>
(string, required) Relative path to the sample WAV file of the first
attack. It may be listed as REF:aa:bb:cc too. In that case, it means
that this pipe is borrowed from manual aa, first rank of stop bb, the pipe cc.
It may contain DUMMY, which defines a non-sounding placeholder.
</para>
</listitem>
</varlistentry>
Expand Down
8 changes: 8 additions & 0 deletions src/grandorgue/model/GOSoundingPipe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,14 @@ void GOSoundingPipe::Load(

unsigned release_count = cfg.ReadInteger(
ODFSetting, group, prefix + wxT("ReleaseCount"), 0, 100, false, 0);

if (m_PipeConfigNode.IsEffectiveIndependentRelease() && !release_count)
wxLogWarning(
_("The pipe %s/%s has independent release but %sReleaseCount=0"),
group,
prefix,
prefix);

for (unsigned i = 1; i <= release_count; i++)
LoadReleaseFileInfo(
cfg, group, wxString::Format(wxT("%sRelease%03d"), prefix, i));
Expand Down

0 comments on commit 8b79153

Please sign in to comment.