feat(radio): refactor of switch handling to better support customisable switches (#6095)
Co-authored-by: philmoz <phil.a.mitchell@gmail.com> Co-authored-by: 3djc <3djc@gh.com> Co-authored-by: elecpower <elecpower@users.noreply.github.com>
This commit is contained in:
co-authored by
philmoz
3djc
elecpower
parent
28833f42e6
commit
0c8c39b134
@@ -58,7 +58,7 @@ bool getSwitchAudioFile(char* path, swsrc_t index)
|
||||
|
||||
if (index <= SWSRC_LAST_SWITCH) {
|
||||
div_t swinfo = switchInfo(index);
|
||||
auto sw_name = switchGetName(swinfo.quot);
|
||||
auto sw_name = switchGetDefaultName(swinfo.quot);
|
||||
if (!sw_name) return false;
|
||||
str = strAppend(str, sw_name);
|
||||
str = strAppend(str, _sw_positions[swinfo.rem]);
|
||||
@@ -116,9 +116,9 @@ bool matchModeAudioFile(const char* filename, int& index, int& event)
|
||||
bool matchSwitchAudioFile(const char* filename, int& sw_pos)
|
||||
{
|
||||
// Switches Audio Files <switchname>-[up|mid|down].wav
|
||||
for (int i = 0; i < switchGetMaxSwitches(); i++) {
|
||||
for (int i = 0; i < switchGetMaxAllSwitches(); i++) {
|
||||
auto* c = filename;
|
||||
auto sw_name = switchGetName(i);
|
||||
auto sw_name = switchGetDefaultName(i);
|
||||
auto sw_name_len = strlen(sw_name);
|
||||
if (strncasecmp(c, sw_name, sw_name_len) != 0) continue;
|
||||
c += sw_name_len;
|
||||
|
||||
Reference in New Issue
Block a user