Commit afbcde93 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Progress on linux compat

parent 2b88a692
......@@ -188,6 +188,9 @@ else( NOT ITA_VA_BUILD_STATIC )
endif( BUILD_SHARED_LIBS )
endif( NOT ITA_VA_BUILD_STATIC )
if( NOT WIN32 )
add_definitions( -std=gnu++11 )
endif( )
add_definitions( "-DVACORE_DEFAULT_LOG_LEVEL=${ITA_VACORE_DEFAULT_DEBUG_LEVEL}" )
add_definitions( "-DVACORE_VERSION_MAJOR=\"${ITA_VACORE_VERSION_MAJOR}\"" )
......
#ifndef __VA_AUDIOSIGNALSOURCEMANAGER_H__
#define __VA_AUDIOSIGNALSOURCEMANAGER_H__
#include <map>
#include <string>
#include <vector>
#include <ITAAtomicPrimitives.h>
#include "../Drivers/Audio/VAAudioDriverConfig.h"
#include <VACoreDefinitions.h>
#include <VAAudioSignalSource.h>
#include <ITACriticalSection.h>
#include <ITASampleBuffer.h>
#include <tbb/concurrent_queue.h>
#include <ITAAtomicPrimitives.h>
#include <VistaInterProcComm/Concurrency/VistaThreadEvent.h>
#include <VAAudiosignalSource.h>
#include "../Drivers/Audio/VAAudioDriverConfig.h"
#include <VACoreDefinitions.h>
#include <tbb/concurrent_queue.h>
#include <map>
#include <string>
#include <vector>
#include <set>
class ITADatasource;
class IVACore;
class CVAAudiofileSignalSource;
......
......@@ -4,7 +4,7 @@
#include <VAAudioSignalSource.h>
#include <ITAAtomicPrimitives.h>
#include <ITADatasourceDelegator.h>
#include <ITADataSourceDelegator.h>
#include <ITASampleBuffer.h>
#include <ITASampleFrame.h>
......
......@@ -4,7 +4,7 @@
#include <VAAudioSignalSource.h>
#include <VAObject.h>
#include <ITADatasourceRealization.h>
#include <ITADataSourceRealization.h>
#include <ITASampleBuffer.h>
#include <ITAAtomicPrimitives.h>
......
......@@ -4,7 +4,7 @@
#include <VAAudioSignalSource.h>
#include <VAObject.h>
#include <ITADatasourceRealization.h>
#include <ITADataSourceRealization.h>
#include <ITASampleBuffer.h>
#include <ITAAtomicPrimitives.h>
......
......@@ -24,13 +24,15 @@
#define __VA_AUDIOSTREAMTRACKER_H__
#include <VABaseDefinitions.h>
#include "Audiosignals/VAAudioSignalSourceManager.h"
#include "Utils/VADebug.h"
#include <ITAClock.h>
#include <ITADatasource.h>
#include <ITAStopwatch.h>
#include <ITADataSource.h>
#include <ITAStopWatch.h>
#include <ITAStreamInfo.h>
#include <string>
//! Audio stream state implementation
......
......@@ -16,6 +16,7 @@
#include <VABaseDefinitions.h>
#include <VAStruct.h>
#include <VACoreVersion.h>
#include <VAException.h>
// VA includes
#include "Audiosignals/VAAudioSignalSourceManager.h"
......@@ -39,7 +40,6 @@
#include "VAAudiostreamTracker.h"
#include "VABaseDefinitions.h"
#include "VADirectivityManager.h"
#include <VAException.h>
#include "VALog.h"
#include "VACoreEventManager.h"
#include "VACoreFactory.h"
......@@ -50,14 +50,14 @@
#include <ITAASCIITable.h>
#include <ITAClock.h>
#include <ITAException.h>
#include <ITAFilesystemUtils.h>
#include <ITAFileSystemUtils.h>
#include <ITAFunctors.h>
#include <ITAPeakDetector.h>
#include <ITASoundSample.h>
#include <ITASoundSampler.h>
#include <ITASoundSamplePool.h>
#include <ITAStreamAmplifier.h>
#include <ITAStreamPatchbay.h>
#include <ITAStreamPatchBay.h>
#include <ITAStreamProbe.h>
#include <ITAStringUtils.h>
#include <ITATimer.h>
......
......@@ -18,6 +18,7 @@
#include <iostream>
#include <list>
#include <stdarg.h>
#include <stdio.h>
extern VACORE_API std::ostream* VA_STDOUT;
extern VACORE_API std::ostream* VA_STDERR;
......@@ -129,7 +130,7 @@ public:
char buf[ 16384 ];
va_list args;
va_start( args, format );
vsprintf_s( buf, format, args );
vsprintf( buf, format, args );
va_end( args );
m_qLog.push( CVALogItem( m_pClock->getTime(), m_sName, buf ) );
......
Markdown is supported
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