cosmetic conf changes

Author: comick

.github/workflows/test_tonio.yml

@@ -12,7 +12,7 @@ jobs:
     container: ubuntu:plucky
     strategy:
       matrix:
-        media: [vlc, opus]
+        media: [libvlc, opusfile]
     steps:
       - name: Install dependencies
         run: |

package/tonio/Config.in

@@ -13,19 +13,19 @@ menuconfig BR2_PACKAGE_TONIO
 if BR2_PACKAGE_TONIO
     choice
         prompt "Media backend"
-        default BR2_PACKAGE_TONIO_MEDIA_OPUS
+        default BR2_PACKAGE_TONIO_MEDIA_OPUSFILE
         help
             Select the media playback backend for Tonio.
 
-        config BR2_PACKAGE_TONIO_MEDIA_OPUS
-            bool "opusfile (lightweight, no VLC)"
+        config BR2_PACKAGE_TONIO_MEDIA_OPUSFILE
+            bool "opusfile (lightweight, only opus decoding)"
             select BR2_PACKAGE_OPUSFILE
             help
                 Use the opusfile library + ALSA PCM for Opus audio playback.
                 This is a lightweight backend that does not require VLC.
 
-        config BR2_PACKAGE_TONIO_MEDIA_VLC
-            bool "VLC (full libvlc)"
+        config BR2_PACKAGE_TONIO_MEDIA_LIBVLC
+            bool "libvlc (heavyweight, multiple formats supported)"
             select BR2_PACKAGE_VLC
             help
                 Use the full VLC media backend via libvlc.

package/tonio/tonio-1.0/CMakeLists.txt

@@ -3,13 +3,13 @@ project(tonio VERSION 1.0 LANGUAGES C)
 
 include(GNUInstallDirs)
 
-# Media backend option: opus (default) or vlc
-set(MEDIA_BACKEND "opus" CACHE STRING "Media backend: opus or vlc")
+# Media backend option: opusfile (default) or libvlc
+set(MEDIA_BACKEND "opusfile" CACHE STRING "Media backend: opusfile or libvlc")
 
 # Validate backend option
-if(NOT MEDIA_BACKEND STREQUAL "opus" AND NOT MEDIA_BACKEND STREQUAL "vlc")
+if(NOT MEDIA_BACKEND STREQUAL "opusfile" AND NOT MEDIA_BACKEND STREQUAL "libvlc")
     message(FATAL_ERROR "Unknown media backend '${MEDIA_BACKEND}'. "
-                        "Supported backends: opus, vlc")
+                        "Supported backends: opusfile, libvlc")
 endif()
 
 # Required packages via pkg-config 
@@ -32,14 +32,14 @@ if(NOT IW_LIBRARY)
 endif()
 
 # Media-backend-specific dependencies 
-if(MEDIA_BACKEND STREQUAL "vlc")
+if(MEDIA_BACKEND STREQUAL "libvlc")
     pkg_check_modules(VLC REQUIRED libvlc)
     set(MEDIA_SRC media_vlc.c)
-    set(MEDIA_BACKEND_VLC 1)
+    set(MEDIA_BACKEND_LIBVLC 1)
 else()
     pkg_check_modules(OPUSFILE REQUIRED opusfile)
     set(MEDIA_SRC media_opus.c)
-    set(MEDIA_BACKEND_OPUS 1)
+    set(MEDIA_BACKEND_OPUSFILE 1)
 endif()
 
 # Optional: check library for tests

package/tonio/tonio-1.0/config.h.in

@@ -1,8 +1,8 @@
 /* config.h.  Generated by cmake from config.h.in.  */
 
 /* Media backend defines (set via CMake compile definitions) */
-#cmakedefine MEDIA_BACKEND_OPUS
-#cmakedefine MEDIA_BACKEND_VLC
+#cmakedefine MEDIA_BACKEND_OPUSFILE
+#cmakedefine MEDIA_BACKEND_LIBVLC
 
 /* Package metadata */
 #define PACKAGE "@PROJECT_NAME@"

package/tonio/tonio-1.0/src/CMakeLists.txt

@@ -27,7 +27,7 @@ target_link_libraries(tonio PRIVATE
 )
 
 # Media-backend-specific libraries
-if(MEDIA_BACKEND STREQUAL "vlc")
+if(MEDIA_BACKEND STREQUAL "libvlc")
     target_link_libraries(tonio PRIVATE ${VLC_LIBRARIES})
     target_include_directories(tonio PRIVATE ${VLC_INCLUDE_DIRS})
 else()

package/tonio/tonio.mk

@@ -10,12 +10,12 @@ TONIO_SITE_METHOD = local
 
 TONIO_DEPENDENCIES = host-pkgconf alsa-lib libgpiod2 libmicrohttpd libconfuse wireless_tools
 
-ifeq ($(BR2_PACKAGE_TONIO_MEDIA_OPUS),y)
+ifeq ($(BR2_PACKAGE_TONIO_MEDIA_OPUSFILE),y)
 	TONIO_DEPENDENCIES += opusfile
-	TONIO_CONF_OPTS += -DMEDIA_BACKEND=opus
-else ifeq ($(BR2_PACKAGE_TONIO_MEDIA_VLC),y)
+	TONIO_CONF_OPTS += -DMEDIA_BACKEND=opusfile
+else ifeq ($(BR2_PACKAGE_TONIO_MEDIA_LIBVLC),y)
 	TONIO_DEPENDENCIES += vlc
-	TONIO_CONF_OPTS += -DMEDIA_BACKEND=vlc
+	TONIO_CONF_OPTS += -DMEDIA_BACKEND=libvlc
 endif
 
 define TONIO_INSTALL_INIT_SYSV