diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2011-02-14 18:38:39 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2011-02-14 18:38:39 +0000 |
| commit | 7fa70010daf92f90bf47933e846c0ded239a98f7 (patch) | |
| tree | 95df0ac411488f83cba05e30963ee130aebff687 /muse2/muse | |
| parent | b704adf0e6f3dc8a73bb87ff92b9dd698ebe52ee (diff) | |
WillyFoobar patch
Diffstat (limited to 'muse2/muse')
| -rw-r--r-- | muse2/muse/app.cpp | 4 | ||||
| -rw-r--r-- | muse2/muse/dssihost.cpp | 9 | ||||
| -rw-r--r-- | muse2/muse/synth.cpp | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index c1e86a2c..42f003df 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -4539,7 +4539,9 @@ void MusE::bounceToFile(AudioOutput* ao) song->setPos(0,song->lPos(),0,true,true); song->bounceOutput = ao; ao->setRecFile(sf); - printf("ao->setRecFile %d\n", sf); + //willfoobar-2011-02-13 + //old code//printf("ao->setRecFile %d\n", sf); + printf("ao->setRecFile %ld\n", (unsigned long)sf); song->setRecord(true, false); song->setRecordFlag(ao, true); ao->prepareRecording(); diff --git a/muse2/muse/dssihost.cpp b/muse2/muse/dssihost.cpp index d1d599f7..88ad0eed 100644 --- a/muse2/muse/dssihost.cpp +++ b/muse2/muse/dssihost.cpp @@ -2009,7 +2009,9 @@ iMPEvent DssiSynthIF::getData(MidiPort* /*mp*/, MPEventList* el, iMPEvent i, uns // memset(audioInBuffers[k], 0, sizeof(float) * n); // Watch our limits. - np = ports > synth->_outports ? synth->_outports : ports; + //willyfoobar-2011-02-13 + //old code//np = ports > synth->_outports ? synth->_outports : ports; + np = ((unsigned long) ports) > synth->_outports ? synth->_outports : ((unsigned long) ports); const DSSI_Descriptor* dssi = synth->dssi; const LADSPA_Descriptor* descr = dssi->LADSPA_Plugin; @@ -2939,7 +2941,10 @@ int DssiSynthIF::getControllerInfo(int id, const char** name, int* ctrl, int* mi int DssiSynthIF::channels() const { - return synth->_outports > MAX_CHANNELS ? MAX_CHANNELS : synth->_outports; + //willyfoobar-2011-02-13 + //!! either change return type to unsigend long or do this change + //old code //return synth->_outports > MAX_CHANNELS ? MAX_CHANNELS : synth->_outports; + return ((int)synth->_outports) > MAX_CHANNELS ? MAX_CHANNELS : ((int)synth->_outports) ; } int DssiSynthIF::totalOutChannels() const diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp index f8d21d41..72785c02 100644 --- a/muse2/muse/synth.cpp +++ b/muse2/muse/synth.cpp @@ -941,7 +941,10 @@ iMPEvent MessSynthIF::getData(MidiPort* mp, MPEventList* el, iMPEvent i, unsigne } if (frame > curPos) { - if (frame < pos) + //willyfoobar-2011-02-13 + //!!! comparison of signed with unsigened + //old code//if (frame < pos) + if (frame < (int) pos) printf("should not happen: missed event %d\n", pos -frame); else { |