configure settings.xml during build to define USB not supported #17

AlwinEsch · 2024-04-03T14:15:39Z

This change it to settings.xml.in and set on add-on compile the settings usable or not. Is done by change the <visible> value and set of default connection type. The settings are still inside to prevent problems if something tries somewhere to read it.

Further can for build the cmake configuration value "-DUSB_DEVICE_SUPPORT=0" used and if wanted to disable USB support.

XML with USB support disabled

        <!-- USB device not suppoted on this add-on, due to this the following setting is not usable and marked as not visible. -->
        <setting id="device_connection" type="integer" label="30100" help="30500">
          <level>0</level>
          <visible>false</visible>
          <default>1</default>
          <constraints>
            <options>
              <option label="30200">0</option>
              <option label="30201">1</option>
            </options>
          </constraints>
          <control type="spinner" format="integer"/>
        </setting>

        <!-- USB device not suppoted on this add-on, due to this the following setting is not usable and marked as not visible. -->
        <setting id="device_connection_usb_index" parent="device_connection" type="integer" label="30101" help="30501">
          <level>0</level>
          <visible>false</visible>
          <default>0</default>
          <constraints>
            <minimum>0</minimum>
            <step>1</step>
            <maximum>8</maximum>
          </constraints>
          <dependencies>
            <dependency type="visible" setting="device_connection" operator="is">0</dependency>
          </dependencies>
          <control type="spinner" format="integer"/>
        </setting>

        <setting id="device_connection_tcp_host" parent="device_connection" type="string" label="30102" help="30502">
          <level>0</level>
          <default/>
          <constraints>
            <allowempty>true</allowempty>
          </constraints>
          <!--
          <dependencies>
            <dependency type="visible" setting="device_connection" operator="is">1</dependency>
          </dependencies>
          -->
          <control type="edit" format="ip">
            <heading>30102</heading>
          </control>
        </setting>

        <setting id="device_connection_tcp_port" parent="device_connection" type="integer" label="30103" help="30503">
          <level>0</level>
          <default>1234</default>
          <constraints>
            <allowempty>false</allowempty>
            <minimum>0</minimum>
            <maximum>65535</maximum>
          </constraints>
          <!--
          <dependencies>
            <dependency type="visible" setting="device_connection" operator="is">1</dependency>
          </dependencies>
          -->
          <control type="edit" format="integer">
            <heading>30103</heading>
          </control>
        </setting>

XML with USB support enabled

        <!-- USB device supported on this add-on. -->
        <setting id="device_connection" type="integer" label="30100" help="30500">
          <level>0</level>
          <visible>true</visible>
          <default>0</default>
          <constraints>
            <options>
              <option label="30200">0</option>
              <option label="30201">1</option>
            </options>
          </constraints>
          <control type="spinner" format="integer"/>
        </setting>

        <!-- USB device supported on this add-on. -->
        <setting id="device_connection_usb_index" parent="device_connection" type="integer" label="30101" help="30501">
          <level>0</level>
          <visible>true</visible>
          <default>0</default>
          <constraints>
            <minimum>0</minimum>
            <step>1</step>
            <maximum>8</maximum>
          </constraints>
          <dependencies>
            <dependency type="visible" setting="device_connection" operator="is">0</dependency>
          </dependencies>
          <control type="spinner" format="integer"/>
        </setting>

AlwinEsch · 2024-04-03T14:51:21Z

pvr.rtlradio/resources/settings.xml.in

          <dependencies>
            <dependency type="visible" setting="device_connection" operator="is">1</dependency>
          </dependencies>
+          @SETTINGS_XML_IN_NO_USB_END@


I just added this as an afterthought. Found the case that USB was previously activated during the test and this was no longer displayed.

AlwinEsch · 2024-04-03T14:53:27Z

src/addon.cpp

      m_settings.device_connection =
          kodi::addon::GetSettingEnum("device_connection", device_connection::usb);
+#else
+      m_settings.device_connection = device_connection::rtltcp;
+#endif


Because USB was enabled, it is now forced to use tcp.

AlwinEsch · 2024-04-03T14:57:50Z

Maybe another settings text could be good🤔?
Using “- rtl_sdr” as the start looks kind of weird.

AlwinEsch · 2024-04-03T15:29:18Z

Have added second commit to add groups and to remove the "- ", further renamed with remove of "rtl_tcp " in text.

CMakeLists.txt

src/addon.cpp

This change it to settings.xml.in and set on add-on compile the settings usable or not. Is done by change the `<visible>` value and set of default connection type. The settings are still inside to prevent problems if something tries somewhere to read it. Further can for build the cmake configuration value "-DUSB_DEVICE_SUPPORT=0" used and if wanted to disable USB support.

ksooo

