AlbrechtL · viktorgino · Feb 16, 2017 · Feb 16, 2017 · Feb 16, 2017 · Feb 16, 2017
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pro.user
diff --git a/gui/QML/SettingsPage.qml b/gui/QML/SettingsPage.qml
@@ -8,13 +8,14 @@ import "style"
 
 Item {
     id: settingsPage
-    property alias showChannelState : enableExpertMode.checked
-    property alias enableFullScreenState : enableFullScreen.checked
-    property alias enableExpertModeState : enableExpertMode.checked
+    property bool showChannelState : settings.enableExpertModeState
+    property bool enableFullScreenState : settings.enableFullScreenState
+    property bool enableExpertModeState : settings.enableExpertModeState
 
     Settings {
-        property alias enableFullScreenState : settingsPage.enableFullScreenState
-        property alias enableExpertModeState : settingsPage.enableExpertModeState
+        id: settings
+        property alias enableFullScreenState : enableFullScreen.checked
+        property alias enableExpertModeState : enableExpertMode.checked
     }
 
     Connections{
@@ -120,52 +121,54 @@ Item {
             }
 
             SettingsFrame {
+                Layout.fillWidth: true
                 ColumnLayout{
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+                    anchors.fill: parent
                     spacing: Units.dp(20)
 
                     TouchSwitch {
                         id: enableAGC
                         name: "Enable AGC"
+                        height: 24
+                        Layout.fillHeight: true
                         objectName: "enableAGC"
                         checked: true
-                        onChanged: cppGUI.inputEnableAGCChanged(valueChecked)
+                        onChanged: cppGUI.inputEnableAGCChange(valueChecked)
                     }
 
                     TouchSlider {
                         id: gain
                         enabled: !enableAGC.checked
                         name: "Manual gain"
-                        onValueChanged: cppGUI.inputGainChanged(valueGain)
+                        Layout.fillHeight: true
+                        onValueChanged: cppGUI.inputGainChange(valueGain)
                     }
                 }
             }
 
             SettingsFrame {
+                id: settingsFrame
+                Layout.fillWidth: true
                 ColumnLayout{
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+                    anchors.fill: parent
                     spacing: Units.dp(20)
 
                     TouchSwitch {
                         id: enableFullScreen
                         name: "Enable full screen mode"
+                        height: 24
+                        Layout.fillHeight: true
                         objectName: "enableFullScreen"
                         checked: false
                     }
 
                     TouchSwitch {
                         id: enableExpertMode
                         name: "Enable expert mode"
+                        height: 24
+                        Layout.fillHeight: true
                         objectName: "enableExpertMode"
                         checked: false
-                        onChanged: {
-                            if(valueChecked == false)
-                                mainWindow.width = Units.dp(350) + radioInformationView.width
-                        }
                     }
                 }
             }

diff --git a/gui/QML/main.qml b/gui/QML/main.qml
@@ -52,24 +52,22 @@ ApplicationWindow {
     visible: true
     width: Units.dp(700)
     height: Units.dp(500)
-    visibility: settingsPageLoader.settingsPage.enableFullScreenState ? "FullScreen" : "Windowed"
+    visibility: settingsPage.enableFullScreenState ? "FullScreen" : "Windowed"
 
     Settings {
         property alias width : mainWindow.width
         property alias height : mainWindow.height
     }
-    Loader {
-        id: settingsPageLoader
-        anchors.topMargin: Units.dp(10)
-        readonly property SettingsPage settingsPage: item
-        source: Qt.resolvedUrl("SettingsPage.qml")
+    SettingsPage{
+        id:settingsPage
+        onEnableExpertModeStateChanged: {
+            if(enableExpertModeState == false)
+                mainWindow.width = Units.dp(350) + radioInformationView.width
+        }
     }
-
-    Loader {
-        id: infoPageLoader
+    InfoPage{
+        id: infoPage
         anchors.topMargin: Units.dp(10)
-        readonly property InfoPage infoPage: item
-        source: Qt.resolvedUrl("InfoPage.qml")
     }
 
     Rectangle {
@@ -117,7 +115,7 @@ ApplicationWindow {
                     }
                     else
                     {
-                        stackView.push(settingsPageLoader);
+                        stackView.push(settingsPage);
                     }
                 }
             }
@@ -162,7 +160,7 @@ ApplicationWindow {
                     if(stackView.depth > 2)
                       stackView.pop();
                     else
-                      stackView.push(infoPageLoader);
+                      stackView.push(infoPage);
             }
         }
     }
@@ -176,7 +174,7 @@ ApplicationWindow {
             clip: true
             Layout.alignment: Qt.AlignLeft
             Layout.minimumWidth: Units.dp(350)
-            Layout.fillWidth: settingsPageLoader.settingsPage.enableExpertModeState ? false : true
+            Layout.fillWidth: settingsPage.enableExpertModeState ? false : true
 
             // Implements back key navigation
             focus: true
@@ -189,7 +187,7 @@ ApplicationWindow {
                 width: parent.width
                 height: parent.height
                 ListView {
-                    property bool showChannelState: settingsPageLoader.settingsPage.showChannelState
+                    property alias showChannelState: settingsPage.showChannelState
                     anchors.rightMargin: 0
                     anchors.bottomMargin: 0
                     anchors.leftMargin: 0
@@ -213,7 +211,7 @@ ApplicationWindow {
             Layout.minimumWidth: Units.dp(320)
 
             // Disable this view if expert view is enabled and no more space is available
-            visible: (mainWindow.width < Units.dp(850) && settingsPageLoader.settingsPage.enableExpertModeState) ? false : true
+            visible: (mainWindow.width < Units.dp(850) && settingsPage.enableExpertModeState) ? false : true
 
             // Radio
             RadioView {}
@@ -232,8 +230,8 @@ ApplicationWindow {
 
         ExpertView{
             id: expertView
-            Layout.fillWidth: settingsPageLoader.settingsPage.enableExpertModeState ? true : false
-            visible: settingsPageLoader.settingsPage.enableExpertModeState ? true : false
+            Layout.fillWidth: settingsPage.enableExpertModeState ? true : false
+            visible: settingsPage.enableExpertModeState ? true : false
         }
     }
 

diff --git a/gui/QML/style/ErrorMessagePopup.qml b/gui/QML/style/ErrorMessagePopup.qml
@@ -11,7 +11,7 @@ Popup {
     width: textView.width + Units.dp(65)
     height: Units.dp(50)
     x: mainWindow.width/2 - width/2
-    y: mainWindow.height  - toolBar.height - height
+    y: mainWindow.height  - toolBar_.height - height
     //modal: true
     //focus: true
     closePolicy: Popup.NoAutoClose

diff --git a/gui/QML/style/TouchSwitch.qml b/gui/QML/style/TouchSwitch.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.1
 // Import custom styles
 import "."
 
-RowLayout {
+Item {
     id: masterLayout
     signal changed(bool valueChecked)
 
@@ -15,7 +15,6 @@ RowLayout {
     property alias checked: switchView.checked
 
     Layout.preferredWidth: parent.width
-    spacing: Units.dp(20)
 
     Text {
         id: nameView

diff --git a/includes/backend/audio/mp4processor.h b/includes/backend/audio/mp4processor.h
@@ -39,9 +39,7 @@
 #include	<QObject>
 #include	"pad-handler.h"
 
-#ifdef GUI_3
 #include    "pad_decoder_adapter.h"
-#endif
 
 class	RadioInterface;
 
@@ -90,9 +88,8 @@ Q_OBJECT
 	int16_t		aacErrors;
 	int16_t		aacFrames;
 	int16_t		charSet;
-#ifdef GUI_3
 	PADDecoderAdapter  *padDecoderAdapter;
-#endif
+
 signals:
 	void		show_frameErrors		(int);
 	void		show_rsErrors			(int);

diff --git a/includes/backend/fib-processor.h b/includes/backend/fib-processor.h
@@ -152,9 +152,7 @@ Q_OBJECT
 	void		addtoEnsemble	(const QString &);
 	void		nameofEnsemble  (int, const QString &);
 	void		changeinConfiguration (void);
-#ifdef	GUI_3
 	void		newDateTime (int *);
-#endif
 
 };
 

diff --git a/includes/ofdm/ofdm-processor.h b/includes/ofdm/ofdm-processor.h
@@ -29,6 +29,7 @@
 #include	"dab-constants.h"
 #include	<QThread>
 #include	<QObject>
+#include	<thread>
 #include	"stdint.h"
 #include	"phasereference.h"
 #include	"ofdm-decoder.h"
@@ -61,10 +62,11 @@ Q_OBJECT
 	void	setOffset	(int32_t);
 	void	coarseCorrectorOn	(void);
 	void	coarseCorrectorOff	(void);
-#ifdef	GUI_3
 	void	set_scanMode		(bool, QString);
-#endif
+    void	start	(void);
 private:
+    std::thread threadHandle;
+    int32_t	syncBufferIndex;
 	virtualInput	*theRig;
 	DabParams	*params;
 	RadioInterface	*myRadioInterface;
@@ -101,10 +103,8 @@ Q_OBJECT
 	int32_t		inputPointer;
 	DSPCOMPLEX	getSample	(int32_t);
 	void		getSamples	(DSPCOMPLEX *, int16_t, int32_t);
-#ifdef	GUI_3
 	bool		scanMode;
 	int32_t		NoReadCounter;
-#endif
 virtual	void		run		(void);
 	int32_t		bufferContent;
 	bool		isReset;