Skip to content

Commit

Permalink
Merge pull request #1843 from larspalo/AllowLargerSizes
Browse files Browse the repository at this point in the history
Increased maximum allowed (panel) size to 32000.
  • Loading branch information
larspalo authored Mar 22, 2024
2 parents adfe288 + 935f27c commit 7343be9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- Increased maximum value of allowed size to 32000 https://github.com/GrandOrgue/grandorgue/issues/1840
- Added capability of specifying AmplitudeLevel, Gain, PitchTuning, PitchCorrection and TrackerDelay, Percussive, HasIndependentRelease at the WindchestGroup level of ODF
- Added capability of specifying Percussive and HasIndependentRelease at the Organ level of ODF
- Added capability of playing release of percussive pipes with Pipe999HasIndependentRelease=Y https://github.com/GrandOrgue/grandorgue/issues/1385
Expand Down
4 changes: 2 additions & 2 deletions help/grandorgue.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<book lang="en">
<!--
Copyright 2006 Milan Digital Audio LLC
Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
License GPL-2.0 or later (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
-->
<title>GrandOrgue Help</title>
Expand Down Expand Up @@ -6533,7 +6533,7 @@ or an integer number between 1 and 50.
</para>
<para>
A panel size can be one of the following values: SMALL, MEDIUM, MEDIUM LARGE, LARGE
or an integer number between 100 and 4000.
or an integer number between 100 and 32000.
</para>
<para>
The following image formats are supported: bmp, gif, jpg, ico, png
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/GOConfigReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ unsigned GOConfigReader::ReadSize(

long size;
if (parseLong(size, value))
if (100 <= size && size <= 4000)
if (100 <= size && size <= 32000)
return size;

wxString error;
Expand Down
2 changes: 1 addition & 1 deletion src/grandorgue/size/GOSizeKeeper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "config/GOConfigReader.h"
#include "config/GOConfigWriter.h"

constexpr static int windowLimit = 10000;
constexpr static int windowLimit = 32000;

const wxString WX_WINDOW_X = wxT("WindowX");
const wxString WX_WINDOW_Y = wxT("WindowY");
Expand Down

0 comments on commit 7343be9

Please sign in to comment.