/[svn]/libgig/trunk/src/gig.cpp

Diff of /libgig/trunk/src/gig.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 3937 by schoenebeck,
Thu Jun 17 10:59:54 2021 UTC
+revision 3969 by schoenebeck,
Thu Jun 24 11:47:12 2021 UTC
 Line 4801 
 namespace {
      ScriptGroup::~ScriptGroup() {
          if (pScripts) {
-             std::list<Script*>::iterator iter = pScripts->begin();
+             std::vector<Script*>::iterator iter = pScripts->begin();
-             std::list<Script*>::iterator end  = pScripts->end();
+             std::vector<Script*>::iterator end  = pScripts->end();
              while (iter != end) {
                  delete *iter;
                  ++iter;
 Line 4840 
 namespace {
              // now store the name of this group as <LSNM> chunk as subchunk of the <RTIS> list chunk
              ::SaveString(CHUNK_ID_LSNM, NULL, pList, Name, String("Unnamed Group"), true, 64);
-             for (std::list<Script*>::iterator it = pScripts->begin();
+             for (std::vector<Script*>::iterator it = pScripts->begin();
                   it != pScripts->end(); ++it)
              {
                  (*it)->UpdateChunks(pProgress);
 Line 4855 
 namespace {
       * @param index - number of the sought script (0..n)
       * @returns sought script or NULL if there's no such script
       */
-     Script* ScriptGroup::GetScript(uint index) {
+     Script* ScriptGroup::GetScript(size_t index) {
          if (!pScripts) LoadScripts();
-         std::list<Script*>::iterator it = pScripts->begin();
+         if (index >= pScripts->size()) return NULL;
-         for (uint i = 0; it != pScripts->end(); ++i, ++it)
+         return (*pScripts)[index];
-             if (i == index) return *it;
-         return NULL;
      }
      /** @brief Add new instrument script.
-Line 4893 
 namespace {
+Line 4891 
 namespace {
       */
      void ScriptGroup::DeleteScript(Script* pScript) {
          if (!pScripts) LoadScripts();
-         std::list<Script*>::iterator iter =
+         std::vector<Script*>::iterator iter =
              find(pScripts->begin(), pScripts->end(), pScript);
          if (iter == pScripts->end())
              throw gig::Exception("Could not delete script, could not find given script");
-Line 4906 
 namespace {
+Line 4904 
 namespace {
      void ScriptGroup::LoadScripts() {
          if (pScripts) return;
-         pScripts = new std::list<Script*>;
+         pScripts = new std::vector<Script*>;
          if (!pList) return;
          size_t i = 0;
-Line 5310 
 namespace {
+Line 5308 
 namespace {
       * @param pos - position of sought Region in region list
       * @returns pointer address to requested region or @c NULL if @a pos is
       *          out of bounds
+      * @see CountRegions()
       */
      Region* Instrument::GetRegionAt(size_t pos) {
          if (!pRegions) return NULL;
-Line 5394 
 namespace {
+Line 5393 
 namespace {
       * @param dst - destination instrument at which this instrument will be
       *              moved to, or pass NULL for moving to end of list
       * @throw gig::Exception if this instrument and target instrument are not
-      *                       part of the same file
+      *                       part of the same file, as well as on unexpected
+      *                       internal error
       */
      void Instrument::MoveTo(Instrument* dst) {
          if (dst && GetParent() != dst->GetParent())
 Line 5411 
 namespace {
              File::InstrumentList::iterator itFrom =
                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));
+             if (itFrom == list.end())
+                 throw Exception(
+                     "gig::Instrument::MoveTo(): unexpected missing membership "
+                     "of this instrument."
+                 );
+             list.erase(itFrom);
              File::InstrumentList::iterator itTo =
                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));
-             list.splice(itTo, list, itFrom);
+             list.insert(itTo, this);
          }
          // move the instrument's actual list RIFF chunk appropriately
-Line 5496 
 namespace {
+Line 5502 
 namespace {
          File* pFile = (File*) GetParent();
          for (uint k = 0; k < scriptPoolFileOffsets.size(); ++k) {
              uint32_t soughtOffset = scriptPoolFileOffsets[k].fileOffset;
-             for (uint i = 0; pFile->GetScriptGroup(i); ++i) {
+             for (size_t i = 0; pFile->GetScriptGroup(i); ++i) {
                  ScriptGroup* group = pFile->GetScriptGroup(i);
                  for (uint s = 0; group->GetScript(s); ++s) {
                      Script* script = group->GetScript(s);
-Line 5534 
 namespace {
+Line 5540 
 namespace {
       * @param index - instrument script slot index
       * @returns script or NULL if index is out of bounds
       */
-     Script* Instrument::GetScriptOfSlot(uint index) {
+     Script* Instrument::GetScriptOfSlot(size_t index) {
          LoadScripts();
          if (index >= pScriptRefs->size()) return NULL;
          return pScriptRefs->at(index).script;
-Line 5595 
 namespace {
+Line 5601 
 namespace {
       * @param index1 - index of the first script slot to swap
       * @param index2 - index of the second script slot to swap
       */
-     void Instrument::SwapScriptSlots(uint index1, uint index2) {
+     void Instrument::SwapScriptSlots(size_t index1, size_t index2) {
          LoadScripts();
          if (index1 >= pScriptRefs->size() || index2 >= pScriptRefs->size())
              return;
-Line 5610 
 namespace {
+Line 5616 
 namespace {
       *
       * @param index - index of script slot to remove
       */
-     void Instrument::RemoveScriptSlot(uint index) {
+     void Instrument::RemoveScriptSlot(size_t index) {
          LoadScripts();
          if (index >= pScriptRefs->size()) return;
          pScriptRefs->erase( pScriptRefs->begin() + index );
-Line 5651 
 namespace {
+Line 5657 
 namespace {
       * GigaStudio 4 software. It will currently only work with LinuxSampler and
       * gigedit.
       */
-     uint Instrument::ScriptSlotCount() const {
+     size_t Instrument::ScriptSlotCount() const {
-         return uint(pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size());
+         return pScriptRefs ? pScriptRefs->size() : scriptPoolFileOffsets.size();
      }
      /** @brief Whether script execution shall be skipped.
-Line 5671 
 namespace {
+Line 5677 
 namespace {
       * @param index - index of the script slot on this instrument
       * @see Script::Bypass
       */
-     bool Instrument::IsScriptSlotBypassed(uint index) {
+     bool Instrument::IsScriptSlotBypassed(size_t index) {
          if (index >= ScriptSlotCount()) return false;
          return pScriptRefs ? pScriptRefs->at(index).bypass
                             : scriptPoolFileOffsets.at(index).bypass;
-Line 5691 
 namespace {
+Line 5697 
 namespace {
       * @param bBypass - if true, the script slot will be skipped by the sampler
       * @see Script::Bypass
       */
-     void Instrument::SetScriptSlotBypassed(uint index, bool bBypass) {
+     void Instrument::SetScriptSlotBypassed(size_t index, bool bBypass) {
          if (index >= ScriptSlotCount()) return;
          if (pScriptRefs)
              pScriptRefs->at(index).bypass = bBypass;
-Line 5711 
 namespace {
+Line 5717 
 namespace {
       * the @c Script identified by passed @p uuid.
       */
      bool Instrument::ReferencesScriptWithUuid(const _UUID& uuid) {
-         const uint nSlots = ScriptSlotCount();
+         const size_t nSlots = ScriptSlotCount();
-         for (uint iSlot = 0; iSlot < nSlots; ++iSlot)
+         for (size_t iSlot = 0; iSlot < nSlots; ++iSlot)
              if (_UUIDFromCArray(&GetScriptOfSlot(iSlot)->Uuid[0]) == uuid)
                  return true;
          return false;
-Line 5737 
 namespace {
+Line 5743 
 namespace {
       * @param slot - script slot index of the variable to be retrieved
       * @param variable - name of the 'patch' variable in that script
       */
-     bool Instrument::IsScriptPatchVariableSet(int slot, String variable) {
+     bool Instrument::IsScriptPatchVariableSet(size_t slot, String variable) {
          if (variable.empty()) return false;
          Script* script = GetScriptOfSlot(slot);
          if (!script) return false;
-Line 5771 
 namespace {
+Line 5777 
 namespace {
       *
       * @param slot - script slot index of the variable to be retrieved
       */
-     std::map<String,String> Instrument::GetScriptPatchVariables(int slot) {
+     std::map<String,String> Instrument::GetScriptPatchVariables(size_t slot) {
          Script* script = GetScriptOfSlot(slot);
          if (!script) return std::map<String,String>();
          const _UUID uuid = _UUIDFromCArray(&script->Uuid[0]);
-Line 5803 
 namespace {
+Line 5809 
 namespace {
       * @param slot - script slot index of the variable to be retrieved
       * @param variable - name of the 'patch' variable in that script
       */
-     String Instrument::GetScriptPatchVariable(int slot, String variable) {
+     String Instrument::GetScriptPatchVariable(size_t slot, String variable) {
          std::map<String,String> vars = GetScriptPatchVariables(slot);
          return (vars.count(variable)) ? vars.find(variable)->second : "";
      }
-Line 5830 
 namespace {
+Line 5836 
 namespace {
       * @throws gig::Exception if given script @p slot index is invalid or given
       *         @p variable name is empty
       */
-     void Instrument::SetScriptPatchVariable(int slot, String variable, String value) {
+     void Instrument::SetScriptPatchVariable(size_t slot, String variable, String value) {
          if (variable.empty())
              throw Exception("Variable name must not be empty");
          Script* script = GetScriptOfSlot(slot);
-Line 5871 
 namespace {
+Line 5877 
 namespace {
       * @param slot - script slot index of the variable to be unset
       * @param variable - name of the 'patch' variable in that script
       */
-     void Instrument::UnsetScriptPatchVariable(int slot, String variable) {
+     void Instrument::UnsetScriptPatchVariable(ssize_t slot, String variable) {
          Script* script = GetScriptOfSlot(slot);
          // option 1: unset a particular variable of one particular script slot
-Line 6204 
 namespace {
+Line 6210 
 namespace {
       */
      void Group::MoveAll() {
          // get "that" other group first
+         size_t i = 0;
          Group* pOtherGroup = NULL;
-         for (pOtherGroup = pFile->GetFirstGroup(); pOtherGroup; pOtherGroup = pFile->GetNextGroup()) {
+         for (pOtherGroup = pFile->GetGroup(i); pOtherGroup;
+              pOtherGroup = pFile->GetGroup(++i))
+         {
              if (pOtherGroup != this) break;
          }
          if (!pOtherGroup) throw Exception(
-Line 6295 
 namespace {
+Line 6304 
 namespace {
              delete pGroups;
          }
          if (pScriptGroups) {
-             std::list<ScriptGroup*>::iterator iter = pScriptGroups->begin();
+             std::vector<ScriptGroup*>::iterator iter = pScriptGroups->begin();
-             std::list<ScriptGroup*>::iterator end  = pScriptGroups->end();
+             std::vector<ScriptGroup*>::iterator end  = pScriptGroups->end();
              while (iter != end) {
                  delete *iter;
                  ++iter;
-Line 6402 
 namespace {
+Line 6411 
 namespace {
          pSample->DeleteChunks();
          delete pSample;
-         SampleList::iterator tmp = SamplesIterator;
          // remove all references to the sample
-         for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+         size_t iIns = 0;
-              instrument = GetNextInstrument()) {
+         for (Instrument* instrument = GetInstrument(iIns); instrument;
+                          instrument = GetInstrument(++iIns))
+         {
              size_t iRgn = 0;
              for (Region* region = instrument->GetRegionAt(iRgn); region;
                   region = instrument->GetRegionAt(++iRgn))
-Line 6418 
 namespace {
+Line 6428 
 namespace {
                  }
              }
          }
-         SamplesIterator = tmp; // restore iterator
      }
      void File::LoadSamples() {
-Line 6512 
 namespace {
+Line 6521 
 namespace {
              if (wvpl) {
                  file_offset_t wvplFileOffset = wvpl->GetFilePos() -
                                                 wvpl->GetPos(); // should be zero, but just to be sure
-                 size_t i = 0;
+                 size_t iWaveCk = 0;
-                 for (RIFF::List* wave = wvpl->GetSubListAt(i); wave;
+                 for (RIFF::List* wave = wvpl->GetSubListAt(iWaveCk); wave;
-                      wave = wvpl->GetSubListAt(++i))
+                      wave = wvpl->GetSubListAt(++iWaveCk))
                  {
                      if (wave->GetListType() == LIST_TYPE_WAVE) {
                          // notify current progress
-Line 6536 
 namespace {
+Line 6545 
 namespace {
              __notify_progress(pProgress, 1.0); // notify done
      }
+     /**
+      * Returns a pointer to the first <i>Instrument</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetInstrument()
+      *              instead.
+      */
      Instrument* File::GetFirstInstrument() {
          if (!pInstruments) LoadInstruments();
          if (!pInstruments) return NULL;
-Line 6543 
 namespace {
+Line 6559 
 namespace {
          return static_cast<gig::Instrument*>( (InstrumentsIterator != pInstruments->end()) ? *InstrumentsIterator : NULL );
      }
+     /**
+      * Returns a pointer to the next <i>Instrument</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetInstrument()
+      *              instead.
+      */
      Instrument* File::GetNextInstrument() {
          if (!pInstruments) return NULL;
          InstrumentsIterator++;
-Line 6570 
 namespace {
+Line 6593 
 namespace {
       * @param pProgress - optional: callback function for progress notification
       * @returns  sought instrument or NULL if there's no such instrument
       */
-     Instrument* File::GetInstrument(uint index, progress_t* pProgress) {
+     Instrument* File::GetInstrument(size_t index, progress_t* pProgress) {
          if (!pInstruments) {
              // TODO: hack - we simply load ALL samples here, it would have been done in the Region constructor anyway (ATM)
-Line 6601 
 namespace {
+Line 6624 
 namespace {
              }
          }
          if (!pInstruments) return NULL;
-         InstrumentsIterator = pInstruments->begin();
+         if (index >= pInstruments->size()) return NULL;
-         for (uint i = 0; InstrumentsIterator != pInstruments->end(); i++) {
+         return static_cast<gig::Instrument*>( (*pInstruments)[index] );
-             if (i == index) return static_cast<gig::Instrument*>( *InstrumentsIterator );
-             InstrumentsIterator++;
-         }
-         return NULL;
      }
      /** @brief Add a new instrument definition.
-Line 6693 
 namespace {
+Line 6712 
 namespace {
          }
          // clone script groups and their scripts
-         for (int iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {
+         for (size_t iGroup = 0; pFile->GetScriptGroup(iGroup); ++iGroup) {
              ScriptGroup* sg = pFile->GetScriptGroup(iGroup);
              ScriptGroup* dg = AddScriptGroup();
              dg->Name = "COPY" + ToString(iCallCount) + "_" + sg->Name;
-Line 6986 
 namespace {
+Line 7005 
 namespace {
       */
      Group* File::GetGroup(String name) {
          if (!pGroups) LoadGroups();
-         GroupsIterator = pGroups->begin();
+         size_t i = 0;
-         for (uint i = 0; GroupsIterator != pGroups->end(); ++GroupsIterator, ++i)
+         for (Group* pGroup = GetGroup(i); pGroup; pGroup = GetGroup(++i))
-             if ((*GroupsIterator)->Name == name) return *GroupsIterator;
+             if (pGroup->Name == name) return pGroup;
          return NULL;
      }
-Line 7085 
 namespace {
+Line 7104 
 namespace {
       * @param index - number of the sought group (0..n)
       * @returns sought script group or NULL if there's no such group
       */
-     ScriptGroup* File::GetScriptGroup(uint index) {
+     ScriptGroup* File::GetScriptGroup(size_t index) {
          if (!pScriptGroups) LoadScriptGroups();
-         std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+         if (index >= pScriptGroups->size()) return NULL;
-         for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)
+         return (*pScriptGroups)[index];
-             if (i == index) return *it;
-         return NULL;
      }
      /** @brief Get instrument script group (by name).
-Line 7103 
 namespace {
+Line 7120 
 namespace {
       */
      ScriptGroup* File::GetScriptGroup(const String& name) {
          if (!pScriptGroups) LoadScriptGroups();
-         std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+         for (size_t i = 0; i < pScriptGroups->size(); ++i) {
-         for (uint i = 0; it != pScriptGroups->end(); ++i, ++it)
+             ScriptGroup* pGroup = (*pScriptGroups)[i];
-             if ((*it)->Name == name) return *it;
+             if (pGroup->Name == name) return pGroup;
+         }
          return NULL;
      }
-Line 7138 
 namespace {
+Line 7156 
 namespace {
       */
      void File::DeleteScriptGroup(ScriptGroup* pScriptGroup) {
          if (!pScriptGroups) LoadScriptGroups();
-         std::list<ScriptGroup*>::iterator iter =
+         std::vector<ScriptGroup*>::iterator iter =
              find(pScriptGroups->begin(), pScriptGroups->end(), pScriptGroup);
          if (iter == pScriptGroups->end())
              throw gig::Exception("Could not delete script group, could not find given script group");
-Line 7153 
 namespace {
+Line 7171 
 namespace {
      void File::LoadScriptGroups() {
          if (pScriptGroups) return;
-         pScriptGroups = new std::list<ScriptGroup*>;
+         pScriptGroups = new std::vector<ScriptGroup*>;
          RIFF::List* lstLS = pRIFF->GetSubList(LIST_TYPE_3LS);
          if (lstLS) {
              size_t i = 0;
-Line 7198 
 namespace {
+Line 7216 
 namespace {
          // of the respective instrument script chunk as reference.
          if (pScriptGroups) {
              // Update instrument script (group) chunks.
-             for (std::list<ScriptGroup*>::iterator it = pScriptGroups->begin();
+             for (std::vector<ScriptGroup*>::iterator it = pScriptGroups->begin();
                   it != pScriptGroups->end(); ++it)
              {
                  (*it)->UpdateChunks(pProgress);
-Line 7305 
 namespace {
+Line 7323 
 namespace {
              memset(&pData[48], 0, sublen - 48);
-             for (Instrument* instrument = GetFirstInstrument() ; instrument ;
+             size_t iIns = 0;
-                  instrument = GetNextInstrument()) {
+             for (Instrument* instrument = GetInstrument(iIns); instrument;
+                              instrument = GetInstrument(++iIns))
+             {
                  int nbusedsamples = 0;
                  int nbusedchannels = 0;
                  int nbdimregions = 0;
-Line 7411 
 namespace {
+Line 7431 
 namespace {
      void File::UpdateFileOffsets() {
          DLS::File::UpdateFileOffsets();
-         for (Instrument* instrument = GetFirstInstrument(); instrument;
+         size_t i = 0;
-              instrument = GetNextInstrument())
+         for (Instrument* instrument = GetInstrument(i); instrument;
+                          instrument = GetInstrument(++i))
          {
              instrument->UpdateScriptFileOffsets();
          }

 Legend:



Removed from v.3937
 


changed lines


 
Added in v.3969
 Legend:



Removed from v.3937
 


changed lines


 
Added in v.3969
-Removed from v.3937
+Added in v.3969

	ViewVC Help
Powered by ViewVC