From 121687d2ed7811c6805a11b17e295d7e9517b9c6 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:18 +0100 Subject: BACKENDS: Make GPL headers consistent in themselves. --- backends/midi/alsa.cpp | 1 + backends/midi/camd.cpp | 1 + backends/midi/coreaudio.cpp | 1 + backends/midi/coremidi.cpp | 1 + backends/midi/dmedia.cpp | 1 + backends/midi/seq.cpp | 1 + backends/midi/sndio.cpp | 1 + backends/midi/stmidi.cpp | 1 + backends/midi/timidity.cpp | 1 + 9 files changed, 9 insertions(+) (limited to 'backends/midi') diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index c006b6b6bf..14889b2942 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index 88973488ca..2c5728990c 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index e42b8ca313..74c590c654 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index 1d61dceba2..e2ec8405e9 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp index 68e957f9aa..eac2d34b58 100644 --- a/backends/midi/dmedia.cpp +++ b/backends/midi/dmedia.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ /* diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 37986520bf..2ce25b726c 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ /* diff --git a/backends/midi/sndio.cpp b/backends/midi/sndio.cpp index a065a658e1..5efec4b899 100644 --- a/backends/midi/sndio.cpp +++ b/backends/midi/sndio.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp index 5a6326877e..28350b3cc2 100644 --- a/backends/midi/stmidi.cpp +++ b/backends/midi/stmidi.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ /* diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index d2c60bec9d..d10b808bdb 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ /* -- cgit v1.2.3 From 449ea100d94e39b03a3f347be8a15e4e5f727a95 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:27 +0100 Subject: WIN32: Make GPL headers consistent in themselves. --- backends/midi/windows.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'backends/midi') diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index f4c5431d6e..e2b327ffa7 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -17,6 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * */ // Disable symbol overrides so that we can use system headers. -- cgit v1.2.3 From 22634d18ba5a4d831878df7b29f715a9318994e0 Mon Sep 17 00:00:00 2001 From: raziel- Date: Sun, 23 Feb 2014 17:33:24 +0200 Subject: AMIGAOS: Update CAMD midi to use output port environment variable. If this is not present, it will use the default as previously. --- backends/midi/camd.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'backends/midi') diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index 2c5728990c..9cee2a84a6 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -36,6 +36,7 @@ #include #include +#include /* * CAMD sequencer driver @@ -56,6 +57,7 @@ private: struct Library *_CamdBase; struct CamdIFace *_ICamd; struct MidiLink *_midi_link; + char _outport[128]; char *getDevice(); void closeAll(); @@ -155,13 +157,18 @@ char *MidiDriver_CAMD::getDevice() { if (strstr(dev, "out") != NULL) { // This is an output device, return this - retname = dev; + strcpy(_outport, dev); + retname = _outport; } else { // Search the next one cluster = _ICamd->NextCluster(cluster); } } + // If the user has a preference outport set, use this instead + if(IDOS->GetVar("DefMidiOut", _outport, 128, 0)) + retname = _outport; + _ICamd->UnlockCAMD(key); } -- cgit v1.2.3 From 3bcc3a6849bcf27a35790581bb4476f9ed2a4355 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Wed, 19 Mar 2014 04:18:27 +0000 Subject: AMIGAOS: Minor change to replace strcpy usage with safer strlcpy. --- backends/midi/camd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'backends/midi') diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index 9cee2a84a6..d91aef5533 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -31,6 +31,7 @@ #include "common/error.h" #include "common/endian.h" #include "common/util.h" +#include "common/str.h" #include "audio/musicplugin.h" #include "audio/mpu401.h" @@ -157,7 +158,7 @@ char *MidiDriver_CAMD::getDevice() { if (strstr(dev, "out") != NULL) { // This is an output device, return this - strcpy(_outport, dev); + Common::strlcpy(_outport, dev, sizeof(_outport)); retname = _outport; } else { // Search the next one -- cgit v1.2.3