summaryrefslogtreecommitdiff
path: root/muse2/synti/simpledrums2
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
committerFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
commit9c4664d162c537ba4dd4fd8220971c0fb727103a (patch)
tree37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/synti/simpledrums2
parente87fedf1be804f7ec774071d844b1f163be30b96 (diff)
final merge
Diffstat (limited to 'muse2/synti/simpledrums2')
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 12e4fd18..4265c33c 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -664,10 +664,10 @@ const char* SimpleSynth::getPatchName(int /*index*/, int, int) const
\return MidiPatch with patch info for host
*/
//---------------------------------------------------------
-const MidiPatch* SimpleSynth::getPatchInfo(int index, const MidiPatch* patch) const
+const MidiPatch* SimpleSynth::getPatchInfo(int /*index*/, const MidiPatch* /*patch*/) const
{
SS_TRACE_IN
- index = 0; patch = 0;
+ //index = 0; patch = 0;
SS_TRACE_OUT
return 0;
}
@@ -1433,7 +1433,9 @@ static void* loadSampleThread(void* p)
// arg2 :sfi.frames is of type sf_count_t (== 64 bit) (long long)
// this requires format %lld (twice 'l' in format string (arg1)
// old code//printf("Resampling from %ld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
- printf("Resampling from %lld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
+ //printf("Resampling from %lld frames to %ld frames - srcration: %lf\n", sfi.frames, smp->frames, srcratio);
+ // Changed by Tim. Just avoid the hassle for now. Need to determine 32/64 bit and provide two different printf lines.
+ printf("Resampling to %ld frames - srcration: %lf\n", smp->frames, srcratio);
printf("Nr of new samples: %ld\n", smp->samples);
}