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

Renaming interface files, now 'core' refers to VACore only, and the classes in...

Renaming interface files, now 'core' refers to VACore only, and the classes in the 'base' project are for interfacing VA
parent 6b6eeeeb
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
/*!
@mainpage
@section intro_sec Introduction
The Virtual Acoustics project is free, open source real-time auralization framework. It is distributed under the terms of the Apache License Version 2.0.
The official website can be found at http://www.virtualacoustics.org
@section license_sec License
Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use the OpenDAFF software package except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
You should also have received a [copy of the License](LICENSE.md) with the VA software package.
@section getting_started Getting started
If you are a C++ developer and want to integrate VA into your application, the first contact point should be the VABase interface representad by the #IVAInterface class.
If you are planning to create a binding for any other programming and/or scripting language, also have a look at VANet and the #IVANetClient class.
*/
#ifndef IW_VA
#define IW_VA
#include "VAAudioSignalSource.h"
#include "VABase.h"
#include "VAEvent.h"
#include "VAEventHandlerGlobalLock.h"
#include "VAException.h"
#include "VAInterface.h"
#include "VAObject.h"
#include "VAObjectRegistry.h"
#include "VASamples.h"
#include "VAStruct.h"
#include "VAVersion.h"
#endif // IW_VA
......@@ -21,7 +21,7 @@
#include <string>
// Forward declarations
class IVACore;
class IVAInterface;
//! Interface class for audio signal sources
/**
......@@ -32,7 +32,7 @@ class IVACore;
*
* A data source is always monaural (single channel)
* and can only be connected to a single instance of a
* #IVACore during runtime.
* #IVAInterface during runtime.
*/
class IVAAudioSignalSource
{
......@@ -87,15 +87,15 @@ public:
//! Associated core getter
/**
* Returns the pointer to the associated core (#IVACore) that is
* Returns the pointer to the associated core (#IVAInterface) that is
* registered with the sound source. Will return NULL if the source
* has not been associated to a core yet.
* This method is used by the core to assuure that the sound source
* object has not been associated to another core (not allowed).
*
* @return Pointer to the associated #IVACore, NULL if non present
* @return Pointer to the associated #IVAInterface, NULL if non present
*/
virtual IVACore* GetAssociatedCore() const = 0;
virtual IVAInterface* GetAssociatedCore() const = 0;
//! Stream block getter
/**
......@@ -133,7 +133,7 @@ private:
*
* @sa CVAAudioSignalSourceManager
*/
virtual void HandleRegistration( IVACore* pParentCore ) = 0;
virtual void HandleRegistration( IVAInterface* pParentCore ) = 0;
//! Unregister sound source at a core instance
/**
......@@ -144,7 +144,7 @@ private:
*
* @sa CVAAudioSignalSourceManager
*/
virtual void HandleUnregistration( IVACore* pParentCore ) = 0;
virtual void HandleUnregistration( IVAInterface* pParentCore ) = 0;
friend class CVAAudioSignalSourceManager;
};
......
......@@ -11,8 +11,8 @@
* --------------------------------------------------------------------------------------------
*/
#ifndef IW_VABASE_CORE_EVENT
#define IW_VABASE_CORE_EVENT
#ifndef IW_VABASE_EVENT
#define IW_VABASE_EVENT
#include <VABaseDefinitions.h>
#include <VABase.h>
......@@ -21,121 +21,121 @@
#include <vector>
// Forwards
class IVACore;
class IVAInterface;
// Helper macro for 64-bit bitmasks
#define VA_BIT64( i ) ( ( ( const uint64_t ) 1 ) << i )
//! Data class encapsulating events of a VACore
class VABASE_API CVACoreEvent
//! Data class encapsulating events of a VA
class VABASE_API CVAEvent
{
public:
static const uint64_t VA_COREEVENT_NOTHING = 0;
static const uint64_t VA_EVENT_NOTHING = 0;
static const uint64_t VA_COREEVENT_INITIALIZED = VA_BIT64( 1 );
static const uint64_t VA_COREEVENT_FINALIZED = VA_BIT64( 2 );
static const uint64_t VA_COREEVENT_PROGRESS_UPDATE = VA_BIT64( 3 );
static const uint64_t VA_EVENT_INITIALIZED = VA_BIT64( 1 );
static const uint64_t VA_EVENT_FINALIZED = VA_BIT64( 2 );
static const uint64_t VA_EVENT_PROGRESS_UPDATE = VA_BIT64( 3 );
static const uint64_t VA_COREEVENT_DIRECTIVITY_LOADED = VA_BIT64( 4 );
static const uint64_t VA_COREEVENT_DIRECTIVITY_FREED = VA_BIT64( 5 );
static const uint64_t VA_EVENT_DIRECTIVITY_LOADED = VA_BIT64( 4 );
static const uint64_t VA_EVENT_DIRECTIVITY_FREED = VA_BIT64( 5 );
static const uint64_t VA_COREEVENT_SIGNALSOURCE_CREATED = VA_BIT64( 6 );
static const uint64_t VA_COREEVENT_SIGNALSOURCE_DELETED = VA_BIT64( 7 );
static const uint64_t VA_COREEVENT_SIGNALSOURCE_REGISTERED = VA_BIT64( 8 );
static const uint64_t VA_COREEVENT_SIGNALSOURCE_UNREGISTERED = VA_BIT64( 9 );
static const uint64_t VA_COREEVENT_SIGNALSOURCE_STATE_CHANGED = VA_BIT64( 10 );
static const uint64_t VA_EVENT_SIGNALSOURCE_CREATED = VA_BIT64( 6 );
static const uint64_t VA_EVENT_SIGNALSOURCE_DELETED = VA_BIT64( 7 );
static const uint64_t VA_EVENT_SIGNALSOURCE_REGISTERED = VA_BIT64( 8 );
static const uint64_t VA_EVENT_SIGNALSOURCE_UNREGISTERED = VA_BIT64( 9 );
static const uint64_t VA_EVENT_SIGNALSOURCE_STATE_CHANGED = VA_BIT64( 10 );
static const uint64_t VA_COREEVENT_SAMPLE_LOADED = VA_BIT64( 11 );
static const uint64_t VA_COREEVENT_SAMPLE_FREED = VA_BIT64( 12 );
static const uint64_t VA_EVENT_SAMPLE_LOADED = VA_BIT64( 11 );
static const uint64_t VA_EVENT_SAMPLE_FREED = VA_BIT64( 12 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CREATED = VA_BIT64( 13 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_DELETED = VA_BIT64( 14 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_NAME = VA_BIT64( 15 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE = VA_BIT64( 16 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE = VA_BIT64( 17 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_SOUND_POWER = VA_BIT64( 18 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_MUTING = VA_BIT64( 19 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_POSE = VA_BIT64( 20 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CREATED = VA_BIT64( 13 );
static const uint64_t VA_EVENT_SOUND_SOURCE_DELETED = VA_BIT64( 14 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_NAME = VA_BIT64( 15 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE = VA_BIT64( 16 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE = VA_BIT64( 17 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER = VA_BIT64( 18 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_MUTING = VA_BIT64( 19 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_POSE = VA_BIT64( 20 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_CREATED = VA_BIT64( 21 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_DELETED = VA_BIT64( 22 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_CHANGED_NAME = VA_BIT64( 23 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE = VA_BIT64( 24 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_CHANGED_POSE = VA_BIT64( 25 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CREATED = VA_BIT64( 21 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_DELETED = VA_BIT64( 22 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_NAME = VA_BIT64( 23 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE = VA_BIT64( 24 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_POSE = VA_BIT64( 25 );
static const uint64_t VA_COREEVENT_PORTAL_CHANGED_NAME = VA_BIT64( 26 );
static const uint64_t VA_COREEVENT_PORTAL_CHANGED_POSE = VA_BIT64( 27 );
static const uint64_t VA_COREEVENT_PORTAL_CHANGED_PARAMETER = VA_BIT64( 41 );
static const uint64_t VA_EVENT_PORTAL_CHANGED_NAME = VA_BIT64( 26 );
static const uint64_t VA_EVENT_PORTAL_CHANGED_POSE = VA_BIT64( 27 );
static const uint64_t VA_EVENT_PORTAL_CHANGED_PARAMETER = VA_BIT64( 41 );
static const uint64_t VA_COREEVENT_ACTIVE_LISTENER_CHANGED = VA_BIT64( 28 );
static const uint64_t VA_COREEVENT_INPUTGAIN_CHANGED = VA_BIT64( 29 );
static const uint64_t VA_COREEVENT_INPUTMUTING_CHANGED = VA_BIT64( 30 );
static const uint64_t VA_COREEVENT_OUTPUTGAIN_CHANGED = VA_BIT64( 31 );
static const uint64_t VA_COREEVENT_OUTPUTMUTING_CHANGED = VA_BIT64( 32 );
static const uint64_t VA_COREEVENT_GLOBALAURALIZATIONMODE_CHANGED = VA_BIT64( 33 );
static const uint64_t VA_EVENT_ACTIVE_LISTENER_CHANGED = VA_BIT64( 28 );
static const uint64_t VA_EVENT_INPUTGAIN_CHANGED = VA_BIT64( 29 );
static const uint64_t VA_EVENT_INPUTMUTING_CHANGED = VA_BIT64( 30 );
static const uint64_t VA_EVENT_OUTPUTGAIN_CHANGED = VA_BIT64( 31 );
static const uint64_t VA_EVENT_OUTPUTMUTING_CHANGED = VA_BIT64( 32 );
static const uint64_t VA_EVENT_GLOBALAURALIZATIONMODE_CHANGED = VA_BIT64( 33 );
static const uint64_t VA_COREEVENT_UNSPECIFIED_34 = VA_BIT64( 34 );
static const uint64_t VA_COREEVENT_UNSPECIFIED_35 = VA_BIT64( 35 );
static const uint64_t VA_COREEVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY = VA_BIT64( 36 );
static const uint64_t VA_COREEVENT_MEASURES_UPDATE = VA_BIT64( 37 );
static const uint64_t VA_COREEVENT_RESET = VA_BIT64( 38 );
static const uint64_t VA_COREEVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY = VA_BIT64( 39 );
static const uint64_t VA_EVENT_UNSPECIFIED_34 = VA_BIT64( 34 );
static const uint64_t VA_EVENT_UNSPECIFIED_35 = VA_BIT64( 35 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY = VA_BIT64( 36 );
static const uint64_t VA_EVENT_MEASURES_UPDATE = VA_BIT64( 37 );
static const uint64_t VA_EVENT_RESET = VA_BIT64( 38 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY = VA_BIT64( 39 );
static const uint64_t VA_COREEVENT_DESTROY = VA_BIT64( 40 );
static const uint64_t VA_EVENT_DESTROY = VA_BIT64( 40 );
// Next free slot: 42
// Selector mask for signal source related events
static const uint64_t VA_COREEVENT_SIGNALSOURCE_EVENT = VA_COREEVENT_SIGNALSOURCE_CREATED |
VA_COREEVENT_SIGNALSOURCE_DELETED |
VA_COREEVENT_SIGNALSOURCE_REGISTERED |
VA_COREEVENT_SIGNALSOURCE_UNREGISTERED |
VA_COREEVENT_SIGNALSOURCE_STATE_CHANGED |
VA_COREEVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE;
static const uint64_t VA_EVENT_SIGNALSOURCE_EVENT = VA_EVENT_SIGNALSOURCE_CREATED |
VA_EVENT_SIGNALSOURCE_DELETED |
VA_EVENT_SIGNALSOURCE_REGISTERED |
VA_EVENT_SIGNALSOURCE_UNREGISTERED |
VA_EVENT_SIGNALSOURCE_STATE_CHANGED |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE;
// Selector mask for sound source related events
static const uint64_t VA_COREEVENT_SOUNDSOURCE_EVENT = VA_COREEVENT_SOUND_SOURCE_CREATED |
VA_COREEVENT_SOUND_SOURCE_DELETED |
VA_COREEVENT_SOUND_SOURCE_CHANGED_NAME |
VA_COREEVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_COREEVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_COREEVENT_SOUND_SOURCE_CHANGED_POSE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
static const uint64_t VA_EVENT_SOUNDSOURCE_EVENT = VA_EVENT_SOUND_SOURCE_CREATED |
VA_EVENT_SOUND_SOURCE_DELETED |
VA_EVENT_SOUND_SOURCE_CHANGED_NAME |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_EVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_EVENT_SOUND_SOURCE_CHANGED_POSE |
VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
// Selector mask for listener related events
static const uint64_t VA_COREEVENT_LISTENER_EVENT = VA_COREEVENT_SOUND_RECEIVER_CREATED |
VA_COREEVENT_SOUND_RECEIVER_DELETED |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_POSE;
static const uint64_t VA_EVENT_LISTENER_EVENT = VA_EVENT_SOUND_RECEIVER_CREATED |
VA_EVENT_SOUND_RECEIVER_DELETED |
VA_EVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
// Selector mask for portal related events
static const uint64_t VA_COREEVENT_PORTAL_EVENT = VA_COREEVENT_PORTAL_CHANGED_NAME |
VA_COREEVENT_PORTAL_CHANGED_PARAMETER;
static const uint64_t VA_EVENT_PORTAL_EVENT = VA_EVENT_PORTAL_CHANGED_NAME |
VA_EVENT_PORTAL_CHANGED_PARAMETER;
// Selector mask for sound source modification event
static const uint64_t VA_COREEVENT_SOUNDSOURCE_MODIFICATION = VA_COREEVENT_SOUND_SOURCE_CHANGED_NAME |
VA_COREEVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_COREEVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_COREEVENT_SOUND_SOURCE_CHANGED_POSE |
VA_COREEVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
static const uint64_t VA_EVENT_SOUNDSOURCE_MODIFICATION = VA_EVENT_SOUND_SOURCE_CHANGED_NAME |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_EVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_EVENT_SOUND_SOURCE_CHANGED_POSE |
VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
// Selector mask for listener modification event
static const uint64_t VA_COREEVENT_LISTENER_MODIFICATION = VA_COREEVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_COREEVENT_SOUND_RECEIVER_CHANGED_POSE;
static const uint64_t VA_EVENT_LISTENER_MODIFICATION = VA_EVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
IVACore* pSender;
IVAInterface* pSender;
int iEventID;
uint64_t iEventType;
int iObjectID; // Integer-ID (Standard)
......@@ -163,7 +163,7 @@ public:
// --= Methoden =--
inline CVACoreEvent()
inline CVAEvent()
: pSender( NULL )
, iEventID( 0 )
, iEventType( 0 )
......@@ -176,7 +176,7 @@ public:
, bMuted( false )
{};
inline virtual ~CVACoreEvent() {};
inline virtual ~CVAEvent() {};
virtual std::string ToString() const;
};
......@@ -187,12 +187,12 @@ public:
* wird diese vom GUI implementiert, um sich ber nderungen
* der Szene informieren zu lassen.
*/
class VABASE_API IVACoreEventHandler
class VABASE_API IVAEventHandler
{
public:
inline virtual ~IVACoreEventHandler() {};
inline virtual ~IVAEventHandler() {};
virtual void HandleVACoreEvent( const CVACoreEvent* pEvent ) = 0;
virtual void HandleVAEvent( const CVAEvent* pEvent ) = 0;
};
#endif // IW_VABASE_CORE_EVENT
#endif // IW_VABASE_EVENT
......@@ -11,8 +11,8 @@
* --------------------------------------------------------------------------------------------
*/
#ifndef IW_VABASE_CORE
#define IW_VABASE_CORE
#ifndef IW_VABASE_INTERFACE
#define IW_VABASE_INTERFACE
#include <VABaseDefinitions.h>
#include <VABase.h>
......@@ -21,50 +21,15 @@
#include <string>
#include <vector>
/*!
@mainpage
@section intro_sec Introduction
The Virtual Acoustics project is free, open source real-time auralization framework. It is distributed under the terms of the Apache License Version 2.0.
The official website can be found at http://www.virtualacoustics.org
@section license_sec License
Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use the OpenDAFF software package except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
You should also have received a [copy of the License](LICENSE.md) with the VA software package.
@section getting_started Getting started
If you are a C++ developer and want to integrate VA into your application, the first contact point should be the VABase interface representad by the #IVACore class.
If you are planning to create a binding for any other programming and/or scripting language, also have a look at VANet and the #IVANetClient class.
*/
// Forward declarations
class VABASE_API CVACoreVersionInfo;
class VABASE_API CVAVersionInfo;
class VABASE_API CVAProgress;
class VABASE_API CVAStruct;
class VABASE_API IVACoreEventHandler;
class VABASE_API IVAEventHandler;
class VABASE_API IVAAudioSignalSource;
//! Interface of the VACore
class VABASE_API IVACore
//! Interface of the VA
class VABASE_API IVAInterface
{
public:
//! Core states
......@@ -152,11 +117,11 @@ public:
* Remember that you should always finialize a core, so that you can
* track errors.
*/
virtual ~IVACore();
virtual ~IVAInterface();
//! Returns the core version
virtual void GetVersionInfo( CVACoreVersionInfo* pVersionInfo ) const = 0;
virtual void GetVersionInfo( CVAVersionInfo* pVersionInfo ) const = 0;
//! Set the output stream for debug messages
virtual void SetDebugStream( std::ostream* posDebug ) = 0;
......@@ -214,7 +179,7 @@ public:
* This method can therefore be called anytime,
* also before initialization and after finalization.
*/
virtual void AttachCoreEventHandler( IVACoreEventHandler* pCoreEventHandler ) = 0;
virtual void AttachEventHandler( IVAEventHandler* pCoreEventHandler ) = 0;
//! Detaches a handler for core events from the core instance
/**
......@@ -226,7 +191,7 @@ public:
* \note When the method returns, it is guaranteed that the handler will not
* receive any further core events and may safely be destroyed.
*/
virtual void DetachCoreEventHandler( IVACoreEventHandler* pCoreEventHandler ) = 0;
virtual void DetachEventHandler( IVAEventHandler* pCoreEventHandler ) = 0;
//! Get all registered modules of the core
......@@ -1305,12 +1270,12 @@ public:
static const std::vector< CVAIntLiteral >& GetLiterals();
protected:
IVACore();
IVAInterface();
private:
// This interface is uncopyable
IVACore( const IVACore& );
IVACore& operator=( const IVACore& );
IVAInterface( const IVAInterface& );
IVAInterface& operator=( const IVAInterface& );
};
#endif // IW_VABASE_CORE
#endif // IW_VABASE_INTERFACE
......@@ -20,7 +20,7 @@
/**
* Diese Datenklasse beschreibt Versionsinformationen ber den VA-Kern
*/
class VABASE_API CVACoreVersionInfo
class VABASE_API CVAVersionInfo
{
public:
std::string sVersion; // Version als Zeichenkette (z.B. "1.02")
......
......@@ -4,18 +4,19 @@ set( RelativeDir "include" )
set( RelativeSourceGroup "include" )
set( DirFiles
VA.h
VAAudioSignalSource.h
VABase.h
VABaseDefinitions.h
VACore.h
VACoreEvent.h
VACoreVersion.h
VAEvent.h
VAEventHandlerGlobalLock.h
VAException.h
VAInterface.h
VAObject.h
VAObjectRegistry.h
VASamples.h
VAStruct.h
VAVersion.h
_SourceFiles.cmake
)
set( DirFiles_SourceGroup "${RelativeSourceGroup}" )
......
......@@ -11,9 +11,9 @@
* --------------------------------------------------------------------------------------------
*/
#include <VACore.h>
#include <VAInterface.h>
#include <VACoreVersion.h>
#include <VAVersion.h>
#include <VAException.h>
#include <VAStruct.h>
......@@ -23,7 +23,7 @@
const double DECIBEL_MINUS_INFINITY = -1.5E-308;
#define VACORE_REGISTER_LITERAL(L) push_back( CVAIntLiteral( "VACore", #L, IVACore::L ) )
#define VACORE_REGISTER_LITERAL(L) push_back( CVAIntLiteral( "VACore", #L, IVAInterface::L ) )
class CVALiteralsTable : public std::vector<CVAIntLiteral>
{
......@@ -66,13 +66,13 @@ public:
#undef VACORE_REGISTER_LITERAL
// Global literals table
CVALiteralsTable g_oCoreLiterals;
CVALiteralsTable g_oVALiterals;
IVACore::IVACore() {}
IVAInterface::IVAInterface() {}
IVACore::~IVACore() {}
IVAInterface::~IVAInterface() {}
bool IVACore::AddSearchPath( const std::string& sPath )
bool IVAInterface::AddSearchPath( const std::string& sPath )
{
CVAStruct oArg;
oArg[ "addsearchpath" ] = sPath;
......@@ -81,59 +81,59 @@ bool IVACore::AddSearchPath( const std::string& sPath )
return bPathFound;
}
bool IVACore::IsValidAuralizationMode( const int iAuralizationMode )
bool IVAInterface::IsValidAuralizationMode( const int iAuralizationMode )
{
return ( iAuralizationMode >= 0 ) && ( iAuralizationMode <= 2047 );
}
bool IVACore::IsValidVolume( const double dVolume )
bool IVAInterface::IsValidVolume( const double dVolume )
{
return ( dVolume >= 0 );
}
bool IVACore::IsValidAudiofileSignalSourcePlaybackAction( const int iAction )
bool IVAInterface::IsValidAudiofileSignalSourcePlaybackAction( const int iAction )
{
if( iAction == IVACore::VA_PLAYBACK_ACTION_PAUSE )
if( iAction == IVAInterface::VA_PLAYBACK_ACTION_PAUSE )
return true;
if( iAction == IVACore::VA_PLAYBACK_ACTION_PLAY )
if( iAction == IVAInterface::VA_PLAYBACK_ACTION_PLAY )
return true;
if( iAction == IVACore::VA_PLAYBACK_ACTION_STOP )
if( iAction == IVAInterface::VA_PLAYBACK_ACTION_STOP )
return true;
return false;
}
std::string IVACore::GetLogLevelStr( const int iLogLevel )
std::string IVAInterface::GetLogLevelStr( const int iLogLevel )
{
if( iLogLevel == IVACore::VA_LOG_LEVEL_QUIET ) return "QUIET";
if( iLogLevel == IVACore::VA_LOG_LEVEL_ERROR ) return "ERRORS";
if( iLogLevel == IVACore::VA_LOG_LEVEL_WARNING ) return "WARNINGS";
if( iLogLevel == IVACore::VA_LOG_LEVEL_INFO ) return "INFOS";
if( iLogLevel == IVACore::VA_LOG_LEVEL_VERBOSE ) return "VERBOSE";
if( iLogLevel == IVACore::VA_LOG_LEVEL_TRACE ) return "TRACE";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_QUIET ) return "QUIET";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_ERROR ) return "ERRORS";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_WARNING ) return "WARNINGS";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_INFO ) return "INFOS";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_VERBOSE ) return "VERBOSE";
if( iLogLevel == IVAInterface::VA_LOG_LEVEL_TRACE ) return "TRACE";
return "UNDEFINED";
}
// Parses a token of an auralization mode part (must be uppercase, used below)
int ParseAuralizationModeToken( const std::string& t )
{
if( t == "DS" ) return IVACore::VA_AURAMODE_DIRECT_SOUND;
if( t == "ER" ) return IVACore::VA_AURAMODE_EARLY_REFLECTIONS;
if( t == "DD" ) return IVACore::VA_AURAMODE_DIFFUSE_DECAY;
if( t == "SD" ) return IVACore::VA_AURAMODE_SOURCE_DIRECTIVITY;
if( t == "MA" ) return IVACore::VA_AURAMODE_MEDIUM_ABSORPTION;
if( t == "TV" ) return IVACore::VA_AURAMODE_TEMP_VAR;
if( t == "SC" ) return IVACore::VA_AURAMODE_SCATTERING;
if( t == "DF" ) return IVACore::VA_AURAMODE_DIFFRACTION;
if( t == "NF" ) return IVACore::VA_AURAMODE_NEARFIELD;
if( t == "DP" ) return IVACore::VA_AURAMODE_DOPPLER;
if( t == "SL" ) return IVACore::VA_AURAMODE_SPREADING_LOSS;
if( t == "TR" ) return IVACore::VA_AURAMODE_TRANSMISSION;
if( t == "AB" ) return IVACore::VA_AURAMODE_ABSORPTION;
if( t == "DS" ) return IVAInterface::VA_AURAMODE_DIRECT_SOUND;
if( t == "ER" ) return IVAInterface::VA_AURAMODE_EARLY_REFLECTIONS;
if( t == "DD" ) return IVAInterface::VA_AURAMODE_DIFFUSE_DECAY;
if( t == "SD" ) return IVAInterface::VA_AURAMODE_SOURCE_DIRECTIVITY;
if( t == "MA" ) return IVAInterface::VA_AURAMODE_MEDIUM_ABSORPTION;
if( t == "TV" ) return IVAInterface::VA_AURAMODE_TEMP_VAR;
if( t == "SC" ) return IVAInterface::VA_AURAMODE_SCATTERING;
if( t == "DF" ) return IVAInterface::VA_AURAMODE_DIFFRACTION;
if( t == "NF" ) return IVAInterface::VA_AURAMODE_NEARFIELD;
if( t == "DP" ) return IVAInterface::VA_AURAMODE_DOPPLER;
if( t == "SL" ) return IVAInterface::VA_AURAMODE_SPREADING_LOSS;