[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: gr-audio: windows audio using incorr
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: gr-audio: windows audio using incorrect logger syntax |
|
Date: |
Tue, 22 Nov 2016 17:27:55 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit d87e3fe0b256313c9bc51a50985f7c6fbaa0736d
Author: gnieboer <address@hidden>
Date: Thu Nov 17 21:19:59 2016 -0500
gr-audio: windows audio using incorrect logger syntax
---
gr-audio/lib/windows/windows_sink.cc | 14 +++++++-------
gr-audio/lib/windows/windows_source.cc | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gr-audio/lib/windows/windows_sink.cc
b/gr-audio/lib/windows/windows_sink.cc
index 52456db..bd9e0e5 100644
--- a/gr-audio/lib/windows/windows_sink.cc
+++ b/gr-audio/lib/windows/windows_sink.cc
@@ -93,7 +93,7 @@ namespace gr {
std::runtime_error("audio_windows_sink:open_waveout_device()
failed");
}
else if (verbose) {
- GR_LOG_INFO(logger, "Opened windows waveout device");
+ GR_LOG_INFO(d_logger, "Opened windows waveout device");
}
d_buffers = new LPWAVEHDR[nPeriods];
for (int i = 0; i < nPeriods; i++)
@@ -104,7 +104,7 @@ namespace gr {
d_buffers[i]->dwBufferLength = d_buffer_size;
d_buffers[i]->lpData = new CHAR[d_buffer_size];
}
- if (verbose) GR_LOG_INFO(logger, boost::format("Initialized %1% %2%ms
audio buffers, total memory used: %3$0.2fkB") % (nPeriods) % (CHUNK_TIME *
1000) % ((d_buffer_size * nPeriods) / 1024.0));
+ if (verbose) GR_LOG_INFO(d_logger, boost::format("Initialized %1% %2%ms
audio buffers, total memory used: %3$0.2fkB") % (nPeriods) % (CHUNK_TIME *
1000) % ((d_buffer_size * nPeriods) / 1024.0));
}
windows_sink::~windows_sink()
@@ -252,7 +252,7 @@ namespace gr {
result = num;
}
else {
- GR_LOG_INFO(logger, boost::format("Warning: waveOut deviceID %d
was not found, defaulting to WAVE_MAPPER") % num);
+ GR_LOG_INFO(d_logger, boost::format("Warning: waveOut deviceID %d
was not found, defaulting to WAVE_MAPPER") % num);
result = WAVE_MAPPER;
}
@@ -271,10 +271,10 @@ namespace gr {
{
result = i;
}
- if (verbose) GR_LOG_INFO(logger, boost::format("WaveOut Device %d:
%s") % i % woc.szPname);
+ if (verbose) GR_LOG_INFO(d_logger, boost::format("WaveOut Device
%d: %s") % i % woc.szPname);
}
if (result == -1) {
- GR_LOG_INFO(logger, boost::format("Warning: waveOut device '%s'
was not found, defaulting to WAVE_MAPPER") % szDeviceName);
+ GR_LOG_INFO(d_logger, boost::format("Warning: waveOut device '%s'
was not found, defaulting to WAVE_MAPPER") % szDeviceName);
result = WAVE_MAPPER;
}
}
@@ -306,14 +306,14 @@ namespace gr {
// would know the device ID so at the moment we will ignore that
setting
// and stick with WAVE_MAPPER
u_device_id = find_device(d_device_name);
- if (verbose) GR_LOG_INFO(logger, boost::format("waveOut Device ID: %1%")
% (u_device_id));
+ if (verbose) GR_LOG_INFO(d_logger, boost::format("waveOut Device ID:
%1%") % (u_device_id));
// Check if the sampling rate/bits/channels are good to go with the
device.
MMRESULT supported = is_format_supported(&wave_format, u_device_id);
if (supported != MMSYSERR_NOERROR) {
char err_msg[50];
waveOutGetErrorText(supported, err_msg, 50);
- GR_LOG_INFO(logger, boost::format("format error: %s") % err_msg);
+ GR_LOG_INFO(d_logger, boost::format("format error: %s") % err_msg);
perror("audio_windows_sink: Requested audio format is not supported by
device driver");
return -1;
}
diff --git a/gr-audio/lib/windows/windows_source.cc
b/gr-audio/lib/windows/windows_source.cc
index f458fa4..372a8ba 100644
--- a/gr-audio/lib/windows/windows_source.cc
+++ b/gr-audio/lib/windows/windows_source.cc
@@ -97,7 +97,7 @@ namespace gr {
std::runtime_error("audio_windows_source:open_wavein_device() failed");
}
else if (verbose) {
- GR_LOG_INFO(logger, "Opened windows wavein
device");
+ GR_LOG_INFO(d_logger, "Opened windows wavein
device");
}
lp_buffers = new LPWAVEHDR[nPeriods];
for (int i = 0; i < nPeriods; i++)
@@ -118,7 +118,7 @@ namespace gr {
waveInAddBuffer(d_h_wavein, lp_buffer,
sizeof(WAVEHDR));
}
waveInStart(d_h_wavein);
- if (verbose) GR_LOG_INFO(logger,
boost::format("Initialized %1% %2%ms audio buffers, total memory used:
%3$0.2fkB") % (nPeriods) % (CHUNK_TIME * 1000) % ((d_buffer_size * nPeriods) /
1024.0));
+ if (verbose) GR_LOG_INFO(d_logger,
boost::format("Initialized %1% %2%ms audio buffers, total memory used:
%3$0.2fkB") % (nPeriods) % (CHUNK_TIME * 1000) % ((d_buffer_size * nPeriods) /
1024.0));
}
windows_source::~windows_source()
@@ -237,7 +237,7 @@ namespace gr {
result = num;
}
else {
- GR_LOG_INFO(logger,
boost::format("Warning: waveIn deviceID %d was not found, defaulting to
WAVE_MAPPER") % num);
+ GR_LOG_INFO(d_logger,
boost::format("Warning: waveIn deviceID %d was not found, defaulting to
WAVE_MAPPER") % num);
result = WAVE_MAPPER;
}
@@ -256,10 +256,10 @@ namespace gr {
{
result = i;
}
- if (verbose)
GR_LOG_INFO(logger, boost::format("WaveIn Device %d: %s") % i % woc.szPname);
+ if (verbose)
GR_LOG_INFO(d_logger, boost::format("WaveIn Device %d: %s") % i % woc.szPname);
}
if (result == -1) {
- GR_LOG_INFO(logger,
boost::format("Warning: waveIn device '%s' was not found, defaulting to
WAVE_MAPPER") % szDeviceName);
+ GR_LOG_INFO(d_logger,
boost::format("Warning: waveIn device '%s' was not found, defaulting to
WAVE_MAPPER") % szDeviceName);
result = WAVE_MAPPER;
}
}
@@ -291,14 +291,14 @@ namespace gr {
// would know the device ID so at the moment we
will ignore that setting
// and stick with WAVE_MAPPER
u_device_id = find_device(d_device_name);
- if (verbose) GR_LOG_INFO(logger, boost::format("waveIn
Device ID: %1%") % (u_device_id));
+ if (verbose) GR_LOG_INFO(d_logger,
boost::format("waveIn Device ID: %1%") % (u_device_id));
// Check if the sampling rate/bits/channels are good to
go with the device.
MMRESULT supported = is_format_supported(&wave_format,
u_device_id);
if (supported != MMSYSERR_NOERROR) {
char err_msg[50];
waveInGetErrorText(supported, err_msg, 50);
- GR_LOG_INFO(logger, boost::format("format
error: %s") % err_msg);
+ GR_LOG_INFO(d_logger, boost::format("format
error: %s") % err_msg);
perror("audio_windows_source: Requested audio
format is not supported by device driver");
return -1;
}