mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-12 07:15:34 +08:00
refactor: clang-format
This commit is contained in:
@@ -2,14 +2,15 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "misc/audio/audiodeviceinfo.h"
|
||||
#include "misc/stringutils.h"
|
||||
#include "misc/comparefunctions.h"
|
||||
#include "misc/verify.h"
|
||||
|
||||
#include <QHostInfo>
|
||||
#include <QtGlobal>
|
||||
#include <QAudioDevice>
|
||||
#include <QHostInfo>
|
||||
#include <QMediaDevices>
|
||||
#include <QtGlobal>
|
||||
|
||||
#include "misc/comparefunctions.h"
|
||||
#include "misc/stringutils.h"
|
||||
#include "misc/verify.h"
|
||||
|
||||
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
|
||||
|
||||
@@ -124,4 +125,4 @@ namespace swift::misc::audio
|
||||
return m_deviceName % u" [" % this->getMachineName() % u']';
|
||||
}
|
||||
|
||||
} // ns
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
#ifndef SWIFT_MISC_AUDIO_AUDIODEVICE_H
|
||||
#define SWIFT_MISC_AUDIO_AUDIODEVICE_H
|
||||
|
||||
#include "misc/identifier.h"
|
||||
#include "misc/metaclass.h"
|
||||
#include "misc/valueobject.h"
|
||||
#include "misc/swiftmiscexport.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
#include "misc/identifier.h"
|
||||
#include "misc/metaclass.h"
|
||||
#include "misc/swiftmiscexport.h"
|
||||
#include "misc/valueobject.h"
|
||||
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
|
||||
|
||||
namespace swift::misc::audio
|
||||
@@ -114,7 +114,7 @@ namespace swift::misc::audio
|
||||
SWIFT_METAMEMBER(deviceName),
|
||||
SWIFT_METAMEMBER(identifier));
|
||||
};
|
||||
} // namespace
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CAudioDeviceInfo)
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CAudioDeviceInfo::DeviceType)
|
||||
|
||||
@@ -2,12 +2,14 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "misc/audio/audiodeviceinfolist.h"
|
||||
#include "misc/stringutils.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QMediaDevices>
|
||||
#include <algorithm>
|
||||
|
||||
#include <QMediaDevices>
|
||||
#include <QString>
|
||||
|
||||
#include "misc/stringutils.h"
|
||||
|
||||
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
|
||||
|
||||
namespace swift::misc::audio
|
||||
@@ -224,4 +226,4 @@ namespace swift::misc::audio
|
||||
return CAudioDeviceInfo(CAudioDeviceInfo::OutputDevice, defaultQtOutputDevice().description());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
#ifndef SWIFT_MISC_AUDIO_AUDIODEVICELIST_H
|
||||
#define SWIFT_MISC_AUDIO_AUDIODEVICELIST_H
|
||||
|
||||
#include <QAudioDevice>
|
||||
#include <QMetaType>
|
||||
#include <QStringList>
|
||||
|
||||
#include "misc/audio/audiodeviceinfo.h"
|
||||
#include "misc/identifier.h"
|
||||
#include "misc/collection.h"
|
||||
#include "misc/identifier.h"
|
||||
#include "misc/sequence.h"
|
||||
#include "misc/swiftmiscexport.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QAudioDevice>
|
||||
#include <QStringList>
|
||||
|
||||
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
|
||||
|
||||
namespace swift::misc::audio
|
||||
@@ -96,7 +96,7 @@ namespace swift::misc::audio
|
||||
static CAudioDeviceInfo defaultOutputDevice();
|
||||
//! @}
|
||||
};
|
||||
} // namespace
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CAudioDeviceInfoList)
|
||||
Q_DECLARE_METATYPE(swift::misc::CCollection<swift::misc::audio::CAudioDeviceInfo>)
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "misc/audio/audiosettings.h"
|
||||
#include "misc/swiftdirectories.h"
|
||||
#include "misc/fileutils.h"
|
||||
#include <QtGlobal>
|
||||
|
||||
#include <QDir>
|
||||
#include <QtGlobal>
|
||||
|
||||
#include "misc/fileutils.h"
|
||||
#include "misc/swiftdirectories.h"
|
||||
|
||||
using namespace swift::misc::audio;
|
||||
|
||||
@@ -104,4 +106,4 @@ namespace swift::misc::audio
|
||||
return u"Notification flags: " % CNotificationSounds::toString(this->getNotification()) %
|
||||
u" volume: " % QString::number(m_notificationVolume);
|
||||
}
|
||||
} // namespace
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
#ifndef SWIFT_MISC_AUDIO_SETTINGS_H
|
||||
#define SWIFT_MISC_AUDIO_SETTINGS_H
|
||||
|
||||
#include "misc/audio/notificationsounds.h"
|
||||
#include "misc/settingscache.h"
|
||||
#include "misc/swiftmiscexport.h"
|
||||
#include "misc/metaclass.h"
|
||||
#include "misc/statusmessage.h"
|
||||
#include "misc/valueobject.h"
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
#include "misc/audio/notificationsounds.h"
|
||||
#include "misc/metaclass.h"
|
||||
#include "misc/settingscache.h"
|
||||
#include "misc/statusmessage.h"
|
||||
#include "misc/swiftmiscexport.h"
|
||||
#include "misc/valueobject.h"
|
||||
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
|
||||
|
||||
namespace swift::misc::audio
|
||||
@@ -160,7 +160,7 @@ namespace swift::misc::audio
|
||||
return true;
|
||||
}
|
||||
};
|
||||
} // namespace
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CSettings)
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "config/buildconfig.h"
|
||||
#include "misc/audio/audioutils.h"
|
||||
|
||||
#include <QProcess>
|
||||
#include <QMediaDevices>
|
||||
#include <QProcess>
|
||||
|
||||
#include "config/buildconfig.h"
|
||||
|
||||
using namespace swift::config;
|
||||
|
||||
@@ -28,4 +29,4 @@ namespace swift::misc::audio
|
||||
QMediaDevices::audioOutputs();
|
||||
}
|
||||
|
||||
} // ns
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
@@ -16,6 +16,6 @@ namespace swift::misc::audio
|
||||
//! On windows init the audio devices
|
||||
//! \remarks workaround for WASAPI driver crashes, hoping that upfront init already sets global vars. etc.
|
||||
SWIFT_MISC_EXPORT void initWindowsAudioDevices();
|
||||
}
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
#endif // guard
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "misc/audio/notificationsounds.h"
|
||||
#include <QStringList>
|
||||
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
namespace swift::misc::audio
|
||||
{
|
||||
@@ -63,4 +64,4 @@ namespace swift::misc::audio
|
||||
if (notification.testFlag(AFVBlocked)) n << flagToString(AFVBlocked);
|
||||
return n.join(", ");
|
||||
}
|
||||
} // ns
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
@@ -6,9 +6,10 @@
|
||||
#ifndef SWIFT_MISC_NOTIFICATIONSOUNDS_H
|
||||
#define SWIFT_MISC_NOTIFICATIONSOUNDS_H
|
||||
|
||||
#include "misc/swiftmiscexport.h"
|
||||
#include <QMetaType>
|
||||
|
||||
#include "misc/swiftmiscexport.h"
|
||||
|
||||
namespace swift::misc::audio
|
||||
{
|
||||
/*!
|
||||
@@ -70,7 +71,7 @@ namespace swift::misc::audio
|
||||
//! As string
|
||||
static QString toString(Notification notification);
|
||||
};
|
||||
} // ns
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CNotificationSounds::Notification)
|
||||
Q_DECLARE_METATYPE(swift::misc::audio::CNotificationSounds::NotificationFlag)
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#include "misc/audio/registermetadataaudio.h"
|
||||
|
||||
// Audio headers
|
||||
#include <QDBusMetaType>
|
||||
|
||||
#include "misc/audio/audiodeviceinfo.h"
|
||||
#include "misc/audio/audiodeviceinfolist.h"
|
||||
#include "misc/audio/audiosettings.h"
|
||||
|
||||
#include <QDBusMetaType>
|
||||
|
||||
namespace swift::misc::audio
|
||||
{
|
||||
//! Register metadata for audio / voice
|
||||
@@ -23,6 +23,6 @@ namespace swift::misc::audio
|
||||
qDBusRegisterMetaType<CNotificationSounds::NotificationFlag>();
|
||||
qDBusRegisterMetaType<CAudioDeviceInfo::DeviceType>();
|
||||
}
|
||||
}
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
// ns
|
||||
|
||||
@@ -12,6 +12,6 @@ namespace swift::misc::audio
|
||||
{
|
||||
//! Register metadata for audio / voice
|
||||
SWIFT_MISC_EXPORT void registerMetadata();
|
||||
} // ns
|
||||
} // namespace swift::misc::audio
|
||||
|
||||
#endif // SWIFT_MISC_AUDIO_REGISTERMETADATAAUDIO_H
|
||||
|
||||
Reference in New Issue
Block a user