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
677458e7
Commit
677458e7
authored
Mar 02, 2017
by
Anne Heimes
Browse files
bugfixes
parent
504b00bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/ITANetAudioStream.cpp
View file @
677458e7
...
...
@@ -137,18 +137,16 @@ CITANetAudioStream::CITANetAudioStream(int iChannels, double dSamplingRate, int
m_iStreamingStatus
=
STOPPED
;
// Logging
std
::
string
paras
=
std
::
string
(
"NetAudioLogBaseData"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
iBufferSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
iChannels
)
+
std
::
string
(
".txt"
);
std
::
string
paras
=
std
::
string
(
"_BS"
)
+
std
::
to_string
(
iBufferSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
iChannels
)
+
std
::
string
(
"_tl"
)
+
std
::
to_string
(
iTargetSampleLatencyServer
)
+
std
::
string
(
".txt"
);
m_pAudioLogger
=
new
ITABufferedDataLoggerImplAudio
(
);
m_pAudioLogger
->
setOutputFile
(
paras
);
m_pAudioLogger
->
setOutputFile
(
std
::
string
(
"NetAudioLogBaseData"
)
+
paras
);
paras
=
std
::
string
(
"NetAudioLogStream"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
iBufferSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
iChannels
)
+
std
::
string
(
".txt"
);
m_pStreamLogger
=
new
ITABufferedDataLoggerImplStream
();
m_pStreamLogger
->
setOutputFile
(
paras
);
m_pStreamLogger
->
setOutputFile
(
std
::
string
(
"NetAudioLogStream"
)
+
paras
);
iAudioStreamingBlockID
=
0
;
paras
=
std
::
string
(
"NetAudioLogNet"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
iBufferSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
iChannels
)
+
std
::
string
(
".txt"
);
m_pNetLogger
=
new
ITABufferedDataLoggerImplNet
();
m_pNetLogger
->
setOutputFile
(
paras
);
m_pNetLogger
->
setOutputFile
(
std
::
string
(
"NetAudioLogNet"
)
+
paras
);
iNetStreamingBlockID
=
0
;
// Logging Base Data
...
...
src/ITANetAudioStreamingClient.cpp
View file @
677458e7
...
...
@@ -60,7 +60,7 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP
m_oParams
.
iRingBufferSize
=
pParent
->
GetRingBufferSize
();
m_oParams
.
iTargetSampleLatency
=
pParent
->
GetAllowedLatencySamples
();
std
::
string
paras
=
std
::
string
(
"NetAudioLogClient"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
pParent
->
GetBlocklength
())
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
pParent
->
GetNumberOfChannels
())
+
std
::
string
(
".txt"
);
std
::
string
paras
=
std
::
string
(
"NetAudioLogClient"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
pParent
->
GetBlocklength
())
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
pParent
->
GetNumberOfChannels
())
+
std
::
string
(
"_tl"
)
+
std
::
to_string
(
pParent
->
GetAllowedLatencySamples
())
+
std
::
string
(
".txt"
);
m_pClientLogger
=
new
ITABufferedDataLoggerImplClient
(
);
m_pClientLogger
->
setOutputFile
(
paras
);
iStreamingBlockId
=
0
;
...
...
src/ITANetAudioStreamingServer.cpp
View file @
677458e7
...
...
@@ -109,7 +109,7 @@ bool CITANetAudioStreamingServer::Start( const std::string& sAddress, int iPort
#endif
}
std
::
string
paras
=
std
::
string
(
"NetAudioLogServer"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
m_oServerParams
.
iBlockSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
m_oServerParams
.
iChannels
)
+
std
::
string
(
".txt"
);
std
::
string
paras
=
std
::
string
(
"NetAudioLogServer"
)
+
std
::
string
(
"_BS"
)
+
std
::
to_string
(
m_oServerParams
.
iBlockSize
)
+
std
::
string
(
"_Ch"
)
+
std
::
to_string
(
m_oServerParams
.
iChannels
)
+
std
::
string
(
"_tl"
)
+
std
::
to_
string
(
m_oServerParams
.
iTargetSampleLatency
)
+
std
::
string
(
".txt"
);
m_pServerLogger
=
new
ITABufferedDataLoggerImplServer
(
);
m_pServerLogger
->
setOutputFile
(
paras
);
...
...
tests/NetAudio/NetAudioServerLog.m
View file @
677458e7
...
...
@@ -3,7 +3,7 @@ close all;
clear
all
;
BlockSize
=
'32'
;
plotServer
=
1
;
maxSamples
=
20
*
3
;
maxSamples
=
5
*
3
*
2
;
%% Einlesen der Logs
NetAudioLogServer
=
dir
([
'NetAudioLogServer_BS'
BlockSize
'*.txt'
]);
...
...
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