diff -rupN muse.old/muse/audiotrack.cpp muse/muse/audiotrack.cpp
--- muse.old/muse/audiotrack.cpp 2009-02-02 16:37:59.000000000 -0500
+++ muse/muse/audiotrack.cpp 2009-02-15 12:51:52.000000000 -0500
@@ -633,7 +633,7 @@ void AudioTrack::setVolume(double val)
{
iCtrlList cl = _controller.find(AC_VOLUME);
if (cl == _controller.end()) {
- printf("no volume controller %s %d\n",
+ printf("no volume controller %s %zd\n",
name().latin1(), _controller.size());
return;
}
@@ -1477,7 +1477,7 @@ bool AudioTrack::setRecordFlag1(bool f)
double AudioTrack::auxSend(int idx) const
{
if (unsigned(idx) >= _auxSend.size()) {
- printf("%s auxSend: bad index: %d >= %d\n",
+ printf("%s auxSend: bad index: %d >= %zd\n",
name().latin1(), idx, _auxSend.size());
return 0.0;
}
@@ -1487,7 +1487,7 @@ double AudioTrack::auxSend(int idx) cons
void AudioTrack::setAuxSend(int idx, double v)
{
if (unsigned(idx) >= _auxSend.size()) {
- printf("%s setAuxSend: bad index: %d >= %d\n",
+ printf("%s setAuxSend: bad index: %d >= %zd\n",
name().latin1(), idx, _auxSend.size());
return;
}
diff -rupN muse.old/muse/importmidi.cpp muse/muse/importmidi.cpp
--- muse.old/muse/importmidi.cpp 2009-02-02 16:37:59.000000000 -0500
+++ muse/muse/importmidi.cpp 2009-02-15 12:50:31.000000000 -0500
@@ -363,7 +363,7 @@ void MusE::processTrack(MidiTrack* track
}
if (tevents->size())
- printf("-----------events left: %d\n", tevents->size());
+ printf("-----------events left: %zd\n", tevents->size());
for (iEvent i = tevents->begin(); i != tevents->end(); ++i) {
printf("%d===\n", i->first);
i->second.dump();
diff -rupN muse.old/muse/memory.h muse/muse/memory.h
--- muse.old/muse/memory.h 2008-08-17 20:15:23.000000000 -0400
+++ muse/muse/memory.h 2009-02-15 12:24:03.000000000 -0500
@@ -52,7 +52,7 @@ inline void* Pool::alloc(size_t n)
{
int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
if (idx >= dimension) {
- printf("panic: alloc %d\n", n);
+ printf("panic: alloc %zd\n", n);
exit(-1);
}
if (head[idx] == 0)
@@ -70,7 +70,7 @@ inline void Pool::free(void* b, size_t n
{
int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1;
if (idx >= dimension) {
- printf("panic: alloc %d\n", n);
+ printf("panic: alloc %zd\n", n);
exit(-1);
}
Verweis* p = static_cast<Verweis*>(b);
diff -rupN muse.old/muse/midictrl.cpp muse/muse/midictrl.cpp
--- muse.old/muse/midictrl.cpp 2009-02-09 20:18:57.000000000 -0500
+++ muse/muse/midictrl.cpp 2009-02-15 12:53:35.000000000 -0500
@@ -626,7 +626,7 @@ void MidiCtrlValList::delMCtlVal(int tic
iMidiCtrlVal e = findMCtlVal(tick, part);
if (e == end()) {
if(debugMsg)
- printf("MidiCtrlValList::delMCtlVal(%d): not found (size %d)\n", tick, size());
+ printf("MidiCtrlValList::delMCtlVal(%d): not found (size %zd)\n", tick, size());
return;
}
erase(e);
diff -rupN muse.old/muse/midiport.cpp muse/muse/midiport.cpp
--- muse.old/muse/midiport.cpp 2009-02-04 21:36:18.000000000 -0500
+++ muse/muse/midiport.cpp 2009-02-15 12:47:29.000000000 -0500
@@ -690,7 +690,7 @@ int MidiPort::getCtrl(int ch, int tick,
iMidiCtrlValList cl = _controller->find(ch, ctrl);
if (cl == _controller->end()) {
if (debugMsg)
- printf("getCtrl: controller %d(0x%x) for channel %d not found size %d\n",
+ printf("getCtrl: controller %d(0x%x) for channel %d not found size %zd\n",
ctrl, ctrl, ch, _controller->size());
return CTRL_VAL_UNKNOWN;
}
@@ -715,7 +715,7 @@ void MidiPort::deleteController(int ch,
iMidiCtrlValList cl = _controller->find(ch, ctrl);
if (cl == _controller->end()) {
if (debugMsg)
- printf("deleteController: controller %d(0x%x) for channel %d not found size %d\n",
+ printf("deleteController: controller %d(0x%x) for channel %d not found size %zd\n",
ctrl, ctrl, ch, _controller->size());
return;
}
diff -rupN muse.old/muse/sig.cpp muse/muse/sig.cpp
--- muse.old/muse/sig.cpp 2004-12-12 14:54:29.000000000 -0500
+++ muse/muse/sig.cpp 2009-02-15 12:46:02.000000000 -0500
@@ -212,7 +212,7 @@ void SigList::tickValues(unsigned t, int
{
ciSigEvent e = upper_bound(t);
if (e == end()) {
- fprintf(stderr, "tickValues(0x%x) not found(%d)\n", t, size());
+ fprintf(stderr, "tickValues(0x%x) not found(%zd)\n", t, size());
// abort();
*bar = 0;
*beat = 0;
diff -rupN muse.old/muse/song.cpp muse/muse/song.cpp
--- muse.old/muse/song.cpp 2009-02-02 16:38:00.000000000 -0500
+++ muse/muse/song.cpp 2009-02-15 12:53:04.000000000 -0500
@@ -281,7 +281,7 @@ void Song::changeEvent(Event& oldEvent,
iEvent i = part->events()->find(oldEvent);
if (i == part->events()->end()) {
- printf("Song::changeEvent(): EVENT not found !! %d\n", part->events()->size());
+ printf("Song::changeEvent(): EVENT not found !! %zd\n", part->events()->size());
// abort();
// Removed by T356. Allow it to add the new event.
// (And remove the old one from the midi port controller!)
diff -rupN muse.old/muse/synth.cpp muse/muse/synth.cpp
--- muse.old/muse/synth.cpp 2009-02-02 16:38:00.000000000 -0500
+++ muse/muse/synth.cpp 2009-02-15 12:46:21.000000000 -0500
@@ -385,7 +385,7 @@ void initMidiSynth()
++it;
}
if (debugMsg)
- printf("%d soft synth found\n", synthis.size());
+ printf("%zd soft synth found\n", synthis.size());
}
}
diff -rupN muse.old/muse/track.cpp muse/muse/track.cpp
--- muse.old/muse/track.cpp 2009-02-02 16:38:00.000000000 -0500
+++ muse/muse/track.cpp 2009-02-15 12:52:33.000000000 -0500
@@ -186,7 +186,7 @@ void Track::clearRecAutomation(bool clea
void Track::dump() const
{
- printf("Track <%s>: typ %d, parts %d sel %d\n",
+ printf("Track <%s>: typ %d, parts %zd sel %d\n",
_name.latin1(), _type, _parts.size(), _selected);
}
diff -rupN muse.old/synti/simpledrums/simpledrums.cpp muse/synti/simpledrums/simpledrums.cpp
--- muse.old/synti/simpledrums/simpledrums.cpp 2009-02-02 16:38:02.000000000 -0500
+++ muse/synti/simpledrums/simpledrums.cpp 2009-02-15 12:45:10.000000000 -0500
@@ -1041,10 +1041,10 @@ void SimpleSynth::parseInitData(const un
if (SS_DEBUG_INIT) {
printf("Channel %d:\n", ch);
- printf("buffer[%d] - channels[ch].volume_ctrlval = \t%d\n", ptr-data, *ptr);
- printf("buffer[%d] - channels[ch].pan = \t\t%d\n", ptr-data+1, *(ptr+1));
- printf("buffer[%d] - channels[ch].noteoff_ignore = \t%d\n", ptr-data+2, *(ptr+2));
- printf("buffer[%d] - channels[ch].channel_on = \t%d\n", ptr-data+3, *(ptr+3));
+ printf("buffer[%zd] - channels[ch].volume_ctrlval = \t%d\n", ptr-data, *ptr);
+ printf("buffer[%zd] - channels[ch].pan = \t\t%d\n", ptr-data+1, *(ptr+1));
+ printf("buffer[%zd] - channels[ch].noteoff_ignore = \t%d\n", ptr-data+2, *(ptr+2));
+ printf("buffer[%zd] - channels[ch].channel_on = \t%d\n", ptr-data+3, *(ptr+3));
}
updateVolume(ch, *(ptr));
guiUpdateVolume(ch, *(ptr));
@@ -1118,7 +1118,7 @@ void SimpleSynth::parseInitData(const un
for (int i=0; i<SS_NR_OF_SENDEFFECTS; i++) {
if (SS_DEBUG_INIT)
- printf("buffer[%d] - sendeffect[%d], labelnamelen=%d\n", ptr-data, i, *ptr);
+ printf("buffer[%zd] - sendeffect[%d], labelnamelen=%d\n", ptr-data, i, *ptr);
int labelnamelen = *(ptr);
if (labelnamelen != SS_NO_PLUGIN) {
@@ -1149,7 +1149,7 @@ void SimpleSynth::parseInitData(const un
for (int j=0; j<params; j++) {
if (SS_DEBUG_INIT)
- printf("buffer[%d] - sendeffect[%d], parameter[%d]=%d\n", ptr-data, i, j, *ptr);
+ printf("buffer[%zd] - sendeffect[%d], parameter[%d]=%d\n", ptr-data, i, j, *ptr);
setFxParameter(i, j, sendEffects[i].plugin->convertGuiControlValue(j, *(ptr)));
ptr++;
}