/[svn]/gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp

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

revision 2553 by schoenebeck, Wed May 14 19:57:56 2014 UTC revision 2616 by schoenebeck, Tue Jun 10 20:20:21 2014 UTC
# Line 11  Line 11 
11  #define DEBUG_COMBINE_INSTRUMENTS 0  #define DEBUG_COMBINE_INSTRUMENTS 0
12    
13  #include "global.h"  #include "global.h"
14    #include "compat.h"
15    
16  #include <set>  #include <set>
17  #include <iostream>  #include <iostream>
# Line 21  Line 22 
22  #include <glibmm/ustring.h>  #include <glibmm/ustring.h>
23  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
24  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
25    #include <gtkmm/label.h>
26    
27  Glib::ustring gig_to_utf8(const gig::String& gig_string);  Glib::ustring gig_to_utf8(const gig::String& gig_string);
28    Glib::ustring dimTypeAsString(gig::dimension_t d);
29    
30    typedef std::vector< std::pair<gig::Instrument*, gig::Region*> > OrderedRegionGroup;
31  typedef std::map<gig::Instrument*, gig::Region*> RegionGroup;  typedef std::map<gig::Instrument*, gig::Region*> RegionGroup;
32  typedef std::map<DLS::range_t,RegionGroup> RegionGroups;  typedef std::map<DLS::range_t,RegionGroup> RegionGroups;
33    
# Line 168  static RegionGroup getAllRegionsWhichOve Line 172  static RegionGroup getAllRegionsWhichOve
172  /** @brief Identify required regions.  /** @brief Identify required regions.
173   *   *
174   * Takes a list of @a instruments as argument (which are planned to be combined   * Takes a list of @a instruments as argument (which are planned to be combined
175   * as layers in one single new instrument) and fulfills the following tasks:   * as separate dimension zones of a certain dimension into one single new
176     * instrument) and fulfills the following tasks:
177   *   *
178   * - 1. Identification of total amount of regions required to create a new   * - 1. Identification of total amount of regions required to create a new
179   *      instrument to become a layered version of the given instruments.   *      instrument to become a combined version of the given instruments.
180   * - 2. Precise key range of each of those identified required regions to be   * - 2. Precise key range of each of those identified required regions to be
181   *      created in that new instrument.   *      created in that new instrument.
182   * - 3. Grouping the original source regions of the given original instruments   * - 3. Grouping the original source regions of the given original instruments
# Line 293  static void fillDimValues(uint* values/* Line 298  static void fillDimValues(uint* values/*
298          #endif          #endif
299      }      }
300      #if DEBUG_COMBINE_INSTRUMENTS      #if DEBUG_COMBINE_INSTRUMENTS
301      printf("\n");      printf("}\n");
302      #endif      #endif
303  }  }
304    
# Line 400  struct CopyAssignSchedEntry { Line 405  struct CopyAssignSchedEntry {
405  };  };
406  typedef std::vector<CopyAssignSchedEntry> CopyAssignSchedule;  typedef std::vector<CopyAssignSchedEntry> CopyAssignSchedule;
407    
408  /** @brief Copy all DimensionRegions from source Region to target Region.  /** @brief Schedule copying DimensionRegions from source Region to target Region.
409   *   *
410   * Copies the entire articulation informations (including sample reference of   * Schedules copying the entire articulation informations (including sample
411   * course) from all individual DimensionRegions of source Region @a inRgn to   * reference) from all individual DimensionRegions of source Region @a inRgn to
412   * target Region @a outRgn. There are no dimension regions created during this   * target Region @a outRgn. It is expected that the required dimensions (thus
413   * task. It is expected that the required dimensions (thus the required   * the required dimension regions) were already created before calling this
414   * dimension regions) were already created before calling this function.   * function.
415   *   *
416   * To be precise, it does the task above only for the layer selected by   * To be precise, it does the task above only for the dimension zones defined by
417   * @a iSrcLayer and @a iDstLayer. All dimensions regions of other layers that   * the three arguments @a mainDim, @a iSrcMainBit, @a iDstMainBit, which reflect
418   * may exist, will not be copied by one single call of this function. So if   * a selection which dimension zones shall be copied. All other dimension zones
419   * there is a layer dimension, this function needs to be called several times.   * will not be scheduled to be copied by a single call of this function. So this
420     * function needs to be called several time in case all dimension regions shall
421     * be copied of the entire region (@a inRgn, @a outRgn).
422   *   *
423   * @param outRgn - where the dimension regions shall be copied to   * @param outRgn - where the dimension regions shall be copied to
424   * @param inRgn - all dimension regions that shall be copied from   * @param inRgn - all dimension regions that shall be copied from
425   * @param dims - precise dimension definitions of target region   * @param dims - precise dimension definitions of target region
426   * @param iDstLayer - layer index of destination region where the dimension   * @param mainDim - this dimension type, in combination with @a iSrcMainBit and
427   *                    regions shall be copied to   *                  @a iDstMainBit defines a selection which dimension region
428   * @param iSrcLayer - layer index of the source region where the dimension   *                  zones shall be copied by this call of this function
429   *                    regions shall be copied from   * @param iDstMainBit - destination bit of @a mainDim
430     * @param iSrcMainBit - source bit of @a mainDim
431     * @param schedule - list of all DimensionRegion copy operations which is filled
432     *                   during the nested loops / recursions of this function call
433   * @param dimCase - just for internal purpose (function recursion), don't pass   * @param dimCase - just for internal purpose (function recursion), don't pass
434   *                  anything here, this function will call itself recursively   *                  anything here, this function will call itself recursively
435   *                  will fill this container with concrete dimension values for   *                  will fill this container with concrete dimension values for
436   *                  selecting the precise dimension regions during its task   *                  selecting the precise dimension regions during its task
  * @param schedule - just for internal purpose (function recursion), don't pass  
                      anything here: list of all DimensionRegion copy operations  
  *                   which is filled during the nested loops / recursions of  
  *                   this function call, they will be peformed after all  
  *                   function recursions have been completed  
437   */   */
438  static void copyDimensionRegions(gig::Region* outRgn, gig::Region* inRgn, Dimensions dims, int iDstLayer, int iSrcLayer, DimensionCase dimCase = DimensionCase(), CopyAssignSchedule* schedule = NULL) {  static void scheduleCopyDimensionRegions(gig::Region* outRgn, gig::Region* inRgn,
439      const bool isHighestLevelOfRecursion = !schedule;                                   Dimensions dims, gig::dimension_t mainDim,
440                                     int iDstMainBit, int iSrcMainBit,
441      if (isHighestLevelOfRecursion)                                   CopyAssignSchedule* schedule,
442          schedule = new CopyAssignSchedule;                                   DimensionCase dimCase = DimensionCase())
443    {
444      if (dims.empty()) { // reached deepest level of function recursion ...      if (dims.empty()) { // reached deepest level of function recursion ...
445          CopyAssignSchedEntry e;          CopyAssignSchedEntry e;
446    
# Line 444  static void copyDimensionRegions(gig::Re Line 449  static void copyDimensionRegions(gig::Re
449          uint dstDimValues[8] = {};          uint dstDimValues[8] = {};
450          DimensionCase srcDimCase = dimCase;          DimensionCase srcDimCase = dimCase;
451          DimensionCase dstDimCase = dimCase;          DimensionCase dstDimCase = dimCase;
452          srcDimCase[gig::dimension_layer] = iSrcLayer;          if (dims.count(mainDim)) {
453          dstDimCase[gig::dimension_layer] = iDstLayer;              srcDimCase[mainDim] = iSrcMainBit;
454                dstDimCase[mainDim] = iDstMainBit;
455            }
456    
457          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
458          printf("-------------------------------\n");          printf("-------------------------------\n");
459            printf("iDstMainBit=%d iSrcMainBit=%d\n", iDstMainBit, iSrcMainBit);
460          #endif          #endif
461    
462          // first select source & target dimension region with an arbitrary          // first select source & target dimension region with an arbitrary
# Line 467  static void copyDimensionRegions(gig::Re Line 475  static void copyDimensionRegions(gig::Re
475          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);
476          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
477          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
478          printf("iDstLayer=%d iSrcLayer=%d\n", iDstLayer, iSrcLayer);          printf("iDstMainBit=%d iSrcMainBit=%d\n", iDstMainBit, iSrcMainBit);
479          printf("srcDimRgn=%lx dstDimRgn=%lx\n", (uint64_t)srcDimRgn, (uint64_t)dstDimRgn);          printf("srcDimRgn=%lx dstDimRgn=%lx\n", (uint64_t)srcDimRgn, (uint64_t)dstDimRgn);
480          printf("srcSample='%s' dstSample='%s'\n",          printf("srcSample='%s' dstSample='%s'\n",
481                 (!srcDimRgn->pSample ? "NULL" : srcDimRgn->pSample->pInfo->Name.c_str()),                 (!srcDimRgn->pSample ? "NULL" : srcDimRgn->pSample->pInfo->Name.c_str()),
# Line 486  static void copyDimensionRegions(gig::Re Line 494  static void copyDimensionRegions(gig::Re
494              // re-select target dimension region (with correct velocity zone)              // re-select target dimension region (with correct velocity zone)
495              DimensionZones dstZones = preciseDimensionZonesFor(gig::dimension_velocity, dstDimRgn);              DimensionZones dstZones = preciseDimensionZonesFor(gig::dimension_velocity, dstDimRgn);
496              assert(dstZones.size() > 1);              assert(dstZones.size() > 1);
497              int iZoneIndex = dstDimCase[gig::dimension_velocity];              const int iDstZoneIndex =
498              e.velocityZone = iZoneIndex;                  (mainDim == gig::dimension_velocity)
499                        ? iDstMainBit : dstDimCase[gig::dimension_velocity]; // (mainDim == gig::dimension_velocity) exception case probably unnecessary here
500                e.velocityZone = iDstZoneIndex;
501              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
502              printf("dst velocity zone: %d/%d\n", iZoneIndex, (int)dstZones.size());              printf("dst velocity zone: %d/%d\n", iDstZoneIndex, (int)dstZones.size());
503              #endif              #endif
504              assert(uint(iZoneIndex) < dstZones.size());              assert(uint(iDstZoneIndex) < dstZones.size());
505              dstDimCase[gig::dimension_velocity] = dstZones[iZoneIndex].low; // arbitrary value between low and high              dstDimCase[gig::dimension_velocity] = dstZones[iDstZoneIndex].low; // arbitrary value between low and high
506              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
507              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);
508              printf("dst refilled "); fflush(stdout);              printf("dst refilled "); fflush(stdout);
# Line 501  static void copyDimensionRegions(gig::Re Line 511  static void copyDimensionRegions(gig::Re
511              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
512              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
513              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);
514              printf("dstSample='%s'\n",              printf("dstSample='%s'%s\n",
515                  (!dstDimRgn->pSample ? "NULL" : dstDimRgn->pSample->pInfo->Name.c_str())                  (!dstDimRgn->pSample ? "NULL" : dstDimRgn->pSample->pInfo->Name.c_str()),
516                    (dstDimRgn->pSample ? " <--- ERROR ERROR ERROR !!!!!!!!! " : "")
517              );              );
518              #endif              #endif
519    
# Line 515  static void copyDimensionRegions(gig::Re Line 526  static void copyDimensionRegions(gig::Re
526                  if (srcZones.size() <= 1) {                  if (srcZones.size() <= 1) {
527                      addWarning("Input region has a velocity dimension with only ONE zone!");                      addWarning("Input region has a velocity dimension with only ONE zone!");
528                  }                  }
529                  if (uint(iZoneIndex) >= srcZones.size())                  int iSrcZoneIndex =
530                      iZoneIndex  = srcZones.size() - 1;                      (mainDim == gig::dimension_velocity)
531                  srcDimCase[gig::dimension_velocity] = srcZones[iZoneIndex].low; // same zone as used above for target dimension region (no matter what the precise zone ranges are)                          ? iSrcMainBit : iDstZoneIndex;
532                    if (uint(iSrcZoneIndex) >= srcZones.size())
533                        iSrcZoneIndex = srcZones.size() - 1;
534                    srcDimCase[gig::dimension_velocity] = srcZones[iSrcZoneIndex].low; // same zone as used above for target dimension region (no matter what the precise zone ranges are)
535                  #if DEBUG_COMBINE_INSTRUMENTS                  #if DEBUG_COMBINE_INSTRUMENTS
536                  printf("src refilled "); fflush(stdout);                  printf("src refilled "); fflush(stdout);
537                  #endif                  #endif
# Line 532  static void copyDimensionRegions(gig::Re Line 546  static void copyDimensionRegions(gig::Re
546              }              }
547          }          }
548    
549          // Schedule copy opertion of source -> target DimensionRegion for the          // Schedule copy operation of source -> target DimensionRegion for the
550          // time after all nested loops have been traversed. We have to postpone          // time after all nested loops have been traversed. We have to postpone
551          // the actual copy operations this way, because otherwise it would          // the actual copy operations this way, because otherwise it would
552          // overwrite informations inside the destination DimensionRegion object          // overwrite informations inside the destination DimensionRegion object
# Line 563  static void copyDimensionRegions(gig::Re Line 577  static void copyDimensionRegions(gig::Re
577          dimCase[type] = (def->split_type == gig::split_type_bit) ? iZone : zoneRange.low;          dimCase[type] = (def->split_type == gig::split_type_bit) ? iZone : zoneRange.low;
578    
579          // recurse until 'dims' is exhausted (and dimCase filled up with concrete value)          // recurse until 'dims' is exhausted (and dimCase filled up with concrete value)
580          copyDimensionRegions(outRgn, inRgn, dims, iDstLayer, iSrcLayer, dimCase, schedule);          scheduleCopyDimensionRegions(outRgn, inRgn, dims, mainDim, iDstMainBit, iSrcMainBit, schedule, dimCase);
581      }      }
582    }
583    
584      // if current function call is the (very first) entry point ...  static OrderedRegionGroup sortRegionGroup(const RegionGroup& group, const std::vector<gig::Instrument*>& instruments) {
585      if (isHighestLevelOfRecursion) {      OrderedRegionGroup result;
586          // ... then perform all scheduled DimensionRegion copy operations      for (std::vector<gig::Instrument*>::const_iterator it = instruments.begin();
587          for (uint i = 0; i < schedule->size(); ++i) {           it != instruments.end(); ++it)
588              CopyAssignSchedEntry& e = (*schedule)[i];      {
589            RegionGroup::const_iterator itRgn = group.find(*it);
590              // backup the target DimensionRegion's current dimension zones upper          if (itRgn == group.end()) continue;
591              // limits (because the target DimensionRegion's upper limits are          result.push_back(
592              // already defined correctly since calling AddDimension(), and the              std::pair<gig::Instrument*, gig::Region*>(
593              // CopyAssign() call next, will overwrite those upper limits                  itRgn->first, itRgn->second
594              // unfortunately              )
595              DimensionRegionUpperLimits dstUpperLimits = getDimensionRegionUpperLimits(e.dst);          );
             DimensionRegionUpperLimits srcUpperLimits = getDimensionRegionUpperLimits(e.src);  
   
             // now actually copy over the current DimensionRegion  
             const gig::Region* const origRgn = e.dst->GetParent(); // just for sanity check below  
             e.dst->CopyAssign(e.src);  
             assert(origRgn == e.dst->GetParent()); // if gigedit is crashing here, then you must update libgig (to at least SVN r2547, v3.3.0.svn10)  
   
             // restore all original dimension zone upper limits except of the  
             // velocity dimension, because the velocity dimension zone sizes are  
             // allowed to differ for individual DimensionRegions in gig v3  
             // format  
             if (srcUpperLimits.count(gig::dimension_velocity)) {  
                 if (!dstUpperLimits.count(gig::dimension_velocity)) {  
                     addWarning("Source instrument seems to have a velocity dimension whereas new target instrument doesn't!");  
                 } else {  
                     dstUpperLimits[gig::dimension_velocity] =  
                         (e.velocityZone >= e.totalSrcVelocityZones)  
                             ? 127 : srcUpperLimits[gig::dimension_velocity];  
                 }  
             }  
             restoreDimensionRegionUpperLimits(e.dst, dstUpperLimits);  
         }  
         delete schedule;  
