Merge pull request #1554 from srcejon/android_fixes

Android related changes
f4exb · Jan 3, 2023 · 0b476f6 · 0b476f6
2 parents 0827a70 + 94009e0
commit 0b476f6
Show file tree

Hide file tree

Showing 33 changed files with 1,672 additions and 859 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake/Modules/DetectArchitecture.cmake b/cmake/Modules/DetectArchitecture.cmake
diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt
@@ -128,7 +128,7 @@ if(NOT SERVER_MODE)
       if(WIN32)
         add_subdirectory(demoddatv)
       else()
-        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL)
+        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
             message(STATUS "Include demoddatv")
             add_subdirectory(demoddatv)
         else()

diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.ui b/plugins/channelrx/demodadsb/adsbdemodgui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>506</width>
     <height>1046</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>600</width>
+    <width>400</width>
     <height>0</height>
    </size>
   </property>
@@ -35,13 +35,13 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>598</width>
+     <width>500</width>
      <height>141</height>
     </rect>
    </property>
    <property name="minimumSize">
     <size>
-     <width>598</width>
+     <width>400</width>
      <height>0</height>
     </size>
    </property>
@@ -758,7 +758,7 @@
     <rect>
      <x>0</x>
      <y>140</y>
-     <width>598</width>
+     <width>500</width>
      <height>600</height>
     </rect>
    </property>
@@ -770,7 +770,7 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>598</width>
+     <width>400</width>
      <height>0</height>
     </size>
    </property>
@@ -810,7 +810,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>600</width>
+         <width>400</width>
          <height>150</height>
         </size>
        </property>
@@ -841,6 +841,9 @@
           <property name="editTriggers">
            <set>QAbstractItemView::NoEditTriggers</set>
           </property>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
+          </property>
           <column>
            <property name="text">
             <string>ICAO ID</string>

diff --git a/plugins/channelrx/demodapt/aptdemodgui.ui b/plugins/channelrx/demodapt/aptdemodgui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>440</width>
+    <width>434</width>
     <height>569</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>440</width>
+    <width>360</width>
     <height>0</height>
    </size>
   </property>
@@ -792,8 +792,8 @@
      <widget class="QGraphicsView" name="image">
       <property name="minimumSize">
        <size>
-        <width>300</width>
-        <height>350</height>
+        <width>200</width>
+        <height>200</height>
        </size>
       </property>
      </widget>
@@ -802,6 +802,11 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
@@ -820,11 +825,6 @@
    <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>deltaFrequency</tabstop>

diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.ui b/plugins/channelrx/demodbfm/bfmdemodgui.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>450</width>
+    <width>400</width>
     <height>0</height>
    </size>
   </property>
@@ -48,7 +48,7 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>450</width>
+     <width>400</width>
      <height>0</height>
     </size>
    </property>
@@ -1883,16 +1883,22 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
@@ -1912,12 +1918,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../sdrgui/resources/res.qrc"/>

diff --git a/plugins/channelrx/demoddatv/ldpctool/layered_decoder.h b/plugins/channelrx/demoddatv/ldpctool/layered_decoder.h
@@ -18,8 +18,9 @@ namespace ldpctool {
 class LDPCUtil
 {
 public:
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(ANDROID)
     // Recent versions of MacOS support aligned_alloc, but Mojave doesn't
+    // Likewise, API level 28 needed for aligned_alloc on Android, but we want to support 23
     static void *aligned_malloc(size_t alignment, size_t size)
     {
         void *p = nullptr;

diff --git a/plugins/channelrx/demodpacket/CMakeLists.txt b/plugins/channelrx/demodpacket/CMakeLists.txt
@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodpacket)
-    set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning)
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()