Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Audio Input Device Info
/* Audio Format
*
* From: https://github.com/PokemonAutomation/
*
Expand All @@ -8,7 +8,7 @@
#include "Common/Cpp/Exceptions.h"
#include "Common/Cpp/Containers/Pimpl.tpp"
#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
#include "AudioInfo.h"
#include "AudioFormat.h"

//#include <iostream>
//using std::cout;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* Audio Device Info
/* Audio Format
*
* From: https://github.com/PokemonAutomation/
*
*/

#ifndef PokemonAutomation_AudioPipeline_AudioInfo_H
#define PokemonAutomation_AudioPipeline_AudioInfo_H
#ifndef PokemonAutomation_AudioPipeline_AudioFormat_H
#define PokemonAutomation_AudioPipeline_AudioFormat_H

#include "Common/Cpp/Containers/Pimpl.h"
#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Common/Cpp/Containers/Pimpl.tpp"
#include "Common/Cpp/TestRunners/UnitTest.h"
#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"
#include "AudioInputChoice.h"
#include "AudioInfo_Tests.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <string>
#include <vector>
#include "AudioInfo.h"
#include "AudioFormat.h"

namespace PokemonAutomation{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef PokemonAutomation_AudioPipeline_AudioPassthroughPair_H
#define PokemonAutomation_AudioPipeline_AudioPassthroughPair_H

#include "AudioInfo.h"
#include "AudioFormat.h"
#include "AudioSourceDescriptor.h"

namespace PokemonAutomation{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef PokemonAutomation_AudioPipeline_AudioSource_H
#define PokemonAutomation_AudioPipeline_AudioSource_H

#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"

namespace PokemonAutomation{
namespace Kernels{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <string>
#include <vector>
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"
#include "CommonFramework/AudioPipeline/AudioInputChoice.h"

namespace PokemonAutomation{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <vector>
#include <QAudioFormat>
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"

namespace PokemonAutomation{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using NativeAudioSource = QAudioSource;
#include "Common/Cpp/LifetimeSanitizer.h"
#include "Common/Cpp/StreamConverters.h"
#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"

class QAudioFormat;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <QTimer>
#include "3rdParty/QtWavFile/WavFile.h"
#include "Common/Cpp/Exceptions.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"
#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
#include "AudioFileLoader.h"
#include "AudioInputFile.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <QAudioSink>
#include "Common/Cpp/LifetimeSanitizer.h"
#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"

namespace PokemonAutomation{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "Kernels/AudioPipeline/Kernels_ChannelMixer.h"
#include "Kernels/AudioResampler/Kernels_AudioResampler.h"
#include "CommonFramework/GlobalAutoPaths.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"
#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
#include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Common/Cpp/Containers/Pimpl.tpp" // Pimpl<QAudioFormat> (AudioFormat) instantiations
#include "Common/Cpp/Concurrency/SpinLock.h"
#include "CommonFramework/GlobalSettingsPanel.h"
#include "CommonFramework/AudioPipeline/AudioInfo.h"
#include "CommonFramework/AudioPipeline/AudioFormat.h"
#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
#include "CommonFramework/Recording/StreamHistoryOption.h"
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/cmake/SourceFiles.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ file(GLOB LIBRARY_SOURCES
../Common/SerialPABotBase/SerialPABotBase_Protocol.h
Source/CommonFramework/AudioPipeline/AudioConstants.h
Source/CommonFramework/AudioPipeline/AudioFeed.h
Source/CommonFramework/AudioPipeline/AudioInfo.cpp
Source/CommonFramework/AudioPipeline/AudioInfo.h
Source/CommonFramework/AudioPipeline/AudioFormat.cpp
Source/CommonFramework/AudioPipeline/AudioFormat.h
Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h
Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp
Expand Down
Loading