Rename function and cleanup code.

Author: philmoz

radio/src/gui/128x64/radio_setup.cpp

@@ -403,7 +403,7 @@ void menuRadioSetup(event_t event)
         if (attr)
           g_eeGeneral.volumeSrc = checkIncDec(event, g_eeGeneral.volumeSrc,
                 MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
-                isSourceSwitchOrPotAvailable);
+                isSourceAvailableForBacklightOrVolume);
         break;
 
       case ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE:
@@ -593,7 +593,7 @@ void menuRadioSetup(event_t event)
         if (attr)
           g_eeGeneral.backlightSrc = checkIncDec(event, g_eeGeneral.backlightSrc,
                 MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
-                isSourceSwitchOrPotAvailable);
+                isSourceAvailableForBacklightOrVolume);
         break;
 
       case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE:

radio/src/gui/212x64/radio_setup.cpp

@@ -423,7 +423,7 @@ void menuRadioSetup(event_t event)
         if (attr)
           g_eeGeneral.volumeSrc = checkIncDec(event, g_eeGeneral.volumeSrc,
                 MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
-                isSourceSwitchOrPotAvailable);
+                isSourceAvailableForBacklightOrVolume);
         break;
 
       case ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE:
@@ -591,7 +591,7 @@ void menuRadioSetup(event_t event)
         if (attr)
           g_eeGeneral.backlightSrc = checkIncDec(event, g_eeGeneral.backlightSrc,
                 MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
-                isSourceSwitchOrPotAvailable);
+                isSourceAvailableForBacklightOrVolume);
         break;
 
       case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE:

radio/src/gui/colorlcd/radio/radio_setup.cpp

@@ -282,7 +282,7 @@ static SetupLineDef soundPageSetupLines[] = {
     [](Window* parent, coord_t x, coord_t y) {
       auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
               GET_SET_DEFAULT(g_eeGeneral.volumeSrc), true);
-      choice->setAvailableHandler(isSourceSwitchOrPotAvailable);
+      choice->setAvailableHandler(isSourceAvailableForBacklightOrVolume);
       new ControlTextOverride(parent, x, y, FUNCTION_VOLUME);
       }
   },
@@ -520,7 +520,7 @@ class BacklightPage : public SubPage
     setupLine(STR_CONTROL, [=](Window* parent, coord_t x, coord_t y) {
           auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
                   GET_SET_DEFAULT(g_eeGeneral.backlightSrc), true);
-          choice->setAvailableHandler(isSourceSwitchOrPotAvailable);
+          choice->setAvailableHandler(isSourceAvailableForBacklightOrVolume);
           new ControlTextOverride(parent, x, y, FUNCTION_BACKLIGHT);
         });
 

radio/src/gui/gui_common.cpp

@@ -308,10 +308,9 @@ bool isSourceAvailable(int source)
             );
 }
 
-bool isSourceSwitchOrPotAvailable(int source)
+bool isSourceAvailableForBacklightOrVolume(int source)
 {
-  if (source == MIXSRC_NONE) return true;
-  return checkSourceAvailable(source, SRC_SWITCH | SRC_POT);
+  return checkSourceAvailable(source, SRC_SWITCH | SRC_POT | SRC_NONE);
 }
 
 bool isLogicalSwitchAvailable(int index)

radio/src/gui/gui_common.h

@@ -60,7 +60,7 @@ bool isInputAvailable(int input);
 bool isThrottleSourceAvailable(int source);
 bool isLogicalSwitchAvailable(int index);
 bool isAssignableFunctionAvailable(int function);
-bool isSourceSwitchOrPotAvailable(int source);
+bool isSourceAvailableForBacklightOrVolume(int source);
 bool isSourceAvailable(int source);
 int timersSetupCount();
 bool isTimerSourceAvailable(int source);