From 5742aaedba969d927617613ba2206b9acdca6f38 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 4 May 2024 23:25:35 +0200 Subject: [PATCH] rename SHOUTCAST_DEV_KEY => SHOUTCAST_DEV_ID Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6559455ce8e95f12dbd23ba47d17295445774242 Author: vanhofen Date: 2024-05-04 (Sat, 04 May 2024) Origin message was: ------------------ - rename SHOUTCAST_DEV_KEY => SHOUTCAST_DEV_ID ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 22 +++++++++++----------- src/gui/miscsettings_menu.cpp | 2 +- src/neutrino.cpp | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index bf9243e69..542fbb8f2 100644 --- a/configure.ac +++ b/configure.ac @@ -261,19 +261,19 @@ fi # omdb end # shoutcast -AC_ARG_WITH(shoutcast-dev-key, - AS_HELP_STRING([--with-shoutcast-dev-key=KEY], [API dev key to get stream data lists from ShoutCast service]), - [SHOUTCAST_DEV_KEY="$withval"], - [SHOUTCAST_DEV_KEY=""]) -AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_KEY], ["$SHOUTCAST_DEV_KEY"], [API dev key to get stream data lists from ShoutCast service]) +AC_ARG_WITH(shoutcast-dev-id, + AS_HELP_STRING([--with-shoutcast-dev-id=ID], [Developer ID to get stream data lists from ShoutCast API]), + [SHOUTCAST_DEV_ID="$withval"], + [SHOUTCAST_DEV_ID=""]) +AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_ID], ["$SHOUTCAST_DEV_ID"], [Developer ID to get stream data lists from ShoutCast API]) -AC_ARG_ENABLE([shoutcast-key-manage], - AS_HELP_STRING([--enable-shoutcast-key-manage], [enable manage of api dev key to get stream data lists from ShoutCast service via gui @<:@default=yes@:>@]), - [enable_shoutcast_key_manage="$enableval"], - [enable_shoutcast_key_manage="yes"]) +AC_ARG_ENABLE([shoutcast-id-manage], + AS_HELP_STRING([--enable-shoutcast-id-manage], [enable manage of dev id to get stream data lists from ShoutCast service via gui @<:@default=yes@:>@]), + [enable_shoutcast_id_manage="$enableval"], + [enable_shoutcast_id_manage="yes"]) -if test "$enable_shoutcast_key_manage" = "yes" ; then - AC_DEFINE([ENABLE_SHOUTCAST_KEY_MANAGE], 1, [enable manage of api dev key to get stream data lists from ShoutCast service via gui]) +if test "$enable_shoutcast_id_manage" = "yes" ; then + AC_DEFINE([ENABLE_SHOUTCAST_ID_MANAGE], 1, [enable manage of dev id to get stream data lists from ShoutCast service via gui]) fi # shoutcast end diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 1b2d9ba8f..34a524abf 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -674,7 +674,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices() shoutcast_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SHOUTCAST_ENABLED); ms_oservices->addItem(shoutcast_onoff); -#if ENABLE_SHOUTCAST_KEY_MANAGE +#if ENABLE_SHOUTCAST_ID_MANAGE changeNotify(LOCALE_SHOUTCAST_DEV_ID, NULL); CKeyboardInput shoutcast_dev_id_input(LOCALE_SHOUTCAST_DEV_ID, &g_settings.shoutcast_dev_id, 16, this); CMenuForwarder *mf_sc = new CMenuForwarder(LOCALE_SHOUTCAST_DEV_ID, true, shoutcast_dev_id_short, &shoutcast_dev_id_input); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e4367cc3f..987427cf7 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1150,8 +1150,8 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.omdb_enabled = configfile.getInt32("omdb_enabled", 1); g_settings.omdb_enabled = g_settings.omdb_enabled && CApiKey::check_omdb_api_key(); - g_settings.shoutcast_dev_id = SHOUTCAST_DEV_KEY; -#if ENABLE_SHOUTCAST_KEY_MANAGE + g_settings.shoutcast_dev_id = SHOUTCAST_DEV_ID; +#if ENABLE_SHOUTCAST_ID_MANAGE g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id", g_settings.shoutcast_dev_id.empty() ? "XXXXXXXXXXXXXXXX" : g_settings.shoutcast_dev_id); #endif g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); @@ -2048,7 +2048,7 @@ void CNeutrinoApp::saveSetup(const char *fname) #endif configfile.setInt32("omdb_enabled", g_settings.omdb_enabled); -#if ENABLE_SHOUTCAST_KEY_MANAGE +#if ENABLE_SHOUTCAST_ID_MANAGE configfile.setString("shoutcast_dev_id", g_settings.shoutcast_dev_id); #endif configfile.setInt32("shoutcast_enabled", g_settings.shoutcast_enabled);