Merge remote-tracking branch 'origin/master' into master-cmake

Conflicts:
	components/raop/raop.c
	components/raop/rtp.c
This commit is contained in:
Sebastien
2020-03-10 10:52:18 -04:00
13 changed files with 950 additions and 897 deletions

View File

@@ -116,7 +116,8 @@ static void jack_handler_default(void *id, button_event_e event, button_press_e
*
*/
bool jack_inserted_svc (void) {
return button_is_pressed(jack.gpio, NULL);
if (jack.gpio != -1) return button_is_pressed(jack.gpio, NULL);
else return true;
}
/****************************************************************************************