diff options
author | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
commit | 3085bbe95107fd789a8a966dfeb341cfe74cfad8 (patch) | |
tree | 7aac36fca1cce483218b3f06435d218283f156e3 /src/soundio | |
parent | 7d82224170a6e9b9a9242b65c2ccb82ba749949a (diff) |
merge 2.3
Diffstat (limited to 'src/soundio')
-rw-r--r-- | src/soundio/sounddevice.cpp | 17 | ||||
-rw-r--r-- | src/soundio/sounddevice.h | 22 | ||||
-rw-r--r-- | src/soundio/sounddeviceerror.h | 5 | ||||
-rw-r--r-- | src/soundio/sounddevicenetwork.h | 5 | ||||
-rw-r--r-- | src/soundio/sounddevicenotfound.h | 5 | ||||
-rw-r--r-- | src/soundio/soundmanager.cpp | 16 | ||||
-rw-r--r-- | src/soundio/soundmanagerconfig.cpp | 15 | ||||
-rw-r--r-- | src/soundio/soundmanagerconfig.h | 19 | ||||
-rw-r--r-- | src/soundio/soundmanagerutil.cpp | 15 |
9 files changed, 5 insertions, 114 deletions
diff --git a/src/soundio/sounddevice.cpp b/src/soundio/sounddevice.cpp index 40e4b75257..209f65141e 100644 --- a/src/soundio/sounddevice.cpp +++ b/src/soundio/sounddevice.cpp @@ -1,20 +1,3 @@ -/*************************************************************************** - sounddevice.cpp - ------------------- - begin : Sun Aug 12, 2007, past my bedtime - copyright : (C) 2007 Albert Santoni - email : gamegod \a\t users.sf.net -***************************************************************************/ - -/*************************************************************************** -* * -* 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. * -* * -***************************************************************************/ - #include "soundio/sounddevice.h" #include <QtDebug> diff --git a/src/soundio/sounddevice.h b/src/soundio/sounddevice.h index 5a9b103bc0..da42f418f3 100644 --- a/src/soundio/sounddevice.h +++ b/src/soundio/sounddevice.h @@ -1,22 +1,4 @@ -/*************************************************************************** - sounddevice.cpp - ------------------- - begin : Sun Aug 12, 2007, past my bedtime - copyright : (C) 2007 Albert Santoni - email : gamegod \a\t users.sf.net - ***************************************************************************/ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - -#ifndef SOUNDDEVICE_H -#define SOUNDDEVICE_H +#pragma once #include <QString> #include <QList> @@ -108,5 +90,3 @@ class SoundDevice { }; typedef QSharedPointer<SoundDevice> SoundDevicePointer; - -#endif diff --git a/src/soundio/sounddeviceerror.h b/src/soundio/sounddeviceerror.h index 7fac1d7c41..7d6968b1fe 100644 --- a/src/soundio/sounddeviceerror.h +++ b/src/soundio/sounddeviceerror.h @@ -1,5 +1,4 @@ -#ifndef SOUNDDEVICEERROR_H -#define SOUNDDEVICEERROR_H +#pragma once // Used for returning errors from sounddevice functions. enum SoundDeviceError { @@ -10,5 +9,3 @@ enum SoundDeviceError { SOUNDDEVICE_ERROR_EXCESSIVE_INPUT_CHANNEL, SOUNDDEVICE_ERROR_DEVICE_COUNT }; - -#endif /* SOUNDDEVICEERROR_H */ diff --git a/src/soundio/sounddevicenetwork.h b/src/soundio/sounddevicenetwork.h index 3d28aeb844..7c5b8686e7 100644 --- a/src/soundio/sounddevicenetwork.h +++ b/src/soundio/sounddevicenetwork.h @@ -1,5 +1,4 @@ -#ifndef SOUNDDEVICENETWORK_H -#define SOUNDDEVICENETWORK_H +#pragma once #include <QString> #include <QSharedPointer> @@ -103,5 +102,3 @@ class SoundDeviceNetworkThread : public QThread { SoundDeviceNetwork* m_pParent; bool m_stop; }; - -#endif // SOUNDDEVICENETWORK_H diff --git a/src/soundio/sounddevicenotfound.h b/src/soundio/sounddevicenotfound.h index 2e33dbf7f9..7ff817d480 100644 --- a/src/soundio/sounddevicenotfound.h +++ b/src/soundio/sounddevicenotfound.h @@ -1,5 +1,4 @@ -#ifndef SOUNDDEVICENOTFOUND_H -#define SOUNDDEVICENOTFOUND_H +#pragma once #include <QString> @@ -38,5 +37,3 @@ class SoundDeviceNotFound : public SoundDevice { return 44100; } }; - -#endif // SOUNDDEVICENOTFOUND_H diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp index 3963287d11..65993a9383 100644 --- a/src/soundio/soundmanager.cpp +++ b/src/soundio/soundmanager.cpp @@ -1,19 +1,3 @@ -/** - * @file soundmanager.cpp - * @author Albert Santoni <gamegod at users dot sf dot net> - * @author Bill Good <bkgood at gmail dot com> - * @date 20070815 - */ - -/*************************************************************************** -* * -* 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. * -* * -***************************************************************************/ - #include "soundio/soundmanager.h" #include <portaudio.h> diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp index 6e77113c21..1ffa35fb7b 100644 --- a/src/soundio/soundmanagerconfig.cpp +++ b/src/soundio/soundmanagerconfig.cpp @@ -1,18 +1,3 @@ -/** - * @file soundmanagerconfig.cpp - * @author Bill Good <bkgood at gmail dot com> - * @date 20100709 - */ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - #include <QRegularExpression> #include "soundio/soundmanagerconfig.h" diff --git a/src/soundio/soundmanagerconfig.h b/src/soundio/soundmanagerconfig.h index 0e030ebcdd..d158ae3cd6 100644 --- a/src/soundio/soundmanagerconfig.h +++ b/src/soundio/soundmanagerconfig.h @@ -1,20 +1,4 @@ -/** - * @file soundmanagerconfig.h - * @author Bill Good <bkgood at gmail dot com> - * @date 20100709 - */ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - -#ifndef SOUNDMANAGERCONFIG_H -#define SOUNDMANAGERCONFIG_H +#pragma once #ifndef SOUNDMANAGERCONFIG_FILENAME #define SOUNDMANAGERCONFIG_FILENAME "soundconfig.xml" @@ -103,4 +87,3 @@ private: bool m_bExternalRecordBroadcastConnected; SoundManager* m_pSoundManager; }; -#endif diff --git a/src/soundio/soundmanagerutil.cpp b/src/soundio/soundmanagerutil.cpp index 1381313c58..f64cfd8b53 100644 --- a/src/soundio/soundmanagerutil.cpp +++ b/src/soundio/soundmanagerutil.cpp @@ -1,18 +1,3 @@ -/** - * @file soundmanagerutil.cpp - * @author Bill Good <bkgood at gmail dot com> - * @date 20100611 - */ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - #include "soundio/soundmanagerutil.h" #include "engine/channels/enginechannel.h" |