Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
2c9a0225
Commit
2c9a0225
authored
Dec 20, 2016
by
Anne
Browse files
Merged ba_2016_heimes into develop
parents
e8fbe298
6f51069f
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/ITANetAudioStreamingServer.h
View file @
2c9a0225
...
...
@@ -80,14 +80,6 @@ private:
int
m_iClientRingBufferFreeSamples
;
friend
class
CITANetAudioServer
;
// TODO: in einem Struct speichern
struct
InitData
{
int
iClientChannels
;
int
iClientRingBufferSize
;
int
iClientBufferSize
;
double
dClientSampleRate
;
}
m_initData
;
};
#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
src/ITANetAudioStreamingServer.cpp
View file @
2c9a0225
...
...
@@ -35,7 +35,6 @@ bool CITANetAudioStreamingServer::Start(const std::string& sAddress, int iPort)
m_pSocket
=
m_pNetAudioServer
->
GetSocket
();
// TODO: Init neu mit Netmessage
long
nIncomingBytes
=
m_pSocket
->
WaitForIncomingData
(
0
);
int
iBytesReceived
=
m_pSocket
->
ReceiveRaw
(
&
m_initData
,
sizeof
(
InitData
));
m_iClientRingBufferFreeSamples
=
m_iClientRingBufferFreeSamples
;
int
iMessageID
=
1
;
...
...
@@ -84,11 +83,6 @@ int CITANetAudioStreamingServer::GetNetStreamNumberOfChannels() const
return
m_sfTempTransmitBuffer
.
channels
();
}
double
CITANetAudioStreamingServer
::
GetNetStreamSampleRate
()
const
{
return
m_initData
.
dClientSampleRate
;
}
void
CITANetAudioStreamingServer
::
SetAutomaticUpdateRate
()
{
m_iUpdateStrategy
=
AUTO
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment