1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 17:04:46 -04:00

Remote Output and Remote Source more fixes

This commit is contained in:
f4exb
2021-12-12 10:44:58 +01:00
parent f7f5f4b2dd
commit 96411edd3c
27 changed files with 259 additions and 291 deletions
@@ -47,7 +47,7 @@ void RemoteOutputFifo::reset()
m_writeHead = 0;
}
RemoteDataBlock *RemoteOutputFifo::getDataBlock()
RemoteDataFrame *RemoteOutputFifo::getDataFrame()
{
QMutexLocker mutexLocker(&m_mutex);
m_servedHead = m_writeHead;
@@ -62,18 +62,18 @@ RemoteDataBlock *RemoteOutputFifo::getDataBlock()
return &m_data[m_servedHead];
}
unsigned int RemoteOutputFifo::readDataBlock(RemoteDataBlock **dataBlock)
unsigned int RemoteOutputFifo::readDataFrame(RemoteDataFrame **dataFrame)
{
QMutexLocker mutexLocker(&m_mutex);
if (calculateRemainder() == 0)
{
*dataBlock = nullptr;
*dataFrame = nullptr;
return 0;
}
else
{
*dataBlock = &m_data[m_readHead];
*dataFrame = &m_data[m_readHead];
m_readHead = m_readHead < m_size - 1 ? m_readHead + 1 : 0;
return calculateRemainder();
}
@@ -92,4 +92,4 @@ unsigned int RemoteOutputFifo::calculateRemainder()
} else {
return m_size - (m_readHead - m_servedHead);
}
}
}