Skip to content

Commit

Permalink
MSVC/clang-cl build issues #38 fix. Compilation warnings removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
KejPi committed Sep 1, 2022
1 parent b37f197 commit 4dc1525
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions gui/audiooutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ int AudioOutput::portAudioCbPrivate(void *outputBuffer, unsigned long nBufferFra
uint64_t bytesToRead = m_bytesPerFrame * nBufferFrames;
uint32_t availableSamples = nBufferFrames;

bool muteRequest = m_muteFlag | m_stopFlag; // false == do unmute, true == do mute
bool muteRequest = m_muteFlag || m_stopFlag; // false == do unmute, true == do mute

if (AudioOutputPlaybackState::Muted == m_playbackState)
{ // muted
Expand Down Expand Up @@ -788,7 +788,7 @@ qint64 AudioIODevice::readData(char *data, qint64 len)
m_inFifoPtr->mutex.unlock();

//qDebug() << Q_FUNC_INFO << len << count << static_cast<int>(m_playbackState);
bool muteRequest = m_muteFlag | m_stopFlag;
bool muteRequest = m_muteFlag || m_stopFlag;

//uint64_t bytesToRead = len;
uint64_t bytesToRead = qMin(uint64_t(len), AUDIOOUTPUT_FADE_TIME_MS * m_sampleRate_kHz * m_bytesPerFrame);
Expand Down
2 changes: 2 additions & 0 deletions gui/inputdevicesrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class InputDeviceSRC
class InputDeviceSRCFilter
{
public:
virtual ~InputDeviceSRCFilter() {} // virtual destructor to avoid undefined behavior

// reset filter and signal level
virtual void reset() = 0;

Expand Down
2 changes: 1 addition & 1 deletion gui/radiocontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ void RadioControl::startUserApplication(DabUserApplicationType uaType, bool star
}

// TODO: not found - try ensemble
#warning "Debug - remove or make implementation clean"
// #warning "Debug - remove or make implementation clean"
for (auto & service : serviceList)
{
if (!service.SId.isProgServiceId())
Expand Down
2 changes: 1 addition & 1 deletion gui/servicelistitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const EnsembleListItem * ServiceListItem::getEnsemble(int num) const
{
if (num < 0)
{ // best ensemble
#warning "Best ensemble to be implemented"
// #warning "Best ensemble to be implemented"
return m_ensembleList.at(m_currentEnsemble);
}
else
Expand Down
2 changes: 2 additions & 0 deletions gui/spiapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,4 +614,6 @@ const uint8_t *SPIApp::parseAttributes(const uint8_t *attrPtr, uint8_t tag, int
default:
break;
}

return nullptr;
}

0 comments on commit 4dc1525

Please sign in to comment.