From 87bb930a13f1e2b56168de96c3546979618cd1f9 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 6 Sep 2016 23:35:41 +0200
Subject: [PATCH] DSD demod plugin: DMR refactoring: added embedded signalling
 processing and corresponfing addresses display in slot text

---
 plugins/channel/demoddsd/dsddemodgui.cpp | 10 ++--
 plugins/channel/demoddsd/dsddemodgui.h   |  2 +-
 plugins/channel/demoddsd/dsddemodgui.ui  | 76 ++++++++++++------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp
index 96f2a6d58..06c7b08c5 100644
--- a/plugins/channel/demoddsd/dsddemodgui.cpp
+++ b/plugins/channel/demoddsd/dsddemodgui.cpp
@@ -439,7 +439,7 @@ void DSDDemodGUI::formatStatusText()
     case DSDcc::DSDDecoder::DSDSyncDMRVoiceP:
         if (m_signalFormat != signalFormatDMR)
         {
-            strcpy(m_formatStatusText, "Sta: __ S1: _______ S2: _______");
+            strcpy(m_formatStatusText, "Sta: __ S1: __________________________ S2: __________________________");
         }
 
         switch (m_dsdDemod->getDecoder().getStationType())
@@ -455,8 +455,8 @@ void DSDDemodGUI::formatStatusText()
             break;
         }
 
-        memcpy(&m_formatStatusText[12], m_dsdDemod->getDecoder().getSlot0Text(), 7);
-        memcpy(&m_formatStatusText[24], m_dsdDemod->getDecoder().getSlot1Text(), 7);
+        memcpy(&m_formatStatusText[12], m_dsdDemod->getDecoder().getSlot0Text(), 26);
+        memcpy(&m_formatStatusText[43], m_dsdDemod->getDecoder().getSlot1Text(), 26);
         m_signalFormat = signalFormatDMR;
         break;
     case DSDcc::DSDDecoder::DSDSyncDStarHeaderN:
@@ -488,7 +488,7 @@ void DSDDemodGUI::formatStatusText()
             }
         }
 
-        m_formatStatusText[62] = '\0';
+        m_formatStatusText[72] = '\0';
         m_signalFormat = signalFormatDStar;
         break;
     case DSDcc::DSDDecoder::DSDSyncDPMR:
@@ -505,7 +505,7 @@ void DSDDemodGUI::formatStatusText()
         break;
     }
 
-    m_formatStatusText[64] = '\0'; // guard
+    m_formatStatusText[72] = '\0'; // guard
 }
 
 void DSDDemodGUI::tick()
diff --git a/plugins/channel/demoddsd/dsddemodgui.h b/plugins/channel/demoddsd/dsddemodgui.h
index e9e26a6a2..41108bab6 100644
--- a/plugins/channel/demoddsd/dsddemodgui.h
+++ b/plugins/channel/demoddsd/dsddemodgui.h
@@ -92,7 +92,7 @@ private:
 	ChannelMarker m_channelMarker;
 	bool m_basicSettingsShown;
 	bool m_doApplySettings;
-	char m_formatStatusText[64+1]; //!< Fixed signal format dependent status text
+	char m_formatStatusText[72+1]; //!< Fixed signal format dependent status text
 	SignalFormat m_signalFormat;
 
 	ThreadedSampleSink* m_threadedChannelizer;
diff --git a/plugins/channel/demoddsd/dsddemodgui.ui b/plugins/channel/demoddsd/dsddemodgui.ui
index fbad9da29..d22729b2b 100644
--- a/plugins/channel/demoddsd/dsddemodgui.ui
+++ b/plugins/channel/demoddsd/dsddemodgui.ui
@@ -602,6 +602,42 @@
         </property>
        </spacer>
       </item>
+      <item>
+       <widget class="QToolButton" name="slot1On">
+        <property name="toolTip">
+         <string>TDMA slot1 or FDMA unique slot voice on/off</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../sdrbase/resources/res.qrc">
+          <normaloff>:/slot1_off.png</normaloff>
+          <normalon>:/slot1_on.png</normalon>:/slot1_off.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="slot2On">
+        <property name="toolTip">
+         <string>TDMA slot2 voice on/off</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../sdrbase/resources/res.qrc">
+          <normaloff>:/slot2_off.png</normaloff>
+          <normalon>:/slot2_on.png</normalon>:/slot2_off.png</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="squelchLabel">
         <property name="text">
@@ -744,7 +780,7 @@
        <widget class="QLabel" name="formatStatusText">
         <property name="minimumSize">
          <size>
-          <width>470</width>
+          <width>535</width>
           <height>0</height>
          </size>
         </property>
@@ -764,7 +800,7 @@
          <number>2</number>
         </property>
         <property name="text">
-         <string>A123456789B123456789C123456789D123456789E123456789F123456789G123</string>
+         <string>A123456789B123456789C123456789D123456789E123456789F123456789G123456789H1</string>
         </property>
        </widget>
       </item>
@@ -781,42 +817,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="slot1On">
-        <property name="toolTip">
-         <string>TDMA slot1 or FDMA unique slot voice on/off</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../../sdrbase/resources/res.qrc">
-          <normaloff>:/slot1_off.png</normaloff>
-          <normalon>:/slot1_on.png</normalon>:/slot1_off.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="slot2On">
-        <property name="toolTip">
-         <string>TDMA slot2 voice on/off</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../../sdrbase/resources/res.qrc">
-          <normaloff>:/slot2_off.png</normaloff>
-          <normalon>:/slot2_on.png</normalon>:/slot2_off.png</iconset>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </item>
    </layout>