Intermediate commit

src/grandorgue/model/GOCacheObject.cpp

@@ -22,7 +22,7 @@ void GOCacheObject::InitBeforeLoad() {
   m_LoadError.Clear();
 }
 
-const wxString GOCacheObject::GenerateMessage(const wxString &srcMsg) {
+const wxString GOCacheObject::GenerateMessage(const wxString &srcMsg) const {
   wxString res;
 
   if (!m_group.IsEmpty()) {

src/grandorgue/model/GOCacheObject.h

@@ -71,7 +71,12 @@ class GOCacheObject {
   virtual const wxString &GetLoadTitle() const = 0;
 
   // Returns the message string prefixed with group and keyPrefix
-  const wxString GenerateMessage(const wxString &srcMsg);
+  const wxString GenerateMessage(const wxString &srcMsg) const;
+
+  static const wxString generateMessage(
+    const GOCacheObject *pObjectFor, const wxString &srcMsg) {
+    return pObjectFor ? pObjectFor->GenerateMessage(srcMsg) : srcMsg;
+  }
 };
 
 #endif

src/grandorgue/model/GOSoundingPipe.cpp

@@ -58,6 +58,7 @@ GOSoundingPipe::GOSoundingPipe(
     m_SampleMidiPitchFraction(0.0),
     m_RetunePipe(retune),
     m_IsTemperamentOriginalBased(true),
+    m_SoundProvider(this),
     m_PipeConfigNode(
       &rank->GetPipeConfig(), pOrganModel, this, &m_SoundProvider) {}
 

src/grandorgue/sound/GOSoundAudioSection.cpp

@@ -8,6 +8,7 @@
 #include "GOSoundAudioSection.h"
 
 #include <wx/intl.h>
+#include <wx/log.h>
 
 #include "GOAlloc.h"
 #include "GOCache.h"
@@ -636,6 +637,7 @@ void GOAudioSection::DoCrossfade(
 }
 
 void GOAudioSection::Setup(
+  const GOLoaderFilename *pLoaderFilename,
   const void *pcm_data,
   const GOWave::SAMPLE_FORMAT pcm_data_format,
   const unsigned pcm_data_channels,
@@ -685,7 +687,7 @@ void GOAudioSection::Setup(
         = 1 + end_seg.end_offset - start_seg.start_offset;
       unsigned end_length;
 
-      if (fade_len > end_seg.end_offset - start_seg.start_offset)
+      if (fade_len > loop_length - 1)
         throw(wxString) _("Loop too short for crossfade");
 
       if (start_seg.start_offset < fade_len)

src/grandorgue/sound/GOSoundAudioSection.h

@@ -20,6 +20,7 @@
 class GOAudioSection;
 class GOCache;
 class GOCacheWriter;
+class GOLoaderFilename;
 class GOMemoryPool;
 class GOSoundReleaseAlignTable;
 class GOSampleStatistic;
@@ -197,6 +198,7 @@ class GOAudioSection {
     int history[BLOCK_HISTORY][MAX_OUTPUT_CHANNELS]);
 
   void Setup(
+    const GOLoaderFilename *pLoaderFilename,
     const void *pcm_data,
     GOWave::SAMPLE_FORMAT pcm_data_format,
     unsigned pcm_data_channels,

src/grandorgue/sound/GOSoundProviderSynthedTrem.cpp

@@ -89,6 +89,7 @@ void GOSoundProviderSynthedTrem::Create(
   m_AttackInfo.push_back(attack_info);
   m_Attack.push_back(new GOAudioSection(pool));
   m_Attack[0]->Setup(
+    nullptr,
     data.get(),
     GOWave::SF_SIGNEDSHORT_16,
     1,
@@ -105,6 +106,7 @@ void GOSoundProviderSynthedTrem::Create(
   m_ReleaseInfo.push_back(release_info);
   m_Release.push_back(new GOAudioSection(pool));
   m_Release[0]->Setup(
+    nullptr,
     data.get() + attack_samples + loop_samples,
     GOWave::SF_SIGNEDSHORT_16,
     1,

src/grandorgue/sound/GOSoundProviderWave.cpp

@@ -35,6 +35,7 @@ unsigned GOSoundProviderWave::GetBytesPerSample(unsigned bits_per_sample) {
 
 void GOSoundProviderWave::CreateAttack(
   GOMemoryPool &pool,
+  const GOLoaderFilename &loaderFilename,
   const char *data,
   GOWave &wave,
   int attack_start,
@@ -120,6 +121,7 @@ void GOSoundProviderWave::CreateAttack(
   GOAudioSection *section = new GOAudioSection(pool);
   m_Attack.push_back(section);
   section->Setup(
+    &loaderFilename,
     data + attack_pos * GetBytesPerSample(bits_per_sample) * channels,
     (GOWave::SAMPLE_FORMAT)bits_per_sample,
     channels,
@@ -132,6 +134,7 @@ void GOSoundProviderWave::CreateAttack(
 
 void GOSoundProviderWave::CreateRelease(
   GOMemoryPool &pool,
+  const GOLoaderFilename &loaderFilename,
   const char *data,
   GOWave &wave,
   int sample_group,
@@ -163,6 +166,7 @@ void GOSoundProviderWave::CreateRelease(
   GOAudioSection *section = new GOAudioSection(pool);
   m_Release.push_back(section);
   section->Setup(
+    &loaderFilename,
     data + release_offset * GetBytesPerSample(bits_per_sample) * channels,
     (GOWave::SAMPLE_FORMAT)bits_per_sample,
     channels,
@@ -243,6 +247,7 @@ void GOSoundProviderWave::LoadFromOneFile(
     if (is_attack)
       CreateAttack(
         pool,
+        loaderFilename,
         data.get(),
         wave,
         attack_start,
@@ -262,6 +267,7 @@ void GOSoundProviderWave::LoadFromOneFile(
       && (!is_attack || (wave.GetNbLoops() > 0 && wave.HasReleaseMarker() && !percussive)))
       CreateRelease(
         pool,
+        loaderFilename,
         data.get(),
         wave,
         sample_group,

src/grandorgue/sound/GOSoundProviderWave.h

@@ -17,6 +17,7 @@
 #include "GOSoundProvider.h"
 #include "GOWaveLoop.h"
 
+class GOCacheObject;
 class GOWave;
 
 typedef enum {
@@ -59,10 +60,14 @@ typedef struct {
 } release_load_info;
 
 class GOSoundProviderWave : public GOSoundProvider {
+  // Used for error messages
+  GOCacheObject *p_ObjectFor;
+
   unsigned GetBytesPerSample(unsigned bits_per_sample);
 
   void CreateAttack(
     GOMemoryPool &pool,
+    const GOLoaderFilename &loaderFilename,
     const char *data,
     GOWave &wave,
     int attack_start,
@@ -79,6 +84,7 @@ class GOSoundProviderWave : public GOSoundProvider {
 
   void CreateRelease(
     GOMemoryPool &pool,
+    const GOLoaderFilename &loaderFilename,
     const char *data,
     GOWave &wave,
     int sample_group,
@@ -118,6 +124,9 @@ class GOSoundProviderWave : public GOSoundProvider {
   unsigned GetFaderLength(unsigned MidiKeyNumber);
 
 public:
+  GOSoundProviderWave(GOCacheObject *pObjectFor = nullptr)
+    : p_ObjectFor(pObjectFor) {}
+
   /*
    * Load all attack and release samples from corresponding .wav files or from
    * an archive