From 4fb31ad4792f90092f3b1f29f3f4fa9f2a9bd010 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Fri, 13 Sep 2019 12:29:46 -0700 Subject: [PATCH] rebuilding the lost file :(. also undoing the postbuild script changes that were part on my last test --- .../audio-client/src/HifiAudioDeviceInfo.h | 47 +++++++++++++++++++ .../audio-client/src/HifiAudioDeviceinfo.cpp | 16 +++++++ tools/ci-scripts/postbuild.py | 3 +- 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 libraries/audio-client/src/HifiAudioDeviceInfo.h create mode 100644 libraries/audio-client/src/HifiAudioDeviceinfo.cpp diff --git a/libraries/audio-client/src/HifiAudioDeviceInfo.h b/libraries/audio-client/src/HifiAudioDeviceInfo.h new file mode 100644 index 0000000000..5155807b51 --- /dev/null +++ b/libraries/audio-client/src/HifiAudioDeviceInfo.h @@ -0,0 +1,47 @@ +#ifndef hifi_audiodeviceinfo_h +#define hifi_audiodeviceinfo_h + +#include +#include +#include +#include + +class HifiAudioDeviceInfo : public QObject { + QObject + +public: + HifiAudioDeviceInfo() {} + HifiAudioDeviceInfo(const HifiAudioDeviceInfo &deviceInfo){ + _audioDeviceInfo = deviceInfo.getDevice(); + _mode = deviceInfo.getMode(); + _deviceName = deviceInfo.deviceName(); + _isDefault = deviceInfo.isDefault(); + } + + HifiAudioDeviceInfo(QAudioDeviceInfo deviceInfo, bool isDefault, QAudio::Mode mode) : + _audioDeviceInfo(deviceInfo), + _isDefault(isDefault), + _mode(mode) { + setDeviceName(); + } + + void setMode(QAudio::Mode mode); + void setIsDefault(bool isDefault = false); + void setDeviceName(QString name); + + QAudioDeviceInfo getDevice() const { return _audioDeviceInfo; } + QString deviceName() const { return _deviceName; } + bool isDefault() const { return isDefault; } + QAudio::Mode getMode() const { return _mode; } + +private: + void setDeviceName(); + +private: + QAudioDeviceInfo _audioDeviceInfo; + QString _deviceName; + bool _isDefault; + QAudio::Mode _mode; +}; + +#endif \ No newline at end of file diff --git a/libraries/audio-client/src/HifiAudioDeviceinfo.cpp b/libraries/audio-client/src/HifiAudioDeviceinfo.cpp new file mode 100644 index 0000000000..066e8e6962 --- /dev/null +++ b/libraries/audio-client/src/HifiAudioDeviceinfo.cpp @@ -0,0 +1,16 @@ +#include "HifiAudioDeviceInfo.h" + +void HifiAudioDeviceInfo::setMode(QAudio::Mode mode) { +} + +void HifiAudioDeviceInfo::setIsDefault(bool isDefault) { +} + +void HifiAudioDeviceInfo::setDeviceName(QString name) { + +} + + void HifiAudioDeviceInfo::setDeviceName() { + + + } \ No newline at end of file diff --git a/tools/ci-scripts/postbuild.py b/tools/ci-scripts/postbuild.py index 8e165f05b7..b93ed5a664 100644 --- a/tools/ci-scripts/postbuild.py +++ b/tools/ci-scripts/postbuild.py @@ -220,8 +220,7 @@ cpackCommand = [ 'cpack', '-G', 'ZIP', '-D', "CPACK_PACKAGE_FILE_NAME={}".format(archiveName), - '-D', "CPACK_INCLUDE_TOPLEVEL_DIRECTORY=OFF", - '-D', "CPACK_RPM_COMPRESSION_TYPE=lzma" + '-D', "CPACK_INCLUDE_TOPLEVEL_DIRECTORY=OFF" ] print("Create ZIP version of installer archive")