From 7f97516683bf5337d57d7767f4a78f8615895a49 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 20 Mar 2017 06:14:18 +0000 Subject: [PATCH] Fix build for OpenBSD/sndio and licence updates. (#3442) --- include/AudioSndio.h | 25 +++++++++++++++++++++++++ include/MidiSndio.h | 33 +++++++++++++++++++++++++++++---- src/core/audio/AudioSndio.cpp | 29 +++++++++++++++++++++++++---- src/core/midi/MidiSndio.cpp | 29 +++++++++++++++++++++++++---- 4 files changed, 104 insertions(+), 12 deletions(-) diff --git a/include/AudioSndio.h b/include/AudioSndio.h index b956c99b8..11e1f91e4 100644 --- a/include/AudioSndio.h +++ b/include/AudioSndio.h @@ -1,3 +1,28 @@ +/* + * AudioSndio.h - base-class that implements sndio audio support + * + * Copyright (c) 2010-2016 jackmsr@openbsd.net + * Copyright (c) 2016-2017 David Carlier + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + #ifndef _AUDIO_SNDIO_H #define _AUDIO_SNDIO_H diff --git a/include/MidiSndio.h b/include/MidiSndio.h index 2b62938a6..a41800d9f 100644 --- a/include/MidiSndio.h +++ b/include/MidiSndio.h @@ -1,3 +1,28 @@ +/* + * MidiSndio.h - base-class that implements sndio midi support + * + * Copyright (c) 2010-2016 jackmsr@openbsd.net + * Copyright (c) 2016-2017 David Carlier + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ + #ifndef _MIDI_SNDIO_H #define _MIDI_SNDIO_H @@ -28,10 +53,10 @@ public: return QT_TRANSLATE_NOOP("MidiSetupWidget", "sndio MIDI"); } - inline static QString configSection() - { - return "MidiSndio"; - } + inline static QString configSection() + { + return "MidiSndio"; + } protected: diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp index 3c7cf1b43..ca889d88c 100644 --- a/src/core/audio/AudioSndio.cpp +++ b/src/core/audio/AudioSndio.cpp @@ -1,6 +1,29 @@ -#ifndef SINGLE_SOURCE_COMPILE +/* + * AudioSndio.cpp - base-class that implements sndio audio support + * + * Copyright (c) 2010-2016 jackmsr@openbsd.net + * Copyright (c) 2016-2017 David Carlier + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ -/* license */ +#include "AudioSndio.h" #ifdef LMMS_HAVE_SNDIO @@ -198,5 +221,3 @@ void AudioSndio::setupWidget::saveSettings( void ) #endif /* LMMS_HAVE_SNDIO */ - -#endif /* SINGLE_SOURCE_COMPILE */ diff --git a/src/core/midi/MidiSndio.cpp b/src/core/midi/MidiSndio.cpp index 6327bad9b..6827fbf81 100644 --- a/src/core/midi/MidiSndio.cpp +++ b/src/core/midi/MidiSndio.cpp @@ -1,6 +1,29 @@ -#ifndef SINGLE_SOURCE_COMPILE +/* + * MidiSndio.cpp - base-class that implements sndio midi support + * + * Copyright (c) 2010-2016 jackmsr@openbsd.net + * Copyright (c) 2016-2017 David Carlier + * + * This file is part of LMMS - https://lmms.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program (see COPYING); if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + */ -/* license */ +#include "MidiSndio.h" #ifdef LMMS_HAVE_SNDIO @@ -95,5 +118,3 @@ void MidiSndio::run( void ) } #endif /* LMMS_HAVE_SNDIO */ - -#endif /* SINGLE_SOURCE_COMPILE */