--- linuxsampler/trunk/src/engines/gig/Voice.cpp	2016/04/19 14:07:53	2879
+++ linuxsampler/trunk/src/engines/gig/Voice.cpp	2016/12/15 12:47:45	3054
@@ -4,7 +4,8 @@
  *                                                                         *
  *   Copyright (C) 2003, 2004 by Benno Senoner and Christian Schoenebeck   *
  *   Copyright (C) 2005 - 2008 Christian Schoenebeck                       *
- *   Copyright (C) 2009 - 2015 Christian Schoenebeck and Grigor Iliev      *
+ *   Copyright (C) 2009 Christian Schoenebeck and Grigor Iliev             *
+ *   Copyright (C) 2010 - 2016 Christian Schoenebeck and Andreas Persson   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -58,7 +59,7 @@
         si.ChannelCount     = pSample->Channels;
         si.FrameSize        = pSample->FrameSize;
         si.BitDepth         = pSample->BitDepth;
-        si.TotalFrameCount  = pSample->SamplesTotal;
+        si.TotalFrameCount  = (uint)pSample->SamplesTotal;
 
         si.HasLoops       = pRegion->SampleLoops;
         si.LoopStart      = (si.HasLoops) ? pRegion->pSampleLoops[0].LoopStart  : 0;
@@ -341,7 +342,7 @@
                 break;
             case ::gig::lfo3_ctrl_aftertouch:
                 lfo3_internal_depth  = 0;
-                pLFO3->ExtController = 128;
+                pLFO3->ExtController = CTRL_TABLE_IDX_AFTERTOUCH;
                 bLFO3Enabled         = true;
                 break;
             case ::gig::lfo3_ctrl_internal_modwheel:
@@ -351,7 +352,7 @@
                 break;
             case ::gig::lfo3_ctrl_internal_aftertouch:
                 lfo3_internal_depth  = pRegion->LFO3InternalDepth;
-                pLFO3->ExtController = 128;
+                pLFO3->ExtController = CTRL_TABLE_IDX_AFTERTOUCH;
                 bLFO3Enabled         = (lfo3_internal_depth > 0 || pRegion->LFO3ControlDepth > 0);
                 break;
             default:
@@ -426,7 +427,7 @@
                 ctrl = 83;
                 break;
             case ::gig::vcf_cutoff_ctrl_aftertouch:
-                ctrl = 128;
+                ctrl = CTRL_TABLE_IDX_AFTERTOUCH;
                 break;
             case ::gig::vcf_cutoff_ctrl_none:
             default: