From 9c4664d162c537ba4dd4fd8220971c0fb727103a Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Sun, 1 Jul 2012 16:42:16 +0000 Subject: final merge --- muse2/synti/simpledrums2/simpledrums.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'muse2/synti/simpledrums2') 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); } -- cgit v1.2.3