addon.cpp does not compile if USB_DEVICE_SUPPORT is not defined. Look at line 1440, there is an 'else if' without an 'if' then.

ksooo · 2024-04-04T10:51:43Z

Shouldn't Jenkinsfile be adjusted to build all platforms again?

…nged

AlwinEsch · 2024-04-04T12:59:37Z

Shouldn't Jenkinsfile be adjusted to build all platforms again?

Yes, now all OS works, have added a commit about.

AlwinEsch · 2024-04-04T13:02:44Z

addon.cpp does not compile if USB_DEVICE_SUPPORT is not defined. Look at line 1440, there is an 'else if' without an 'if' then.

Ups, is fixed now. But Jenkins brings now the next and iOS/tvOS become USB device support removed too.
It brings now:

In file included from os/darwin_usb.c:50:

os/darwin_usb.h:28:10: fatal error: 'IOKit/IOTypes.h' file not found

#include <IOKit/IOTypes.h>

Seems something updated in Jenkins on the morning.

AlwinEsch · 2024-04-04T13:15:48Z

On new added commit becomes the USB support on Android removed too and Jenkins now happy again on all OS.
EDIT: Happy on all OS after several additional commits.

This to fix build errors on Darwin Embedded system (iOS & tvOS).

This fix new Darwin Embedded error: ``` /Users/Shared/jenkins/workspace/binary-addons/kodi-tvos-aarch64-Omega/tools/depends/target/binary-addons/pvr.rtlradio/src/gui/channelsettings.cpp:38:10: fatal error: 'EGL/egl.h' file not found ^~~~~~~~~~~ 32 warnings and 1 error generated. ```

ksooo

LGTM

AlwinEsch requested a review from ksooo April 3, 2024 14:15

AlwinEsch force-pushed the settings.xml.in-change branch from 4b174cf to 61b3352 Compare April 3, 2024 14:33

AlwinEsch commented Apr 3, 2024

View reviewed changes

AlwinEsch force-pushed the settings.xml.in-change branch from 21cfa68 to dabc404 Compare April 3, 2024 15:27

ksooo reviewed Apr 3, 2024

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

src/addon.cpp Outdated Show resolved Hide resolved

AlwinEsch force-pushed the settings.xml.in-change branch from dca75fa to 4feb58c Compare April 3, 2024 21:38

ksooo requested changes Apr 4, 2024

View reviewed changes

AlwinEsch added 4 commits April 4, 2024 14:51

change settings to use groups and change strings to not show "- "

f514d49

set IP 127.0.0.1 as default in add-on setting

8de1d22

fix settings.xml entry hide in condition type disabled and region cha…

5912dd5

…nged

use all platforms in Jenkins

ca8b133

AlwinEsch force-pushed the settings.xml.in-change branch from 4feb58c to ca8b133 Compare April 4, 2024 12:56

dont use USB device support in iOS, tvOS and Android devices

bd173a6

AlwinEsch force-pushed the settings.xml.in-change branch from 10f18c4 to bd173a6 Compare April 4, 2024 13:23

AlwinEsch added 2 commits April 4, 2024 15:50

don't build libout123 in depends mpg123

6bcc582

This to fix build errors on Darwin Embedded system (iOS & tvOS).

ksooo approved these changes Apr 4, 2024

View reviewed changes

ksooo merged commit d71d712 into kodi-pvr:Omega Apr 4, 2024
8 checks passed

AlwinEsch deleted the settings.xml.in-change branch April 4, 2024 21:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

configure settings.xml during build to define USB not supported #17

configure settings.xml during build to define USB not supported #17

AlwinEsch commented Apr 3, 2024 •

edited

Loading

AlwinEsch Apr 3, 2024

AlwinEsch Apr 3, 2024

AlwinEsch commented Apr 3, 2024 •

edited

Loading

AlwinEsch commented Apr 3, 2024

ksooo left a comment

ksooo commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024 •

edited

Loading

ksooo left a comment

configure settings.xml during build to define USB not supported #17

configure settings.xml during build to define USB not supported #17

Conversation

AlwinEsch commented Apr 3, 2024 • edited Loading

AlwinEsch Apr 3, 2024

Choose a reason for hiding this comment

AlwinEsch Apr 3, 2024

Choose a reason for hiding this comment

AlwinEsch commented Apr 3, 2024 • edited Loading

AlwinEsch commented Apr 3, 2024

ksooo left a comment

Choose a reason for hiding this comment

ksooo commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024

AlwinEsch commented Apr 4, 2024 • edited Loading

ksooo left a comment

Choose a reason for hiding this comment

AlwinEsch commented Apr 3, 2024 •

edited

Loading

AlwinEsch commented Apr 3, 2024 •

edited

Loading

AlwinEsch commented Apr 4, 2024 •

edited

Loading