Upstream merge

locale/de.po

@@ -4822,7 +4822,7 @@ msgstr "Herzlich Willkommen zu Sneedacity-Version %s"
 #: src/ProjectManager.cpp
 #, c-format
 msgid "%sSave changes to %s?"
-msgstr "%sÄnderungen speichern nach %s?"
+msgstr "%sÄnderungen an %s speichern?"
 
 #: src/ProjectManager.cpp
 msgid "Save project before closing?"

scripts/ci/package.sh

@@ -6,13 +6,10 @@ set -euxo pipefail
 
 cd build
 
+cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose
+
 if [[ "${OSTYPE}" == msys* && ${GIT_BRANCH} == release* ]]; then # Windows
     cmake --build . --target innosetup --config "${SNEEDACITY_BUILD_TYPE}"
-else
-    set +e
-    cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose ||
-    (set -e ; echo "build failed, trying one more time" ;
-    cpack -C "${SNEEDACITY_BUILD_TYPE}" --verbose)
 fi
 
 # Remove the temporary directory

src/AColor.cpp

@@ -714,7 +714,7 @@ void AColor::PreComputeGradient() {
          gradient_pre[selected][1][i][2] = (unsigned char) (255 * b);
       }
 
-      // colorScheme 2: Grayscale
+      // colorScheme 3: Inverse Grayscale
       for (int i = 0; i < gradientSteps; i++) {
          float r, g, b;
          float value = float(i) / gradientSteps;
@@ -743,12 +743,12 @@ void AColor::PreComputeGradient() {
             b = 1.0f;
             break;
          }
-         gradient_pre[selected][2][i][0] = (unsigned char)(255 * r);
-         gradient_pre[selected][2][i][1] = (unsigned char)(255 * g);
-         gradient_pre[selected][2][i][2] = (unsigned char)(255 * b);
+         gradient_pre[selected][3][i][0] = (unsigned char)(255 * r);
+         gradient_pre[selected][3][i][1] = (unsigned char)(255 * g);
+         gradient_pre[selected][3][i][2] = (unsigned char)(255 * b);
       }
 
-      // colorScheme 3: Inv. Grayscale (=Old grayscale)
+      // colorScheme 2: Grayscale (=Old grayscale)
       for (int i = 0; i<gradientSteps; i++) {
          float r, g, b;
          float value = float(i)/gradientSteps;
@@ -781,9 +781,9 @@ void AColor::PreComputeGradient() {
             b = 1.0f;
             break;
          }
-         gradient_pre[selected][3][i][0] = (unsigned char) (255 * r);
-         gradient_pre[selected][3][i][1] = (unsigned char) (255 * g);
-         gradient_pre[selected][3][i][2] = (unsigned char) (255 * b);
+         gradient_pre[selected][2][i][0] = (unsigned char) (255 * r);
+         gradient_pre[selected][2][i][1] = (unsigned char) (255 * g);
+         gradient_pre[selected][2][i][2] = (unsigned char) (255 * b);
       }
    }
 }

src/float_cast.h

@@ -106,17 +106,40 @@
 
 		return intgr ;
 	}
-#elif (defined (WIN32) || defined (_WIN32)) && defined(_M_3X64)
+#elif (defined (WIN32) || defined (_WIN32)) && defined(_M_X64)
 
 	#include <math.h>
 	#include <immintrin.h>
+	#include <emmintrin.h>
 
-	__inline long int
-	lrintf (float flt)
+	#ifdef _MSC_VER
+		#pragma function(lrint, lrintf)
+	#endif
+
+	__inline
+	long int lrint(double flt)
 	{
-		return _mm_cvt_ss2si(_mm_set_ss(flt));
+       return _mm_cvtsd_si32(_mm_set_sd(flt));
+    }
+
+	__inline
+	long int lrintf (float flt)
+	{
+		return _mm_cvtss_si32(_mm_set_ss(flt));
 	}
 
+	__inline
+	long long int llrint(double flt)
+    {
+        return _mm_cvtsd_si64(_mm_set_sd(flt));
+    }
+
+    __inline
+    long long int llrintf(float flt)
+    {
+       return _mm_cvtss_si64(_mm_set_ss(flt));
+    }
+
 #elif (HAVE_LRINT && HAVE_LRINTF)
 
 	/*	These defines enable functionality introduced with the 1999 ISO C
@@ -146,6 +169,6 @@
    #include	<math.h>
 
    #define	lrint(dbl)		((int)rint(dbl))
-	#define	lrintf(flt)		((int)rint(flt))
+   #define	lrintf(flt)		((int)rint(flt))
 
 #endif

src/prefs/SpectrogramSettings.cpp

@@ -182,7 +182,7 @@ void SpectrogramSettings::ColorSchemeEnumSetting::Migrate(wxString &value)
    // Migrate old grayscale option to Color scheme choice
    bool isGrayscale = (gPrefs->Read(wxT("/Spectrum/Grayscale"), 0L) != 0);
    if (isGrayscale && !gPrefs->Read(wxT("/Spectrum/ColorScheme"), &value)) {
-      value = GetColorSchemeNames().at(csInvGrayscale).Internal();
+      value = GetColorSchemeNames().at(csGrayscale).Internal();
       Write(value);
       gPrefs->Flush();
    }

win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake

@@ -12,10 +12,10 @@
 
 if( BUILDING_64_BIT )
     set( INSTALLER_SUFFIX "x64" )
-    set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64")
+    set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64" )
 else()
     set( INSTALLER_SUFFIX "x86" )
-    set( INSTALLER_X64_MODE "ArchitecturesInstallIn64BitMode=x64")
+    set( INSTALLER_X64_MODE "" )
 endif()
 
 if( SIGN )

win/Inno_Setup_Wizard/sneedacity.iss.in

@@ -96,7 +96,7 @@ Source: ".\FirstTimeModel.ini"; DestDir: "{app}"; DestName: "FirstTime.ini"; Per
 Source: "Additional\README.txt"; DestDir: "{app}"; Flags: ignoreversion
 
 Source: "Additional\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#AppExe}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "Package\*.exe"; DestDir: "{app}"; Flags: ignoreversion
 
 ; Manual, which should be got from the manual wiki using ..\scripts\mw2html_sneedacity\wiki2htm.bat
 @MANUAL@