From 2df2b9841660d917c22ff8f38f0cd32e5d2da851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 17 Jun 2006 14:56:25 +0000 Subject: [PATCH] clean up git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17866 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/midi/SoftSynth.cpp | 27 +++++----------- src/kits/midi/SoftSynth.h | 63 +++++++------------------------------ src/kits/midi/Synth.cpp | 24 +++----------- 3 files changed, 23 insertions(+), 91 deletions(-) diff --git a/src/kits/midi/SoftSynth.cpp b/src/kits/midi/SoftSynth.cpp index ead561b677..96f57d127e 100644 --- a/src/kits/midi/SoftSynth.cpp +++ b/src/kits/midi/SoftSynth.cpp @@ -1,24 +1,11 @@ -/* - * Copyright (c) 2004-2005 Matthijs Hollemans - * Copyright (c) 2003 Jerome Leveque +/* + * Copyright 2003-2006, Haiku. + * Distributed under the terms of the MIT License. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * Authors: + * Jérôme Leveque + * Matthijs Hollemans + * Jérôme Duval */ #include diff --git a/src/kits/midi/SoftSynth.h b/src/kits/midi/SoftSynth.h index dc02e0d35d..67ade30bb5 100644 --- a/src/kits/midi/SoftSynth.h +++ b/src/kits/midi/SoftSynth.h @@ -1,65 +1,24 @@ /* - * Copyright (c) 2004-2005 Matthijs Hollemans - * Copyright (c) 2003 Jerome Leveque + * Copyright 2003-2006, Haiku. + * Distributed under the terms of the MIT License. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * Authors: + * Jérôme Leveque + * Matthijs Hollemans + * Jérôme Duval */ #ifndef _SOFT_SYNTH_H #define _SOFT_SYNTH_H /* - WORK IN PROGRESS! - - This version of SoftSynth is a wrapper for Michael Pfeiffer's port - of TiMidity++ 2.11.3/3 (http://www.bebits.com/app/2736). - - It works, but not good enough yet. Playback from MidiPlayer sounds - a lot worse than using TiMidity in standalone mode. Either TiMidity's - MidiConsumer doesn't work properly or the Midi Kit messes things up; - I haven't investigated yet. - - To try it out, download TiMidity and the sound files (30MB): - http://bepdf.sourceforge.net/download/midi/TiMidity++-2.11.3_3.x86.zip - http://bepdf.sourceforge.net/download/midi/eawpats11_full_beos.zip - - Follow the instructions in the archive to install. Then double-click - "Start TiMidity Server" to launch TiMidity. The server will publish a - consumer endpoint. You can verify this with PatchBay. - - Build the Haiku Midi Kit. Put libmidi.so and libmidi2.so in ~/config/lib. - Quit the BeOS midi_server. Launch the Haiku midi_server. - - Build the Haiku MidiPlayer (or use the BeOS MidiPlayer). Start it and - choose a MIDI file. If all went fine, you will hear TiMidity play back - the song. Just not very well. :-) - - Note: You can still use the Midi Kit if you don't install TiMidity, - but the software synth will simply make no sound. + This version of SoftSynth is a wrapper libfluidsynth.so. */ -#include -#include - -#include - #include +#include +#include +#include class BMidiConsumer; class BMidiSynth; @@ -150,4 +109,4 @@ private: } // namespace BPrivate -#endif // _SYNTH_CONSUMER_H +#endif // _SOFT_SYNTH_H diff --git a/src/kits/midi/Synth.cpp b/src/kits/midi/Synth.cpp index 24f5eaa1df..54feb75d01 100644 --- a/src/kits/midi/Synth.cpp +++ b/src/kits/midi/Synth.cpp @@ -1,24 +1,10 @@ /* - * Copyright (c) 2002-2004 Matthijs Hollemans - * Copyright (c) 2003 Jerome Leveque + * Copyright 2002-2006, Haiku. + * Distributed under the terms of the MIT License. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * Authors: + * Jérôme Leveque + * Matthijs Hollemans */ #include