From 9138338c722a120ea9ab620ea9ef47a562e14cc4 Mon Sep 17 00:00:00 2001 From: mahlzeit Date: Thu, 13 May 2004 09:44:22 +0000 Subject: [PATCH] Fixed warnings on geekgadgets compiler. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7559 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/midi/MidiStore.cpp | 4 ++-- src/kits/midi/MidiSynth.cpp | 10 ++++++++-- src/kits/midi/MidiText.cpp | 2 +- src/kits/midi/Samples.cpp | 10 ++++++++-- src/kits/midi/Synth.cpp | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/kits/midi/MidiStore.cpp b/src/kits/midi/MidiStore.cpp index c6ce4a5c23..ce9f0e4e85 100644 --- a/src/kits/midi/MidiStore.cpp +++ b/src/kits/midi/MidiStore.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2003 Matthijs Hollemans + * Copyright (c) 2002-2004 Matthijs Hollemans * Copyright (c) 2002 Jerome Leveque * Copyright (c) 2002 Paul Stadler * @@ -924,7 +924,7 @@ void BMidiStore::WriteTrack() uint32 oldTime; uint32 newTime; - for (int32 t = 0; t < CountEvents(); ++t) + for (uint32 t = 0; t < CountEvents(); ++t) { BMidiEvent* event = EventAt(t); diff --git a/src/kits/midi/MidiSynth.cpp b/src/kits/midi/MidiSynth.cpp index c2312914aa..34a216d43d 100644 --- a/src/kits/midi/MidiSynth.cpp +++ b/src/kits/midi/MidiSynth.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2003 Matthijs Hollemans + * Copyright (c) 2002-2004 Matthijs Hollemans * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -27,7 +27,12 @@ BMidiSynth::BMidiSynth() { - UNIMPLEMENTED + /* not complete yet */ + + if (be_synth == NULL) + { + new BSynth(); + } } //------------------------------------------------------------------------------ @@ -147,6 +152,7 @@ void BMidiSynth::FlushInstrumentCache(bool startStopCache) uint32 BMidiSynth::Tick(void) const { UNIMPLEMENTED + return 0; } //------------------------------------------------------------------------------ diff --git a/src/kits/midi/MidiText.cpp b/src/kits/midi/MidiText.cpp index f00a393985..f9d093e978 100644 --- a/src/kits/midi/MidiText.cpp +++ b/src/kits/midi/MidiText.cpp @@ -180,7 +180,7 @@ void BMidiText::WaitAndPrint(uint32 time) SnoozeUntil(time); - printf("%u: ", time - startTime); + printf("%lu: ", time - startTime); } //------------------------------------------------------------------------------ diff --git a/src/kits/midi/Samples.cpp b/src/kits/midi/Samples.cpp index 79c72a0260..2981e65e76 100644 --- a/src/kits/midi/Samples.cpp +++ b/src/kits/midi/Samples.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2003 Matthijs Hollemans + * Copyright (c) 2002-2004 Matthijs Hollemans * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -22,12 +22,18 @@ #include "debug.h" #include "Samples.h" +#include "Synth.h" //------------------------------------------------------------------------------ BSamples::BSamples() { - UNIMPLEMENTED + /* not complete yet */ + + if (be_synth == NULL) + { + new BSynth(); + } } //------------------------------------------------------------------------------ diff --git a/src/kits/midi/Synth.cpp b/src/kits/midi/Synth.cpp index c31f27e4cb..5decccb136 100644 --- a/src/kits/midi/Synth.cpp +++ b/src/kits/midi/Synth.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2003 Matthijs Hollemans + * Copyright (c) 2002-2004 Matthijs Hollemans * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"),