Aufgrund von Umarbeiten des s3 Storage wird es in GitLab, in nächster Zeit, mögliche Performance-Einbußen geben. Näheres dazu unter: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/43/show_ticket/6670

Even mor refactoring of net audio classes

parent 140cc0ee
......@@ -27,7 +27,7 @@
#include <ITASampleFrame.h>
class ITADatasource;
class CITANetAudioStreamServer;
class CITANetAudioStreamingServer;
//! Network audio sample server (for connecting a net audio stream)
/**
......@@ -69,13 +69,13 @@ protected:
ITADatasource* GetInputStream() const;
private:
CITANetAudioStreamServer* m_pNetAudioServer;
CITANetAudioStreamingServer* m_pNetAudioServer;
ITASampleFrame m_sfTempTransmitBuffer;
ITADatasource* m_pInputStream;
int m_iUpdateStrategy;
friend class CITANetAudioStreamServer;
friend class CITANetAudioStreamingServer;
};
#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_SAMPLE_SERVER
......@@ -63,7 +63,7 @@ private:
int m_iReadCursor; //!< Cursor where samples will be consumed from ring buffer on next block
int m_iWriteCursor; //!< Cursor where samples will feeded into ring buffer from net audio producer
ITASampleFrame m_sfRingBuffer;
ITASampleFrame m_sfRingBuffer; //!< Buffer incoming data
friend class CITANetAudioStreamingClient;
};
......
......@@ -37,11 +37,11 @@ class VistaTCPServer;
* Can be connected to an ITADataSource as a streaming source
* or to a user-implemented sample producer, i.e. an audio sythesizer.
*/
class CITANetAudioStreamServer : public VistaThreadLoop
class CITANetAudioStreamingServer : public VistaThreadLoop
{
public:
CITANetAudioStreamServer( CITANetAudioSampleServer* pParent );
virtual ~CITANetAudioStreamServer();
CITANetAudioStreamingServer( CITANetAudioSampleServer* pParent );
virtual ~CITANetAudioStreamingServer();
std::string GetServerAddress() const;
int GetNetworkPort() const;
......
......@@ -22,7 +22,7 @@ CITANetAudioSampleServer::CITANetAudioSampleServer()
: m_pInputStream( NULL )
, m_iUpdateStrategy( AUTO )
{
m_pNetAudioServer = new CITANetAudioStreamServer( this );
m_pNetAudioServer = new CITANetAudioStreamingServer( this );
}
bool CITANetAudioSampleServer::Start( const std::string& sAddress, int iPort )
......
......@@ -19,7 +19,7 @@
#include <cmath>
#include <cassert>
CITANetAudioStreamServer::CITANetAudioStreamServer( CITANetAudioSampleServer* pParent )
CITANetAudioStreamingServer::CITANetAudioStreamingServer( CITANetAudioSampleServer* pParent )
: m_pParent( pParent )
, m_bStopIndicated( false )
, m_pServer( NULL )
......@@ -32,21 +32,21 @@ CITANetAudioStreamServer::CITANetAudioStreamServer( CITANetAudioSampleServer* pP
{
};
CITANetAudioStreamServer::~CITANetAudioStreamServer()
CITANetAudioStreamingServer::~CITANetAudioStreamingServer()
{
}
std::string CITANetAudioStreamServer::GetServerAddress() const
std::string CITANetAudioStreamingServer::GetServerAddress() const
{
return m_sServerAddress;
}
int CITANetAudioStreamServer::GetNetworkPort() const
int CITANetAudioStreamingServer::GetNetworkPort() const
{
return m_iServerPort;
}
bool CITANetAudioStreamServer::Start( const std::string& sAddress, int iPort )
bool CITANetAudioStreamingServer::Start( const std::string& sAddress, int iPort )
{
if( m_pServer )
ITA_EXCEPT1( MODAL_EXCEPTION, "This net sample server is already started" );
......@@ -70,7 +70,7 @@ bool CITANetAudioStreamServer::Start( const std::string& sAddress, int iPort )
Run();
}
void CITANetAudioStreamServer::Disconnect()
void CITANetAudioStreamingServer::Disconnect()
{
m_bStopIndicated = true;
StopGently( true );
......@@ -83,7 +83,7 @@ void CITANetAudioStreamServer::Disconnect()
m_bStopIndicated = false;
}
bool CITANetAudioStreamServer::IsConnected() const
bool CITANetAudioStreamingServer::IsConnected() const
{
if( !m_pSocket )
return false;
......@@ -91,7 +91,7 @@ bool CITANetAudioStreamServer::IsConnected() const
return m_pSocket->GetIsConnected();
}
bool CITANetAudioStreamServer::LoopBody()
bool CITANetAudioStreamingServer::LoopBody()
{
if( m_bStopIndicated )
return true;
......
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