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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3936 by schoenebeck, Thu Jun 17 10:29:54 2021 UTC revision 3941 by schoenebeck, Fri Jun 18 14:06:20 2021 UTC
# Line 5394  namespace { Line 5394  namespace {
5394       * @param dst - destination instrument at which this instrument will be       * @param dst - destination instrument at which this instrument will be
5395       *              moved to, or pass NULL for moving to end of list       *              moved to, or pass NULL for moving to end of list
5396       * @throw gig::Exception if this instrument and target instrument are not       * @throw gig::Exception if this instrument and target instrument are not
5397       *                       part of the same file       *                       part of the same file, as well as on unexpected
5398         *                       internal error
5399       */       */
5400      void Instrument::MoveTo(Instrument* dst) {      void Instrument::MoveTo(Instrument* dst) {
5401          if (dst && GetParent() != dst->GetParent())          if (dst && GetParent() != dst->GetParent())
# Line 5411  namespace { Line 5412  namespace {
5412    
5413              File::InstrumentList::iterator itFrom =              File::InstrumentList::iterator itFrom =
5414                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(this));
5415                if (itFrom == list.end())
5416                    throw Exception(
5417                        "gig::Instrument::MoveTo(): unexpected missing membership "
5418                        "of this instrument."
5419                    );
5420                list.erase(itFrom);
5421    
5422              File::InstrumentList::iterator itTo =              File::InstrumentList::iterator itTo =
5423                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));                  std::find(list.begin(), list.end(), static_cast<DLS::Instrument*>(dst));
5424    
5425              list.splice(itTo, list, itFrom);              list.insert(itTo, this);
5426          }          }
5427    
5428          // move the instrument's actual list RIFF chunk appropriately          // move the instrument's actual list RIFF chunk appropriately
# Line 6204  namespace { Line 6211  namespace {
6211       */       */
6212      void Group::MoveAll() {      void Group::MoveAll() {
6213          // get "that" other group first          // get "that" other group first
6214            size_t i = 0;
6215          Group* pOtherGroup = NULL;          Group* pOtherGroup = NULL;
6216          for (pOtherGroup = pFile->GetFirstGroup(); pOtherGroup; pOtherGroup = pFile->GetNextGroup()) {          for (pOtherGroup = pFile->GetGroup(i); pOtherGroup;
6217                 pOtherGroup = pFile->GetGroup(++i))
6218            {
6219              if (pOtherGroup != this) break;              if (pOtherGroup != this) break;
6220          }          }
6221          if (!pOtherGroup) throw Exception(          if (!pOtherGroup) throw Exception(
# Line 6937  namespace { Line 6947  namespace {
6947          return bRequiresSave;          return bRequiresSave;
6948      }      }
6949    
6950        /**
6951         * Returns a pointer to the first <i>Group</i> object of the file,
6952         * <i>NULL</i> otherwise.
6953         *
6954         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6955         */
6956      Group* File::GetFirstGroup() {      Group* File::GetFirstGroup() {
6957          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6958          // there must always be at least one group          // there must always be at least one group
# Line 6944  namespace { Line 6960  namespace {
6960          return *GroupsIterator;          return *GroupsIterator;
6961      }      }
6962    
6963        /**
6964         * Returns a pointer to the next <i>Group</i> object of the file,
6965         * <i>NULL</i> otherwise.
6966         *
6967         * @deprecated  This method is not reentrant-safe, use GetGroup() instead.
6968         */
6969      Group* File::GetNextGroup() {      Group* File::GetNextGroup() {
6970          if (!pGroups) return NULL;          if (!pGroups) return NULL;
6971          ++GroupsIterator;          ++GroupsIterator;
# Line 6974  namespace { Line 6996  namespace {
6996       */       */
6997      Group* File::GetGroup(String name) {      Group* File::GetGroup(String name) {
6998          if (!pGroups) LoadGroups();          if (!pGroups) LoadGroups();
6999          GroupsIterator = pGroups->begin();          size_t i = 0;
7000          for (uint i = 0; GroupsIterator != pGroups->end(); ++GroupsIterator, ++i)          for (Group* pGroup = GetGroup(i); pGroup; pGroup = GetGroup(++i))
7001              if ((*GroupsIterator)->Name == name) return *GroupsIterator;              if (pGroup->Name == name) return pGroup;
7002          return NULL;          return NULL;
7003      }      }
7004    
Legend:
Removed from v.3936  
changed lines
  Added in v.3941
  ViewVC Help
Powered by ViewVC