daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split X/26 packet handling into intermediate class

Browse Source 
pagex26base holds methods for converting between the enhancements
QList and teletext packets. A future page subclass for POP pages will
re-use those same methods.
This commit is contained in:
G.K.MacGregor
2020-12-26 15:34:23 +00:00
parent 035c2c5a31
commit aa25a27e17
5 changed files with 133 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
levelonepage.cpp
View File

@@ -27,18 +27,12 @@
LevelOnePage::LevelOnePage()
{
m_paddingX26Triplet.setAddress(41);
m_paddingX26Triplet.setMode(0x1e);
m_paddingX26Triplet.setData(0);
m_enhancements.reserve(208);
clearPage();
}
LevelOnePage::LevelOnePage(const PageBase &other)
{
m_paddingX26Triplet.setAddress(41);
m_paddingX26Triplet.setMode(0x1e);
m_paddingX26Triplet.setData(0);
m_enhancements.reserve(208);
clearPage();
@@ -120,38 +114,10 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
QByteArray result(40, 0x00);
if (packetNumber == 26) {
if (!packetNeeded(26, designationCode))
if (!packetFromEnhancementListNeeded(designationCode))
return result; // Blank result
int enhanceListPointer;
X26Triplet lastTriplet;
for (int i=0; i<13; i++) {
enhanceListPointer = designationCode*13+i;
if (enhanceListPointer < m_enhancements.size()) {
result[i*3+1] = m_enhancements.at(enhanceListPointer).address();
result[i*3+2] = m_enhancements.at(enhanceListPointer).mode() | ((m_enhancements.at(enhanceListPointer).data() & 1) << 5);
result[i*3+3] = m_enhancements.at(enhanceListPointer).data() >> 1;
// If this is the last triplet, get a copy to repeat to the end of the packet
if (enhanceListPointer == m_enhancements.size()-1) {
lastTriplet = m_enhancements.at(enhanceListPointer);
// If the last triplet was NOT a Termination Marker, make up one
if (lastTriplet.mode() != 0x1f || lastTriplet.address() != 0x3f) {
lastTriplet.setAddress(0x3f);
lastTriplet.setMode(0x1f);
lastTriplet.setData(0x07);
}
}
} else {
// We've gone past the end of the triplet list, so repeat the Termination Marker to the end
result[i*3+1] = lastTriplet.address();
result[i*3+2] = lastTriplet.mode() | ((lastTriplet.data() & 1) << 5);
result[i*3+3] = lastTriplet.data() >> 1;
}
}
return result;
return packetFromEnhancementList(designationCode);
}
if (packetNumber == 27 && designationCode == 0) {
@@ -224,28 +190,7 @@ bool LevelOnePage::setPacket(int packetNumber, QByteArray packetContents)
bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray packetContents)
{
if (packetNumber == 26) {
// Preallocate entries in the m_enhancements list to hold our incoming triplets.
// We write "dummy" reserved 11110 Row Triplets in the allocated entries which then get overwritten by the packet contents.
// This is in case of missing packets so we can keep Local Object pointers valid.
while (m_enhancements.size() < (designationCode+1)*13)
m_enhancements.append(m_paddingX26Triplet);
int enhanceListPointer;
X26Triplet newX26Triplet;
for (int i=0; i<13; i++) {
enhanceListPointer = designationCode*13+i;
newX26Triplet.setAddress(packetContents.at(i*3+1) & 0x3f);
newX26Triplet.setMode(packetContents.at(i*3+2) & 0x1f);
newX26Triplet.setData(((packetContents.at(i*3+3) & 0x3f) << 1) | ((packetContents.at(i*3+2) & 0x20) >> 5));
m_enhancements[enhanceListPointer] = newX26Triplet;
}
if (newX26Triplet.mode() == 0x1f && newX26Triplet.address() == 0x3f && newX26Triplet.data() & 0x01)
// Last triplet was a Termination Marker (without ..follows) so clean up the repeated ones
while (m_enhancements.size()>1 && m_enhancements.at(m_enhancements.size()-2).mode() == 0x1f && m_enhancements.at(m_enhancements.size()-2).address() == 0x3f && m_enhancements.at(m_enhancements.size()-2).data() == newX26Triplet.data())
m_enhancements.removeLast();
setEnhancementListFromPacket(designationCode, packetContents);
return true;
}
@@ -324,7 +269,7 @@ bool LevelOnePage::packetNeeded(int packetNumber) const
bool LevelOnePage::packetNeeded(int packetNumber, int designationCode) const
{
if (packetNumber == 26)
return ((m_enhancements.size()+12) / 13) > designationCode;
return packetFromEnhancementListNeeded(designationCode);
if (packetNumber == 27 && designationCode == 0) {
for (int i=0; i<6; i++)