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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1083 by schoenebeck,
Thu Mar  8 16:41:27 2007 UTC
+revision 1113 by schoenebeck,
Fri Mar 23 20:05:02 2007 UTC
 Line 254 
 namespace {
  }
+ // *************** Other Internal functions  ***************
+ // *
+     static split_type_t __resolveSplitType(dimension_t dimension) {
+         return (
+             dimension == dimension_layer ||
+             dimension == dimension_samplechannel ||
+             dimension == dimension_releasetrigger ||
+             dimension == dimension_keyboard ||
+             dimension == dimension_roundrobin ||
+             dimension == dimension_random ||
+             dimension == dimension_smartmidi ||
+             dimension == dimension_roundrobinkeyboard
+         ) ? split_type_bit : split_type_normal;
+     }
+     static int __resolveZoneSize(dimension_def_t& dimension_definition) {
+         return (dimension_definition.split_type == split_type_normal)
+         ? int(128.0 / dimension_definition.zones) : 0;
+     }
  // *************** Sample ***************
  // *
-Line 2115 
 namespace {
+Line 2139 
 namespace {
                      pDimensionDefinitions[i].dimension = dimension;
                      pDimensionDefinitions[i].bits      = bits;
                      pDimensionDefinitions[i].zones     = zones ? zones : 0x01 << bits; // = pow(2,bits)
-                     pDimensionDefinitions[i].split_type = (dimension == dimension_layer ||
+                     pDimensionDefinitions[i].split_type = __resolveSplitType(dimension);
-                                                            dimension == dimension_samplechannel ||
+                     pDimensionDefinitions[i].zone_size  = __resolveZoneSize(pDimensionDefinitions[i]);
-                                                            dimension == dimension_releasetrigger ||
-                                                            dimension == dimension_keyboard ||
-                                                            dimension == dimension_roundrobin ||
-                                                            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;
                      Dimensions++;
                      // if this is a layer dimension, remember the amount of layers
-Line 2152 
 namespace {
+Line 2166 
 namespace {
                  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
-Line 2174 
 namespace {
+Line 2190 
 namespace {
       * @throws gig::Exception if samples cannot be dereferenced
       */
      void Region::UpdateChunks() {
+         // in the gig format we don't care about the Region's sample reference
+         // but we still have to provide some existing one to not corrupt the
+         // file, so to avoid the latter we simply always assign the sample of
+         // the first dimension region of this region
+         pSample = pDimensionRegions[0]->pSample;
          // first update base class's chunks
          DLS::Region::UpdateChunks();
-Line 2348 
 namespace {
+Line 2370 
 namespace {
          // assign definition of new dimension
          pDimensionDefinitions[Dimensions] = *pDimDef;
+         // auto correct certain dimension definition fields (where possible)
+         pDimensionDefinitions[Dimensions].split_type  =
+             __resolveSplitType(pDimensionDefinitions[Dimensions].dimension);
+         pDimensionDefinitions[Dimensions].zone_size =
+             __resolveZoneSize(pDimensionDefinitions[Dimensions]);
          // create new dimension region(s) for this new dimension
          for (int i = 1 << iCurrentBits; i < 1 << iNewBits; i++) {
              //TODO: maybe we should copy existing dimension regions if possible instead of simply creating new ones with default values
-Line 2740 
 namespace {
+Line 2768 
 namespace {
      }
      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
+      * Apply current Group field values to the respective chunks. You have
-      * File::Save() to make changes persistent.
+      * 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
-Line 3176 
 namespace {
+Line 3209 
 namespace {
          }
      }
+     /**
+      * 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 ***************

 Legend:



Removed from v.1083
 


changed lines


 
Added in v.1113
 Legend:



Removed from v.1083
 


changed lines


 
Added in v.1113
-Removed from v.1083
+Added in v.1113

	ViewVC Help
Powered by ViewVC