Feature/unified eth with player state

components/lightsnapcast/player.c

@@ -499,12 +499,17 @@ int init_player(i2s_std_gpio_config_t pin_config0_, i2s_port_t i2sNum_, void (*s
 
   // create message queue to inform task of changed settings
   snapcastSettingQueueHandle = xQueueCreate(1, sizeof(playerSetting_t));
+  if (snapcastSettingQueueHandle == NULL) {
+    ESP_LOGE(TAG, "Failed to create snapcast settings queue");
+    return -1;
+  }
 
   if (playerStateMux == NULL) {
     playerStateMux = xSemaphoreCreateMutex();
     xSemaphoreGive(playerStateMux);
   }
 
+
   // create semaphore for time diff buffer to server
   if (latencyBufSemaphoreHandle == NULL) {
     latencyBufSemaphoreHandle = xSemaphoreCreateMutex();
@@ -593,6 +598,15 @@ int start_player() {
     entries -= ((i2sDmaBufMaxLen * i2sDmaBufCnt) / scSet->chkInFrames);
 
     pcmChkQHdl = xQueueCreate(entries, sizeof(pcm_chunk_message_t *));
+    if (pcmChkQHdl == NULL) {
+      ESP_LOGE(TAG, "Failed to create pcm chunk queue (%d entries)", entries);
+      tg0_timer_deinit();
+#if CONFIG_PM_ENABLE
+      esp_pm_lock_release(player_pm_lock_handle);
+#endif
+      playerStarted = false;
+      return -1;
+    }
 
     ESP_LOGI(TAG, "created new queue with %d", entries);
   }
@@ -1544,10 +1558,16 @@ static void player_task(void *pvParameters) {
           // so we can save a little RAM here
           entries -= (i2sDmaBufMaxLen * i2sDmaBufCnt) / __scSet.chkInFrames;
 
+          QueueHandle_t newQHdl = xQueueCreate(entries, sizeof(pcm_chunk_message_t *));
+          if (newQHdl == NULL) {
+            // Don't overwrite pcmChkQHdl with NULL — surrounding code (and other
+            // tasks) would then dereference a NULL handle. Abort the player task
+            // here, same pattern as the player_setup_i2s failure above.
+            ESP_LOGE(TAG, "Failed to create pcm chunk queue (%d entries); aborting player task", entries);
+            return;
+          }
           queueCreatedWithChkInFrames = __scSet.chkInFrames;
-
-          pcmChkQHdl = xQueueCreate(entries, sizeof(pcm_chunk_message_t *));
-
+          pcmChkQHdl = newQHdl;
           ESP_LOGI(TAG, "created new queue with %d", entries);
         }
 

components/lightsnapcast/snapcast_protocol_parser.c

@@ -193,7 +193,7 @@ parser_return_state_t parse_codec_header_message(
     if (!read_data(parser, (uint8_t *)codecString, sizeof(codecString)-1)) return PARSER_RESTART_CONNECTION;
 
     codecString[sizeof(codecString)-1] = 0; // null terminate
-    ESP_LOGE(TAG, "Codec : %s... not supported", codecString);
+    ESP_LOGE(TAG, "Codec : %s... not supported (length: %lu)", codecString, codecStringLen);
     ESP_LOGI(TAG,
              "Change encoder codec to "
              "opus, flac or pcm in "

components/network_interface/CMakeLists.txt

@@ -1,3 +1,18 @@
-idf_component_register(SRCS "network_interface.c" "eth_interface.c" "wifi_interface.c"
+set(SRCS "network_interface.c" "wifi_interface.c")
+
+# Only include Ethernet interface if Ethernet is enabled
+if(CONFIG_SNAPCLIENT_USE_INTERNAL_ETHERNET OR CONFIG_SNAPCLIENT_USE_SPI_ETHERNET)
+    list(APPEND SRCS "eth_interface.c")
+endif()
+
+set(PRIV_DEPS driver esp_wifi esp_eth esp_netif esp_timer nvs_flash improv_wifi settings_manager lwip)
+
+# ping is only needed when Ethernet is enabled (used by eth_interface.c)
+if(CONFIG_SNAPCLIENT_USE_INTERNAL_ETHERNET OR CONFIG_SNAPCLIENT_USE_SPI_ETHERNET)
+    list(APPEND PRIV_DEPS ping)
+endif()
+
+idf_component_register(SRCS ${SRCS}
                        INCLUDE_DIRS "include"
-                       PRIV_REQUIRES driver esp_wifi esp_eth esp_netif esp_timer nvs_flash improv_wifi)
+                       PRIV_INCLUDE_DIRS "priv_include"
+                       PRIV_REQUIRES ${PRIV_DEPS})