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

Renaming mute getter

parent 2facfe7a
......@@ -1268,7 +1268,7 @@ public:
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientIsRenderingModuleMuted( sModuleID );
return m_pProtocol->ClientGetRenderingModuleMuted( sModuleID );
};
inline void SetRenderingModuleGain( const std::string& sModuleID, const double dGain )
......@@ -1299,11 +1299,11 @@ public:
m_pProtocol->ClientSetReproductionModuleMuted( sModuleID, bMuted );
};
inline bool IsReproductionModuleMuted( const std::string& sModuleID ) const
inline bool GetReproductionModuleMuted( const std::string& sModuleID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientIsReproductionModuleMuted( sModuleID );
return m_pProtocol->ClientGetReproductionModuleMuted( sModuleID );
};
inline void SetReproductionModuleGain( const std::string& sModuleID, const double dGain )
......
......@@ -247,13 +247,13 @@ void CVANetNetworkProtocol::ServerCallFunctionByMessageType( const int nMessageT
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_GET_INFOS, ServerGetRenderingModuleInfos() );
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_GET_GAIN, ServerGetRenderingModuleGain() );
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_SET_GAIN, ServerSetRenderingModuleGain() );
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_GET_MUTED, ServerIsRenderingModuleMuted() );
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_GET_MUTED, ServerGetRenderingModuleMuted() );
SERVER_FUNCTION_MAPPING( VA_NP_RENDERER_SET_MUTED, ServerSetRenderingModuleMuted() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_GET_INFOS, ServerGetReproductionModuleInfos() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_GET_GAIN, ServerGetReproductionModuleGain() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_SET_GAIN, ServerSetReproductionModuleGain() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_GET_MUTED, ServerIsReproductionModuleMuted() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_GET_MUTED, ServerGetReproductionModuleMuted() );
SERVER_FUNCTION_MAPPING( VA_NP_REPRODUCTION_SET_MUTED, ServerSetReproductionModuleMuted() );
case VA_NP_INVALID:
......@@ -3750,7 +3750,7 @@ void CVANetNetworkProtocol::ServerGetHomogeneousMediumParameters()
}
bool CVANetNetworkProtocol::ClientIsRenderingModuleMuted( const std::string& sID )
bool CVANetNetworkProtocol::ClientGetRenderingModuleMuted( const std::string& sID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_RENDERER_GET_MUTED, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sID );
......@@ -3758,7 +3758,7 @@ bool CVANetNetworkProtocol::ClientIsRenderingModuleMuted( const std::string& sID
return pMsg->ReadBool();
}
void CVANetNetworkProtocol::ServerIsRenderingModuleMuted()
void CVANetNetworkProtocol::ServerGetRenderingModuleMuted()
{
CVANetMessage* pMsg = ServerGetMessage();
std::string sID = pMsg->ReadString();
......@@ -3814,7 +3814,7 @@ void CVANetNetworkProtocol::ServerGetReproductionModuleGain()
pMsg->WriteDouble( dGain );
}
bool CVANetNetworkProtocol::ClientIsReproductionModuleMuted( const std::string& sID )
bool CVANetNetworkProtocol::ClientGetReproductionModuleMuted( const std::string& sID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_REPRODUCTION_GET_MUTED, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sID );
......@@ -3822,10 +3822,10 @@ bool CVANetNetworkProtocol::ClientIsReproductionModuleMuted( const std::string&
return pMsg->ReadBool();
}
void CVANetNetworkProtocol::ServerIsReproductionModuleMuted()
void CVANetNetworkProtocol::ServerGetReproductionModuleMuted()
{
CVANetMessage* pMsg = ServerGetMessage();
std::string sID = pMsg->ReadString();
bool bMuted = m_pRealCore->IsReproductionModuleMuted( sID );
bool bMuted = m_pRealCore->GetReproductionModuleMuted( sID );
pMsg->WriteBool( bMuted );
}
......@@ -50,8 +50,8 @@ class VistaConnectionIP;
class CVANetNetworkProtocol
{
public:
static const int VA_NET_PROTOCOL_VERSION_MAJOR = 1;
static const int VA_NET_PROTOCOL_VERSION_MINOR = 4;
static const int VA_NET_PROTOCOL_VERSION_MAJOR = 2;
static const int VA_NET_PROTOCOL_VERSION_MINOR = 0;
/**
* Method identifier
......@@ -817,8 +817,8 @@ public:
void ClientSetRenderingModuleMuted( const std::string&, const bool );
void ServerSetRenderingModuleMuted();
bool ClientIsRenderingModuleMuted( const std::string& );
void ServerIsRenderingModuleMuted();
bool ClientGetRenderingModuleMuted( const std::string& );
void ServerGetRenderingModuleMuted();
double ClientGetRenderingModuleGain( const std::string& );
void ServerGetRenderingModuleGain();
......@@ -832,8 +832,8 @@ public:
void ClientSetReproductionModuleMuted( const std::string&, const bool );
void ServerSetReproductionModuleMuted();
bool ClientIsReproductionModuleMuted( const std::string& );
void ServerIsReproductionModuleMuted();
bool ClientGetReproductionModuleMuted( const std::string& );
void ServerGetReproductionModuleMuted();
double ClientGetReproductionModuleGain( const std::string& );
void ServerGetReproductionModuleGain();
......
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