596      }      }
597        return result;
598  }  }
599    
600  /** @brief Combine given list of instruments to one instrument.  /** @brief Combine given list of instruments to one instrument.
601   *   *
602   * Takes a list of @a instruments as argument and combines them to one single   * Takes a list of @a instruments as argument and combines them to one single
603   * new @a output instrument. For this task, it will create a 'layer' dimension   * new @a output instrument. For this task, it will create a dimension of type
604   * in the new instrument and copies the source instruments to those layers.   * given by @a mainDimension in the new instrument and copies the source
605     * instruments to those dimension zones.
606   *   *
607   * @param instruments - (input) list of instruments that shall be combined,   * @param instruments - (input) list of instruments that shall be combined,
608   *                      they will only be read, so they will be left untouched   *                      they will only be read, so they will be left untouched
# Line 616  static void copyDimensionRegions(gig::Re Line 610  static void copyDimensionRegions(gig::Re
610   *              be created   *              be created
611   * @param output - (output) on success this pointer will be set to the new   * @param output - (output) on success this pointer will be set to the new
612   *                 instrument being created   *                 instrument being created
613     * @param mainDimension - the dimension that shall be used to combine the
614     *                        instruments
615   * @throw RIFF::Exception on any kinds of errors   * @throw RIFF::Exception on any kinds of errors
616   */   */
617  static void combineInstruments(std::vector<gig::Instrument*>& instruments, gig::File* gig, gig::Instrument*& output) {  static void combineInstruments(std::vector<gig::Instrument*>& instruments, gig::File* gig, gig::Instrument*& output, gig::dimension_t mainDimension) {
618      output = NULL;      output = NULL;
619    
620      // divide the individual regions to (probably even smaller) groups of      // divide the individual regions to (probably even smaller) groups of
# Line 655  static void combineInstruments(std::vect Line 651  static void combineInstruments(std::vect
651          printf("---> Start target region %d..%d\n", itGroup->first.low, itGroup->first.high);          printf("---> Start target region %d..%d\n", itGroup->first.low, itGroup->first.high);
652          #endif          #endif
653    
654          // detect the total amount of layers required to build up this combi          // detect the total amount of zones required for the given main
655          // for current key range          // dimension to build up this combi for current key range
656          int iTotalLayers = 0;          int iTotalZones = 0;
657          for (RegionGroup::iterator itRgn = itGroup->second.begin();          for (RegionGroup::iterator itRgn = itGroup->second.begin();
658               itRgn != itGroup->second.end(); ++itRgn)               itRgn != itGroup->second.end(); ++itRgn)
659          {          {
660              gig::Region* inRgn = itRgn->second;              gig::Region* inRgn = itRgn->second;
661              iTotalLayers += inRgn->Layers;              gig::dimension_def_t* def = inRgn->GetDimensionDefinition(mainDimension);
662                iTotalZones += (def) ? def->zones : 1;
663          }          }
664          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
665          printf("Required total layers: %d\n", iTotalLayers);          printf("Required total zones: %d, vertical regions: %d\n", iTotalZones, itGroup->second.size());
666          #endif          #endif
667            
668          // create all required dimensions for this output region          // create all required dimensions for this output region
669          // (except the layer dimension, which we create as next step)          // (except the main dimension used for separating the individual
670            // instruments, we create that particular dimension as next step)
671          Dimensions dims = getDimensionsForRegionGroup(itGroup->second);          Dimensions dims = getDimensionsForRegionGroup(itGroup->second);
672            // the given main dimension which is used to combine the instruments is
673            // created separately after the next code block, and the main dimension
674            // should not be part of dims here, because it also used for iterating
675            // all dimensions zones, which would lead to this dimensions being
676            // iterated twice
677            dims.erase(mainDimension);
678          {          {
679              std::vector<gig::dimension_t> skipTheseDimensions; // used to prevent a misbehavior (i.e. crash) of the combine algorithm in case one of the source instruments has a dimension with only one zone, which is not standard conform              std::vector<gig::dimension_t> skipTheseDimensions; // used to prevent a misbehavior (i.e. crash) of the combine algorithm in case one of the source instruments has a dimension with only one zone, which is not standard conform
680    
681              for (Dimensions::iterator itDim = dims.begin();              for (Dimensions::iterator itDim = dims.begin();
682                  itDim != dims.end(); ++itDim)                  itDim != dims.end(); ++itDim)
683              {              {
                 // layer dimension is created separately in the next code block  
                 // (outside of this loop)  
                 if (itDim->first == gig::dimension_layer) continue;  
   
684                  gig::dimension_def_t def;                  gig::dimension_def_t def;
685                  def.dimension = itDim->first; // dimension type                  def.dimension = itDim->first; // dimension type
686                  def.zones = itDim->second.size();                  def.zones = itDim->second.size();
# Line 711  static void combineInstruments(std::vect Line 711  static void combineInstruments(std::vect
711                  dims.erase(skipTheseDimensions[i]);                  dims.erase(skipTheseDimensions[i]);
712          }          }
713    
714          // create the layer dimension (if necessary for current key range)          // create the main dimension (if necessary for current key range)
715          if (iTotalLayers > 1) {          if (iTotalZones > 1) {
716              gig::dimension_def_t def;              gig::dimension_def_t def;
717              def.dimension = gig::dimension_layer; // dimension type              def.dimension = mainDimension; // dimension type
718              def.zones = iTotalLayers;              def.zones = iTotalZones;
719              def.bits = zoneCountToBits(def.zones);              def.bits = zoneCountToBits(def.zones);
720              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
721              std::cout << "Adding new (layer) dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;              std::cout << "Adding new main combi dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;
722              #endif              #endif
723              outRgn->AddDimension(&def);              outRgn->AddDimension(&def);
724              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
725              std::cout << "OK" << std::endl << std::flush;              std::cout << "OK" << std::endl << std::flush;
726              #endif              #endif
727            } else {
728                dims.erase(mainDimension);
729          }          }
730    
731          // now copy the source dimension regions to the target dimension regions          // for the next task we need to have the current RegionGroup to be
732          int iDstLayer = 0;          // sorted by instrument in the same sequence as the 'instruments' vector
733          for (RegionGroup::iterator itRgn = itGroup->second.begin();          // argument passed to this function (because the std::map behind the
734               itRgn != itGroup->second.end(); ++itRgn) // iterate over 'vertical' / source regions ...          // 'RegionGroup' type sorts by memory address instead, and that would
735            // sometimes lead to the source instruments' region to be sorted into
736            // the wrong target layer)
737            OrderedRegionGroup currentGroup = sortRegionGroup(itGroup->second, instruments);
738    
739            // schedule copying the source dimension regions to the target dimension
740            // regions
741            CopyAssignSchedule schedule;
742            int iDstMainBit = 0;
743            for (OrderedRegionGroup::iterator itRgn = currentGroup.begin();
744                 itRgn != currentGroup.end(); ++itRgn) // iterate over 'vertical' / source regions ...
745          {          {
746              gig::Region* inRgn = itRgn->second;              gig::Region* inRgn = itRgn->second;
747              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
748              printf("[source region of '%s']\n", inRgn->GetParent()->pInfo->Name.c_str());              printf("[source region of '%s']\n", inRgn->GetParent()->pInfo->Name.c_str());
749              #endif              #endif
750              for (uint iSrcLayer = 0; iSrcLayer < inRgn->Layers; ++iSrcLayer, ++iDstLayer) {  
751                  copyDimensionRegions(outRgn, inRgn, dims, iDstLayer, iSrcLayer);              // determine how many main dimension zones this input region requires
752                gig::dimension_def_t* def = inRgn->GetDimensionDefinition(mainDimension);
753                const int inRgnMainZones = (def) ? def->zones : 1;
754    
755                for (uint iSrcMainBit = 0; iSrcMainBit < inRgnMainZones; ++iSrcMainBit, ++iDstMainBit) {
756                    scheduleCopyDimensionRegions(
757                        outRgn, inRgn, dims, mainDimension,
758                        iDstMainBit, iSrcMainBit, &schedule
759                    );
760              }              }
761          }          }
762    
763            // finally copy the scheduled source -> target dimension regions
764            for (uint i = 0; i < schedule.size(); ++i) {
765                CopyAssignSchedEntry& e = schedule[i];
766    
767                // backup the target DimensionRegion's current dimension zones upper
768                // limits (because the target DimensionRegion's upper limits are
769                // already defined correctly since calling AddDimension(), and the
770                // CopyAssign() call next, will overwrite those upper limits
771                // unfortunately
772                DimensionRegionUpperLimits dstUpperLimits = getDimensionRegionUpperLimits(e.dst);
773                DimensionRegionUpperLimits srcUpperLimits = getDimensionRegionUpperLimits(e.src);
774    
775                // now actually copy over the current DimensionRegion
776                const gig::Region* const origRgn = e.dst->GetParent(); // just for sanity check below
777                e.dst->CopyAssign(e.src);
778                assert(origRgn == e.dst->GetParent()); // if gigedit is crashing here, then you must update libgig (to at least SVN r2547, v3.3.0.svn10)
779    
780                // restore all original dimension zone upper limits except of the
781                // velocity dimension, because the velocity dimension zone sizes are
782                // allowed to differ for individual DimensionRegions in gig v3
783                // format
784                //
785                // if the main dinension is the 'velocity' dimension, then skip
786                // restoring the source's original velocity zone limits, because
787                // dealing with merging that is not implemented yet
788                // TODO: merge custom velocity splits if main dimension is the velocity dimension (for now equal sized velocity zones are used if mainDim is 'velocity')
789                if (srcUpperLimits.count(gig::dimension_velocity) && mainDimension != gig::dimension_velocity) {
790                    if (!dstUpperLimits.count(gig::dimension_velocity)) {
791                        addWarning("Source instrument seems to have a velocity dimension whereas new target instrument doesn't!");
792                    } else {
793                        dstUpperLimits[gig::dimension_velocity] =
794                            (e.velocityZone >= e.totalSrcVelocityZones)
795                                ? 127 : srcUpperLimits[gig::dimension_velocity];
796                    }
797                }
798                restoreDimensionRegionUpperLimits(e.dst, dstUpperLimits);
799            }
800      }      }
801    
802      // success      // success
# Line 752  CombineInstrumentsDialog::CombineInstrum Line 810  CombineInstrumentsDialog::CombineInstrum
810      : Gtk::Dialog(_("Combine Instruments"), parent, true),      : Gtk::Dialog(_("Combine Instruments"), parent, true),
811        m_gig(gig), m_fileWasChanged(false), m_newCombinedInstrument(NULL),        m_gig(gig), m_fileWasChanged(false), m_newCombinedInstrument(NULL),
812        m_cancelButton(Gtk::Stock::CANCEL), m_OKButton(Gtk::Stock::OK),        m_cancelButton(Gtk::Stock::CANCEL), m_OKButton(Gtk::Stock::OK),
813        m_descriptionLabel()        m_descriptionLabel(), m_tableDimCombo(2, 2), m_comboDimType(),
814          m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + "  ", Gtk::ALIGN_END)
815  {  {
816        m_scrolledWindow.add(m_treeView);
817        m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
818    
819      get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK);      get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK);
820      get_vbox()->pack_start(m_treeView);      get_vbox()->pack_start(m_tableDimCombo, Gtk::PACK_SHRINK);
821        get_vbox()->pack_start(m_scrolledWindow);
822      get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK);      get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK);
823    
824  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION >= 3
825      description.set_line_wrap();      m_descriptionLabel.set_line_wrap();
826  #endif  #endif
827      m_descriptionLabel.set_text(_(      m_descriptionLabel.set_text(_(
828          "Select at least two instruments below that shall be combined  "          "Select at least two instruments below that shall be combined (as "
829          "as layers (using a \"Layer\" dimension) to a new instrument. The "          "separate dimension zones of the selected dimension type) as a new "
830          "original instruments remain untouched.")          "instrument. The original instruments remain untouched.\n\n"
831      );          "You may use this tool for example to combine solo instruments into "
832            "a combi sound arrangement by selecting the 'layer' dimension, or you "
833            "might combine similar sounding solo sounds into separate velocity "
834            "split layers by using the 'velocity' dimension, and so on."
835        ));
836    
837        // add dimension type combo box
838        {
839            int iLayerDimIndex = -1;
840            Glib::RefPtr<Gtk::ListStore> refComboModel = Gtk::ListStore::create(m_comboDimsModel);
841            for (int i = 0x01, iRow = 0; i < 0xff; i++) {
842                Glib::ustring sType =
843                    dimTypeAsString(static_cast<gig::dimension_t>(i));
844                if (sType.find("Unknown") != 0) {
845                    Gtk::TreeModel::Row row = *(refComboModel->append());
846                    row[m_comboDimsModel.m_type_id]   = i;
847                    row[m_comboDimsModel.m_type_name] = sType;
848                    if (i == gig::dimension_layer) iLayerDimIndex = iRow;
849                    iRow++;
850                }
851            }
852            m_comboDimType.set_model(refComboModel);
853            m_comboDimType.pack_start(m_comboDimsModel.m_type_id);
854            m_comboDimType.pack_start(m_comboDimsModel.m_type_name);
855            m_tableDimCombo.attach(m_labelDimType, 0, 1, 0, 1);
856            m_tableDimCombo.attach(m_comboDimType, 1, 2, 0, 1);
857            m_comboDimType.set_active(iLayerDimIndex); // preselect "layer" dimension
858        }
859    
860      m_refTreeModel = Gtk::ListStore::create(m_columns);      m_refTreeModel = Gtk::ListStore::create(m_columns);
861      m_treeView.set_model(m_refTreeModel);      m_treeView.set_model(m_refTreeModel);
# Line 853  void CombineInstrumentsDialog::combineSe Line 943  void CombineInstrumentsDialog::combineSe
943      g_warnings.clear();      g_warnings.clear();
944    
945      try {      try {
946          combineInstruments(instruments, m_gig, m_newCombinedInstrument);          // which main dimension was selected in the combo box?
947            gig::dimension_t mainDimension;
948            {
949                Gtk::TreeModel::iterator iterType = m_comboDimType.get_active();
950                if (!iterType) throw gig::Exception("No dimension selected");
951                Gtk::TreeModel::Row rowType = *iterType;
952                if (!rowType) throw gig::Exception("Something is wrong regarding dimension selection");
953                int iTypeID = rowType[m_comboDimsModel.m_type_id];
954                mainDimension = static_cast<gig::dimension_t>(iTypeID);
955            }
956    
957            // now start the actual cobination task ...
958            combineInstruments(instruments, m_gig, m_newCombinedInstrument, mainDimension);
959      } catch (RIFF::Exception e) {;      } catch (RIFF::Exception e) {;
960          Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR);
961          msg.run();          msg.run();
Legend:
Removed from v.2553  
changed lines
  Added in v.2616
  ViewVC Help
Powered by ViewVC