Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITADataSources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
2c9a0225
Commit
2c9a0225
authored
Dec 20, 2016
by
Anne
Browse files
Options
Browse Files
Download
Plain Diff
Merged ba_2016_heimes into develop
parents
e8fbe298
6f51069f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
14 deletions
+0
-14
include/ITANetAudioStreamingServer.h
include/ITANetAudioStreamingServer.h
+0
-8
src/ITANetAudioStreamingServer.cpp
src/ITANetAudioStreamingServer.cpp
+0
-6
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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