Commit 5a645776 authored by Jonas Stienen's avatar Jonas Stienen
Browse files

Merge branch 'develop' of https://git.rwth-aachen.de/ita/VACore into develop

parents dc881767 5e6f1388
......@@ -223,6 +223,16 @@ add_definitions( "-DVACORE_DEFAULT_CONFIGFILE=\"${ITA_VACORE_DEFAULT_CONFIG_FILE
add_definitions( "-DVACORE_MAX_NUM_SOURCES=${ITA_VACORE_MAX_NUM_SOURCES}" )
add_definitions( "-DVACORE_MAX_NUM_LISTENERS=${ITA_VACORE_MAX_NUM_LISTENERS}" )
if( ITA_VACORE_WITH_AUDIO_BACKEND_ASIO )
add_definitions( -DVACORE_WITH_AUDIO_BACKEND_ASIO )
endif( )
if( ITA_VACORE_WITH_AUDIO_BACKEND_PORTAUDIO )
#add_definitions( -DVACORE_WITH_AUDIO_BACKEND_PORTAUDIO )
endif( )
if( ITA_VACORE_WITH_AUDIO_BACKEND_DUMMY )
add_definitions( -DVACORE_WITH_AUDIO_BACKEND_DUMMY )
endif( )
# Rendering definitions
if( ${ITA_VACORE_WITH_RENDERER_AMBIENT_MIXER} )
add_definitions( "-DVACORE_WITH_RENDERER_AMBIENT_MIXER=1" )
......
......@@ -3,7 +3,9 @@
#include <ITAException.h>
#include <ITAStringUtils.h>
#ifdef VACORE_WITH_AUDIO_BACKEND_ASIO
#include "VAASIOBackend.h"
#endif
//// Singleton mittels statischer Instanz
//static CVAAudioDriverArchBackendRegistry theRegistry;
......
......@@ -2,6 +2,7 @@
#define __VA_AUDIODRIVERCONFIG_H__
// Includes
#include <VACoreDefinitions.h>
#include <VAStruct.h>
#include <string>
......@@ -11,7 +12,7 @@
* Dies schliet ein: Die Treiber-Architektur, das Audio-Gert, usw.
*/
class CVAAudioDriverConfig
class VACORE_API CVAAudioDriverConfig
{
public:
static const int AUTO = -1; // Literal fr automatische Werte
......
......@@ -26,8 +26,6 @@
#include "Audiosignals/VAMachineSignalSource.h"
#include "Audiosignals/VASequencerSignalSource.h"
#include "Data/VAHRIRManager.h"
#include "Drivers/Audio/VAASIOBackend.h"
#include "Drivers/Audio/VAPortaudioBackend.h"
#include "Rendering/VAAudioRenderer.h"
#include "Rendering/VAAudioRendererRegistry.h"
#include "Reproduction/VAAudioReproductionModule.h"
......@@ -46,6 +44,16 @@
#include "VACoreThread.h"
#include "VASourceListenerMetrics.h"
#include "Drivers/Audio/VAAudioDriverBackend.h"
#include "Drivers/Audio/VAAudioDriverConfig.h"
#ifdef VACORE_WITH_AUDIO_BACKEND_ASIO
#include "Drivers/Audio/VAASIOBackend.h"
#endif
#ifdef VACORE_WITH_AUDIO_BACKEND_PORTAUDIO
#include "Drivers/Audio/VAPortaudioBackend.h"
#endif
// ITA includes
#include <ITAASCIITable.h>
#include <ITAClock.h>
......@@ -3960,11 +3968,20 @@ void CVACoreImpl::PrintSceneState() {
void CVACoreImpl::InitializeAudioDriver()
{
#ifdef VACORE_WITH_AUDIO_BACKEND_ASIO
if( m_oCoreConfig.oAudioDriverConfig.sDriver == "ASIO" )
m_pAudioDriverBackend = new CVAASIOBackend( &m_oCoreConfig.oAudioDriverConfig );
else if( m_oCoreConfig.oAudioDriverConfig.sDriver == "Portaudio" )
#endif
#ifdef VACORE_WITH_AUDIO_BACKEND_PORTAUDIO
if( m_oCoreConfig.oAudioDriverConfig.sDriver == "Portaudio" )
m_pAudioDriverBackend = new CVAPortaudioBackend( &m_oCoreConfig.oAudioDriverConfig );
else
#endif
#ifdef VACORE_WITH_AUDIO_BACKEND_DUMMY
if( m_oCoreConfig.oAudioDriverConfig.sDriver == "Dummy" )
m_pAudioDriverBackend = new CVADummyBackend( &m_oCoreConfig.oAudioDriverConfig );
#endif
if( m_pAudioDriverBackend == nullptr )
VA_ERROR( "Core", "Unkown audio driver backend '" << m_oCoreConfig.oAudioDriverConfig.sDriver << "'" );
try
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment