--- libgig/trunk/src/gig.cpp	2007/03/05 17:42:35	1070
+++ libgig/trunk/src/gig.cpp	2007/03/18 07:13:06	1102
@@ -2120,8 +2120,10 @@
                                                            dimension == dimension_releasetrigger ||
                                                            dimension == dimension_keyboard ||
                                                            dimension == dimension_roundrobin ||
-                                                           dimension == dimension_random) ? split_type_bit
-                                                                                          : split_type_normal;
+                                                           dimension == dimension_random ||
+                                                           dimension == dimension_smartmidi ||
+                                                           dimension == dimension_roundrobinkeyboard) ? split_type_bit
+                                                                                                      : split_type_normal;
                     pDimensionDefinitions[i].zone_size  =
                         (pDimensionDefinitions[i].split_type == split_type_normal) ? 128.0 / pDimensionDefinitions[i].zones
                                                                                    : 0;
@@ -2150,6 +2152,8 @@
                 if (file->pWavePoolTable) pDimensionRegions[i]->pSample = GetSampleFromWavePool(wavepoolindex);
             }
             GetSample(); // load global region sample reference
+        } else {
+            DimensionRegions = 0;
         }
 
         // make sure there is at least one dimension region
@@ -2738,12 +2742,17 @@
     }
 
     Group::~Group() {
+        // remove the chunk associated with this group (if any)
+        if (pNameChunk) pNameChunk->GetParent()->DeleteSubChunk(pNameChunk);
     }
 
     /** @brief Update chunks with current group settings.
      *
-     * Apply current Group field values to the respective. You have to call
-     * File::Save() to make changes persistent.
+     * Apply current Group field values to the respective chunks. You have
+     * to call File::Save() to make changes persistent.
+     *
+     * Usually there is absolutely no need to call this method explicitly.
+     * It will be called automatically when File::Save() was called.
      */
     void Group::UpdateChunks() {
         // make sure <3gri> and <3gnl> list chunks exist
@@ -2891,6 +2900,7 @@
         if (!pSamples || !pSamples->size()) throw gig::Exception("Could not delete sample as there are no samples");
         SampleList::iterator iter = find(pSamples->begin(), pSamples->end(), (DLS::Sample*) pSample);
         if (iter == pSamples->end()) throw gig::Exception("Could not delete sample, could not find given sample");
+        if (SamplesIterator != pSamples->end() && *SamplesIterator == pSample) ++SamplesIterator; // avoid iterator invalidation
         pSamples->erase(iter);
         delete pSample;
     }
@@ -3027,7 +3037,7 @@
      * have to call Save() to make this persistent to the file.
      *
      * @param pInstrument - instrument to delete
-     * @throws gig::Excption if given instrument could not be found
+     * @throws gig::Exception if given instrument could not be found
      */
     void File::DeleteInstrument(Instrument* pInstrument) {
         if (!pInstruments) throw gig::Exception("Could not delete instrument as there are no instruments");
@@ -3105,11 +3115,44 @@
         return pGroup;
     }
 
+    /** @brief Delete a group and its samples.
+     *
+     * This will delete the given Group object and all the samples that
+     * belong to this group from the gig file. You have to call Save() to
+     * make this persistent to the file.
+     *
+     * @param pGroup - group to delete
+     * @throws gig::Exception if given group could not be found
+     */
     void File::DeleteGroup(Group* pGroup) {
         if (!pGroups) LoadGroups();
         std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
         if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
         if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
+        // delete all members of this group
+        for (Sample* pSample = pGroup->GetFirstSample(); pSample; pSample = pGroup->GetNextSample()) {
+            DeleteSample(pSample);
+        }
+        // now delete this group object
+        pGroups->erase(iter);
+        delete pGroup;
+    }
+
+    /** @brief Delete a group.
+     *
+     * This will delete the given Group object from the gig file. All the
+     * samples that belong to this group will not be deleted, but instead
+     * be moved to another group. You have to call Save() to make this
+     * persistent to the file.
+     *
+     * @param pGroup - group to delete
+     * @throws gig::Exception if given group could not be found
+     */
+    void File::DeleteGroupOnly(Group* pGroup) {
+        if (!pGroups) LoadGroups();
+        std::list<Group*>::iterator iter = find(pGroups->begin(), pGroups->end(), pGroup);
+        if (iter == pGroups->end()) throw gig::Exception("Could not delete group, could not find given group");
+        if (pGroups->size() == 1) throw gig::Exception("Cannot delete group, there must be at least one default group!");
         // move all members of this group to another group
         pGroup->MoveAll();
         pGroups->erase(iter);
@@ -3140,6 +3183,30 @@
         }
     }
 
+    /**
+     * Apply all the gig file's current instruments, samples, groups and settings
+     * to the respective RIFF chunks. You have to call Save() to make changes
+     * persistent.
+     *
+     * Usually there is absolutely no need to call this method explicitly.
+     * It will be called automatically when File::Save() was called.
+     *
+     * @throws Exception - on errors
+     */
+    void File::UpdateChunks() {
+        // first update base class's chunks
+        DLS::File::UpdateChunks();
+
+        // update group's chunks
+        if (pGroups) {
+            std::list<Group*>::iterator iter = pGroups->begin();
+            std::list<Group*>::iterator end  = pGroups->end();
+            for (; iter != end; ++iter) {
+                (*iter)->UpdateChunks();
+            }
+        }
+    }
+
 
 
 // *************** Exception ***************