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

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

Parent Directory | Revision Log | View Patch Patch

-revision 3936 by schoenebeck,
Thu Jun 17 10:29:54 2021 UTC
+revision 3944 by schoenebeck,
Fri Jun 18 15:28:14 2021 UTC
 Line 5394 
 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 {
+Line 5412 
 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 6204 
 namespace {
+Line 6211 
 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 6536 
 namespace {
+Line 6546 
 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 6560 
 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 6594 
 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 6625 
 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 6937 
 namespace {
+Line 6957 
 namespace {
          return bRequiresSave;
      }
+     /**
+      * Returns a pointer to the first <i>Group</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
+      */
      Group* File::GetFirstGroup() {
          if (!pGroups) LoadGroups();
          // there must always be at least one group
-Line 6944 
 namespace {
+Line 6970 
 namespace {
          return *GroupsIterator;
      }
+     /**
+      * Returns a pointer to the next <i>Group</i> object of the file,
+      * <i>NULL</i> otherwise.
+      *
+      * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
+      */
      Group* File::GetNextGroup() {
          if (!pGroups) return NULL;
          ++GroupsIterator;
-Line 6974 
 namespace {
+Line 7006 
 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;
      }

 Legend:



Removed from v.3936
 


changed lines


 
Added in v.3944
 Legend:



Removed from v.3936
 


changed lines


 
Added in v.3944
-Removed from v.3936
+Added in v.3944

	ViewVC Help
Powered by ViewVC