From a90f0762d954fb9800d6cc82770ebf46f5991c5c Mon Sep 17 00:00:00 2001 From: sudden6 Date: Wed, 29 Apr 2020 20:06:41 +0200 Subject: [PATCH] refactor(cmake): change folder structure The new folder structure will be like this: //CMakeLists.txt //src/file.cpp //include//file.h ///<...> --- CMakeLists.txt | 19 +++----- audio/CMakeLists.txt | 45 ++++++++++++++++++ {src => audio/include}/audio/audio.h | 0 {src => audio/include}/audio/iaudiocontrol.h | 0 {src => audio/include}/audio/iaudiosettings.h | 2 +- {src => audio/include}/audio/iaudiosink.h | 2 +- {src => audio/include}/audio/iaudiosource.h | 0 audio/{ => resources}/ToxEndCall.s16le.pcm | Bin .../{ => resources}/ToxIncomingCall.s16le.pcm | Bin .../{ => resources}/ToxOutgoingCall.s16le.pcm | Bin audio/{ => resources}/format.md | 0 audio/{ => resources}/notification.s16le.pcm | Bin audio/resources/res.qrc | 8 ++++ {src/audio => audio/src}/audio.cpp | 8 ++-- {src/audio => audio/src}/backend/alsink.cpp | 4 +- {src/audio => audio/src}/backend/alsink.h | 4 +- {src/audio => audio/src}/backend/alsource.cpp | 4 +- {src/audio => audio/src}/backend/alsource.h | 2 +- {src/audio => audio/src}/backend/openal.cpp | 22 +++++---- {src/audio => audio/src}/backend/openal.h | 11 +++-- res.qrc | 4 -- src/core/core.cpp | 2 +- src/core/core.h | 2 +- src/core/icoresettings.h | 2 +- src/core/receiptnum.h | 2 +- src/core/toxcall.cpp | 2 +- src/core/toxcall.h | 6 +-- src/main.cpp | 2 +- src/model/about/aboutfriend.h | 2 +- src/model/about/iaboutfriend.h | 2 +- src/model/ichatlog.h | 2 +- src/model/profile/iprofileinfo.h | 2 +- src/model/profile/profileinfo.h | 2 +- src/nexus.cpp | 2 +- src/nexus.h | 2 +- src/persistence/db/rawdatabase.h | 2 +- src/persistence/ifriendsettings.h | 2 +- src/persistence/settings.h | 2 +- src/video/ivideosettings.h | 2 +- src/widget/form/settings/avform.cpp | 6 +-- src/widget/form/settingswidget.cpp | 2 +- src/widget/widget.cpp | 2 +- src/widget/widget.h | 4 +- util/CMakeLists.txt | 25 ++++++++++ {src/model => util/include/util}/interface.h | 0 {src => util/include}/util/strongtype.h | 0 46 files changed, 143 insertions(+), 71 deletions(-) create mode 100644 audio/CMakeLists.txt rename {src => audio/include}/audio/audio.h (100%) rename {src => audio/include}/audio/iaudiocontrol.h (100%) rename {src => audio/include}/audio/iaudiosettings.h (98%) rename {src => audio/include}/audio/iaudiosink.h (99%) rename {src => audio/include}/audio/iaudiosource.h (100%) rename audio/{ => resources}/ToxEndCall.s16le.pcm (100%) rename audio/{ => resources}/ToxIncomingCall.s16le.pcm (100%) rename audio/{ => resources}/ToxOutgoingCall.s16le.pcm (100%) rename audio/{ => resources}/format.md (100%) rename audio/{ => resources}/notification.s16le.pcm (100%) create mode 100644 audio/resources/res.qrc rename {src/audio => audio/src}/audio.cpp (86%) rename {src/audio => audio/src}/backend/alsink.cpp (97%) rename {src/audio => audio/src}/backend/alsink.h (96%) rename {src/audio => audio/src}/backend/alsource.cpp (95%) rename {src/audio => audio/src}/backend/alsource.h (97%) rename {src/audio => audio/src}/backend/openal.cpp (97%) rename {src/audio => audio/src}/backend/openal.h (96%) create mode 100644 util/CMakeLists.txt rename {src/model => util/include/util}/interface.h (100%) rename {src => util/include}/util/strongtype.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c4aad3e7..734df683e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,18 +257,6 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) set(${PROJECT_NAME}_SOURCES - src/audio/audio.cpp - src/audio/audio.h - src/audio/backend/alsink.cpp - src/audio/backend/alsink.h - src/audio/backend/alsource.cpp - src/audio/backend/alsource.h - src/audio/backend/openal.cpp - src/audio/backend/openal.h - src/audio/iaudiosettings.h - src/audio/iaudiocontrol.h - src/audio/iaudiosink.h - src/audio/iaudiosource.h src/chatlog/chatlinecontent.cpp src/chatlog/chatlinecontent.h src/chatlog/chatlinecontentproxy.cpp @@ -368,7 +356,6 @@ set(${PROJECT_NAME}_SOURCES src/model/group.h src/model/status.cpp src/model/status.h - src/model/interface.h src/model/profile/iprofileinfo.h src/model/profile/profileinfo.cpp src/model/profile/profileinfo.h @@ -659,6 +646,9 @@ MESSAGE( STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS} ) # the compiler flags for compiling C++ sources MESSAGE( STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} ) +add_subdirectory(util) +add_subdirectory(audio) + add_library(${PROJECT_NAME}_static STATIC ${${PROJECT_NAME}_FORMS} @@ -669,6 +659,9 @@ target_link_libraries(${PROJECT_NAME}_static ${CMAKE_REQUIRED_LIBRARIES} ${ALL_LIBRARIES}) +target_link_libraries(${PROJECT_NAME}_static util_library) +target_link_libraries(${PROJECT_NAME}_static audio_library) + add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE diff --git a/audio/CMakeLists.txt b/audio/CMakeLists.txt new file mode 100644 index 000000000..5a4b07e76 --- /dev/null +++ b/audio/CMakeLists.txt @@ -0,0 +1,45 @@ +# Copyright © 2020 by The qTox Project Contributors +# +# This file is part of qTox, a Qt-based graphical interface for Tox. +# qTox is libre 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 3 of the License, or +# (at your option) any later version. +# +# qTox 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 qTox. If not, see + +set(SOURCE_FILES + "include/audio/audio.h" + "include/audio/iaudiocontrol.h" + "include/audio/iaudiosettings.h" + "include/audio/iaudiosink.h" + "include/audio/iaudiosource.h" + "src/audio.cpp" + "src/backend/alsink.cpp" + "src/backend/alsink.h" + "src/backend/alsource.cpp" + "src/backend/alsource.h" + "src/backend/openal.cpp" + "src/backend/openal.h") + +add_library(audio_library STATIC ${SOURCE_FILES}) + +qt5_add_resources( + audio_library + res.qrc + OPTIONS ${RCC_OPTIONS} +) + +# We need this directory, and users of our library will need it too +target_include_directories(audio_library PUBLIC include/) + +target_link_libraries(audio_library util_library) +target_link_libraries(audio_library Qt5::Core) +target_link_libraries(audio_library ${OPENAL_LIBRARIES}) + diff --git a/src/audio/audio.h b/audio/include/audio/audio.h similarity index 100% rename from src/audio/audio.h rename to audio/include/audio/audio.h diff --git a/src/audio/iaudiocontrol.h b/audio/include/audio/iaudiocontrol.h similarity index 100% rename from src/audio/iaudiocontrol.h rename to audio/include/audio/iaudiocontrol.h diff --git a/src/audio/iaudiosettings.h b/audio/include/audio/iaudiosettings.h similarity index 98% rename from src/audio/iaudiosettings.h rename to audio/include/audio/iaudiosettings.h index dc8862e60..84f70a74a 100644 --- a/src/audio/iaudiosettings.h +++ b/audio/include/audio/iaudiosettings.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include diff --git a/src/audio/iaudiosink.h b/audio/include/audio/iaudiosink.h similarity index 99% rename from src/audio/iaudiosink.h rename to audio/include/audio/iaudiosink.h index 62f9c06fb..1024e1d35 100644 --- a/src/audio/iaudiosink.h +++ b/audio/include/audio/iaudiosink.h @@ -23,7 +23,7 @@ #include -#include "src/model/interface.h" +#include "util/interface.h" /** * @brief The IAudioSink class represents an interface to devices that can play audio. diff --git a/src/audio/iaudiosource.h b/audio/include/audio/iaudiosource.h similarity index 100% rename from src/audio/iaudiosource.h rename to audio/include/audio/iaudiosource.h diff --git a/audio/ToxEndCall.s16le.pcm b/audio/resources/ToxEndCall.s16le.pcm similarity index 100% rename from audio/ToxEndCall.s16le.pcm rename to audio/resources/ToxEndCall.s16le.pcm diff --git a/audio/ToxIncomingCall.s16le.pcm b/audio/resources/ToxIncomingCall.s16le.pcm similarity index 100% rename from audio/ToxIncomingCall.s16le.pcm rename to audio/resources/ToxIncomingCall.s16le.pcm diff --git a/audio/ToxOutgoingCall.s16le.pcm b/audio/resources/ToxOutgoingCall.s16le.pcm similarity index 100% rename from audio/ToxOutgoingCall.s16le.pcm rename to audio/resources/ToxOutgoingCall.s16le.pcm diff --git a/audio/format.md b/audio/resources/format.md similarity index 100% rename from audio/format.md rename to audio/resources/format.md diff --git a/audio/notification.s16le.pcm b/audio/resources/notification.s16le.pcm similarity index 100% rename from audio/notification.s16le.pcm rename to audio/resources/notification.s16le.pcm diff --git a/audio/resources/res.qrc b/audio/resources/res.qrc new file mode 100644 index 000000000..5b1ce8f48 --- /dev/null +++ b/audio/resources/res.qrc @@ -0,0 +1,8 @@ + + + notification.s16le.pcm + ToxIncomingCall.s16le.pcm + ToxOutgoingCall.s16le.pcm + ToxEndCall.s16le.pcm + + diff --git a/src/audio/audio.cpp b/audio/src/audio.cpp similarity index 86% rename from src/audio/audio.cpp rename to audio/src/audio.cpp index 7b69ed614..6122382d0 100644 --- a/src/audio/audio.cpp +++ b/audio/src/audio.cpp @@ -19,9 +19,9 @@ #include -#include "src/audio/audio.h" -#include "src/audio/iaudiosettings.h" -#include "src/audio/backend/openal.h" +#include "audio/audio.h" +#include "audio/iaudiosettings.h" +#include "backend/openal.h" /** * @brief Select the audio backend @@ -30,5 +30,5 @@ */ std::unique_ptr Audio::makeAudio(IAudioSettings& settings) { - return std::unique_ptr(new OpenAL()); + return std::unique_ptr(new OpenAL(settings)); } diff --git a/src/audio/backend/alsink.cpp b/audio/src/backend/alsink.cpp similarity index 97% rename from src/audio/backend/alsink.cpp rename to audio/src/backend/alsink.cpp index 3114443e8..040c1c616 100644 --- a/src/audio/backend/alsink.cpp +++ b/audio/src/backend/alsink.cpp @@ -17,8 +17,8 @@ along with qTox. If not, see . */ -#include "src/audio/backend/alsink.h" -#include "src/audio/backend/openal.h" +#include "audio/src/backend/alsink.h" +#include "audio/src/backend/openal.h" #include #include diff --git a/src/audio/backend/alsink.h b/audio/src/backend/alsink.h similarity index 96% rename from src/audio/backend/alsink.h rename to audio/src/backend/alsink.h index 1c9dfac71..1ded9e4b4 100644 --- a/src/audio/backend/alsink.h +++ b/audio/src/backend/alsink.h @@ -22,8 +22,8 @@ #include #include -#include "src/model/interface.h" -#include "src/audio/iaudiosink.h" +#include "util/interface.h" +#include "audio/iaudiosink.h" class OpenAL; class QMutex; diff --git a/src/audio/backend/alsource.cpp b/audio/src/backend/alsource.cpp similarity index 95% rename from src/audio/backend/alsource.cpp rename to audio/src/backend/alsource.cpp index c29c579ad..847da866c 100644 --- a/src/audio/backend/alsource.cpp +++ b/audio/src/backend/alsource.cpp @@ -17,8 +17,8 @@ along with qTox. If not, see . */ -#include "src/audio/backend/alsource.h" -#include "src/audio/backend/openal.h" +#include "audio/src/backend/alsource.h" +#include "audio/src/backend/openal.h" /** * @brief Emits audio frames captured by an input device or other audio source. diff --git a/src/audio/backend/alsource.h b/audio/src/backend/alsource.h similarity index 97% rename from src/audio/backend/alsource.h rename to audio/src/backend/alsource.h index 7ffe31b39..eb402324c 100644 --- a/src/audio/backend/alsource.h +++ b/audio/src/backend/alsource.h @@ -19,7 +19,7 @@ #pragma once -#include "src/audio/iaudiosource.h" +#include "audio/iaudiosource.h" #include #include diff --git a/src/audio/backend/openal.cpp b/audio/src/backend/openal.cpp similarity index 97% rename from src/audio/backend/openal.cpp rename to audio/src/backend/openal.cpp index 5d6c468a5..ad244ad11 100644 --- a/src/audio/backend/openal.cpp +++ b/audio/src/backend/openal.cpp @@ -18,7 +18,8 @@ */ #include "openal.h" -#include "src/persistence/settings.h" + +#include "audio/iaudiosettings.h" #include #include @@ -56,8 +57,9 @@ void applyGain(int16_t* buffer, uint32_t bufferSize, qreal gainFactor) static const unsigned int BUFFER_COUNT = 16; static const uint32_t AUDIO_CHANNELS = 2; -OpenAL::OpenAL() - : audioThread{new QThread} +OpenAL::OpenAL(IAudioSettings& _settings) + : settings{_settings} + , audioThread{new QThread} { // initialize OpenAL error stack alGetError(); @@ -370,7 +372,7 @@ void OpenAL::destroySource(AlSource& source) */ bool OpenAL::autoInitInput() { - return alInDev ? true : initInput(Settings::getInstance().getInDev()); + return alInDev ? true : initInput(settings.getInDev()); } /** @@ -380,7 +382,7 @@ bool OpenAL::autoInitInput() */ bool OpenAL::autoInitOutput() { - return alOutDev ? true : initOutput(Settings::getInstance().getOutDev()); + return alOutDev ? true : initOutput(settings.getOutDev()); } bool OpenAL::initInput(const QString& deviceName) @@ -390,7 +392,7 @@ bool OpenAL::initInput(const QString& deviceName) bool OpenAL::initInput(const QString& deviceName, uint32_t channels) { - if (!Settings::getInstance().getAudioInDevEnabled()) { + if (!settings.getAudioInDevEnabled()) { return false; } @@ -417,8 +419,8 @@ bool OpenAL::initInput(const QString& deviceName, uint32_t channels) } inputBuffer = new int16_t[AUDIO_FRAME_SAMPLE_COUNT_TOTAL]; - setInputGain(Settings::getInstance().getAudioInGainDecibel()); - setInputThreshold(Settings::getInstance().getAudioThreshold()); + setInputGain(settings.getAudioInGainDecibel()); + setInputThreshold(settings.getAudioThreshold()); qDebug() << "Opened audio input" << deviceName; alcCaptureStart(alInDev); @@ -435,7 +437,7 @@ bool OpenAL::initOutput(const QString& deviceName) assert(sinks.size() == 0); outputInitialized = false; - if (!Settings::getInstance().getAudioOutDevEnabled()) + if (!settings.getAudioOutDevEnabled()) return false; qDebug() << "Opening audio output" << deviceName; @@ -460,7 +462,7 @@ bool OpenAL::initOutput(const QString& deviceName) } // init master volume - alListenerf(AL_GAIN, Settings::getInstance().getOutVolume() * 0.01f); + alListenerf(AL_GAIN, settings.getOutVolume() * 0.01f); checkAlError(); outputInitialized = true; diff --git a/src/audio/backend/openal.h b/audio/src/backend/openal.h similarity index 96% rename from src/audio/backend/openal.h rename to audio/src/backend/openal.h index 2aaab2b0e..ce8cad1dd 100644 --- a/src/audio/backend/openal.h +++ b/audio/src/backend/openal.h @@ -20,9 +20,9 @@ #pragma once -#include "src/audio/iaudiocontrol.h" -#include "src/audio/backend/alsink.h" -#include "src/audio/backend/alsource.h" +#include "audio/iaudiocontrol.h" +#include "alsink.h" +#include "alsource.h" #include #include @@ -44,12 +44,14 @@ #include #endif +class IAudioSettings; + class OpenAL : public IAudioControl { Q_OBJECT public: - OpenAL(); + OpenAL(IAudioSettings& _settings); virtual ~OpenAL(); qreal maxOutputVolume() const @@ -131,6 +133,7 @@ private: float getVolume(); protected: + IAudioSettings& settings; QThread* audioThread; mutable QMutex audioLock{QMutex::Recursive}; QString inDev{}; diff --git a/res.qrc b/res.qrc index 0b7a562fb..9f1bcbd3b 100644 --- a/res.qrc +++ b/res.qrc @@ -6,10 +6,6 @@ res/font/DejaVuSans.ttf - audio/notification.s16le.pcm - audio/ToxIncomingCall.s16le.pcm - audio/ToxOutgoingCall.s16le.pcm - audio/ToxEndCall.s16le.pcm img/add.svg img/avatar_mask.svg img/contact.svg diff --git a/src/core/core.cpp b/src/core/core.cpp index f2bd9a4f1..c5e4d744d 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -31,7 +31,7 @@ #include "src/model/ibootstraplistgenerator.h" #include "src/nexus.h" #include "src/persistence/profile.h" -#include "src/util/strongtype.h" +#include "util/strongtype.h" #include #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) diff --git a/src/core/core.h b/src/core/core.h index 0db037e04..0f0015c11 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -30,7 +30,7 @@ #include "toxid.h" #include "toxpk.h" -#include "src/util/strongtype.h" +#include "util/strongtype.h" #include "src/model/status.h" #include diff --git a/src/core/icoresettings.h b/src/core/icoresettings.h index 43b6e0bb3..58dd36268 100644 --- a/src/core/icoresettings.h +++ b/src/core/icoresettings.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include #include diff --git a/src/core/receiptnum.h b/src/core/receiptnum.h index 5cca6af6a..9171c9fa6 100644 --- a/src/core/receiptnum.h +++ b/src/core/receiptnum.h @@ -19,7 +19,7 @@ #pragma once -#include "src/util/strongtype.h" +#include "util/strongtype.h" #include #include diff --git a/src/core/toxcall.cpp b/src/core/toxcall.cpp index cd6989b01..c1baa6f6f 100644 --- a/src/core/toxcall.cpp +++ b/src/core/toxcall.cpp @@ -18,7 +18,7 @@ */ #include "src/core/toxcall.h" -#include "src/audio/audio.h" +#include "audio/audio.h" #include "src/core/coreav.h" #include "src/persistence/settings.h" #include "src/video/camerasource.h" diff --git a/src/core/toxcall.h b/src/core/toxcall.h index aca35309f..4958b4c6c 100644 --- a/src/core/toxcall.h +++ b/src/core/toxcall.h @@ -19,9 +19,9 @@ #pragma once -#include "src/audio/iaudiocontrol.h" -#include "src/audio/iaudiosink.h" -#include "src/audio/iaudiosource.h" +#include "audio/iaudiocontrol.h" +#include "audio/iaudiosink.h" +#include "audio/iaudiosource.h" #include #include diff --git a/src/main.cpp b/src/main.cpp index 09eb3d5e0..e276573f3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ along with qTox. If not, see . */ -#include "src/audio/audio.h" +#include "audio/audio.h" #include "src/ipc.h" #include "src/net/toxuri.h" #include "src/nexus.h" diff --git a/src/model/about/aboutfriend.h b/src/model/about/aboutfriend.h index 56c328e19..643f6e5ec 100644 --- a/src/model/about/aboutfriend.h +++ b/src/model/about/aboutfriend.h @@ -20,7 +20,7 @@ #pragma once #include "iaboutfriend.h" -#include "src/model/interface.h" +#include "util/interface.h" #include "src/persistence/ifriendsettings.h" #include diff --git a/src/model/about/iaboutfriend.h b/src/model/about/iaboutfriend.h index 9f972bb3f..e2fe4efda 100644 --- a/src/model/about/iaboutfriend.h +++ b/src/model/about/iaboutfriend.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include "src/persistence/ifriendsettings.h" #include diff --git a/src/model/ichatlog.h b/src/model/ichatlog.h index 1b152c941..4729a5c2f 100644 --- a/src/model/ichatlog.h +++ b/src/model/ichatlog.h @@ -29,7 +29,7 @@ #include "src/model/friend.h" #include "src/model/group.h" #include "src/persistence/history.h" -#include "src/util/strongtype.h" +#include "util/strongtype.h" #include "src/widget/searchtypes.h" #include diff --git a/src/model/profile/iprofileinfo.h b/src/model/profile/iprofileinfo.h index 5db6f7262..d532bcd5c 100644 --- a/src/model/profile/iprofileinfo.h +++ b/src/model/profile/iprofileinfo.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include diff --git a/src/model/profile/profileinfo.h b/src/model/profile/profileinfo.h index 09ea61b8e..e7237cd5b 100644 --- a/src/model/profile/profileinfo.h +++ b/src/model/profile/profileinfo.h @@ -20,7 +20,7 @@ #pragma once #include -#include "src/model/interface.h" +#include "util/interface.h" #include "src/core/toxpk.h" #include "iprofileinfo.h" diff --git a/src/nexus.cpp b/src/nexus.cpp index dc1afdad3..5b6ba6943 100644 --- a/src/nexus.cpp +++ b/src/nexus.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include "audio/audio.h" #include #ifdef Q_OS_MAC diff --git a/src/nexus.h b/src/nexus.h index 505169a0f..77e19c8d4 100644 --- a/src/nexus.h +++ b/src/nexus.h @@ -22,7 +22,7 @@ #include -#include "src/audio/iaudiocontrol.h" +#include "audio/iaudiocontrol.h" class Widget; class Profile; diff --git a/src/persistence/db/rawdatabase.h b/src/persistence/db/rawdatabase.h index 1686aa841..83498a3c6 100644 --- a/src/persistence/db/rawdatabase.h +++ b/src/persistence/db/rawdatabase.h @@ -19,7 +19,7 @@ #pragma once -#include "src/util/strongtype.h" +#include "util/strongtype.h" #include #include diff --git a/src/persistence/ifriendsettings.h b/src/persistence/ifriendsettings.h index c2649dfbe..fa7190d71 100644 --- a/src/persistence/ifriendsettings.h +++ b/src/persistence/ifriendsettings.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include #include diff --git a/src/persistence/settings.h b/src/persistence/settings.h index dbc516ece..08f833304 100644 --- a/src/persistence/settings.h +++ b/src/persistence/settings.h @@ -20,7 +20,7 @@ #pragma once -#include "src/audio/iaudiosettings.h" +#include "audio/iaudiosettings.h" #include "src/core/icoresettings.h" #include "src/core/toxencrypt.h" #include "src/core/toxfile.h" diff --git a/src/video/ivideosettings.h b/src/video/ivideosettings.h index 9d948da2a..5c76d7a20 100644 --- a/src/video/ivideosettings.h +++ b/src/video/ivideosettings.h @@ -19,7 +19,7 @@ #pragma once -#include "src/model/interface.h" +#include "util/interface.h" #include #include diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp index a468b788e..e1e041124 100644 --- a/src/widget/form/settings/avform.cpp +++ b/src/widget/form/settings/avform.cpp @@ -27,9 +27,9 @@ #include #include -#include "src/audio/audio.h" -#include "src/audio/iaudiosettings.h" -#include "src/audio/iaudiosource.h" +#include "audio/audio.h" +#include "audio/iaudiosettings.h" +#include "audio/iaudiosource.h" #include "src/core/core.h" #include "src/core/coreav.h" #include "src/video/cameradevice.h" diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp index 9b08ee89b..c46e6d177 100644 --- a/src/widget/form/settingswidget.cpp +++ b/src/widget/form/settingswidget.cpp @@ -19,7 +19,7 @@ #include "settingswidget.h" -#include "src/audio/audio.h" +#include "audio/audio.h" #include "src/core/core.h" #include "src/core/coreav.h" #include "src/net/updatecheck.h" diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index eaa6bc4e1..9972ab833 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -38,6 +38,7 @@ #include #endif +#include "audio/audio.h" #include "circlewidget.h" #include "contentdialog.h" #include "contentlayout.h" @@ -47,7 +48,6 @@ #include "maskablepixmapwidget.h" #include "splitterrestorer.h" #include "form/groupchatform.h" -#include "src/audio/audio.h" #include "src/chatlog/content/filetransferwidget.h" #include "src/core/core.h" #include "src/core/coreav.h" diff --git a/src/widget/widget.h b/src/widget/widget.h index 2c8bb4ed9..34170a4ee 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -28,8 +28,8 @@ #include "genericchatitemwidget.h" -#include "src/audio/iaudiocontrol.h" -#include "src/audio/iaudiosink.h" +#include "audio/iaudiocontrol.h" +#include "audio/iaudiosink.h" #include "src/core/core.h" #include "src/core/groupid.h" #include "src/core/toxfile.h" diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt new file mode 100644 index 000000000..05570e774 --- /dev/null +++ b/util/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright © 2020 by The qTox Project Contributors +# +# This file is part of qTox, a Qt-based graphical interface for Tox. +# qTox is libre 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 3 of the License, or +# (at your option) any later version. +# +# qTox 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 qTox. If not, see + +set(HEADER_LIST + "include/util/interface.h" + "include/util/strongtype.h") + +add_library(util_library STATIC ${HEADER_LIST}) + +# We need this directory, and users of our library will need it too +target_include_directories(util_library PUBLIC include/) + diff --git a/src/model/interface.h b/util/include/util/interface.h similarity index 100% rename from src/model/interface.h rename to util/include/util/interface.h diff --git a/src/util/strongtype.h b/util/include/util/strongtype.h similarity index 100% rename from src/util/strongtype.h rename to util/include/util/strongtype.h