weather: add WEATHER_DEFAULT defines

Origin commit data
------------------
Branch: ni/coolstream
Commit: 868d839118
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-01-21 (Fri, 21 Jan 2022)

Origin message was:
------------------
- weather: add WEATHER_DEFAULT defines

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-01-21 23:44:35 +01:00
parent 4f0e109331
commit 94158d4c07
4 changed files with 13 additions and 7 deletions

View File

@@ -104,6 +104,7 @@
#include "gui/videosettings.h"
#include "gui/audio_select.h"
#include "gui/weather.h"
#include "gui/weather_setup.h"
#include "gui/webchannels_setup.h"
#include "gui/widget/hintbox.h"
@@ -1113,8 +1114,8 @@ int CNeutrinoApp::loadSetup(const char *fname)
g_settings.weather_enabled = configfile.getInt32("weather_enabled", 1);
g_settings.weather_enabled = g_settings.weather_enabled && CApiKey::check_weather_api_key();
g_settings.weather_location = configfile.getString("weather_location", "52.52,13.40");
g_settings.weather_city = configfile.getString("weather_city", "Berlin");
g_settings.weather_city = configfile.getString("weather_city", WEATHER_DEFAULT_CITY);
g_settings.weather_location = configfile.getString("weather_location", WEATHER_DEFAULT_LOCATION);
g_settings.youtube_dev_id = YT_DEV_KEY;
#if ENABLE_YOUTUBE_KEY_MANAGE
@@ -2144,8 +2145,8 @@ void CNeutrinoApp::saveSetup(const char *fname)
#endif
configfile.setInt32("weather_enabled", g_settings.weather_enabled);
configfile.setString("weather_location", g_settings.weather_location);
configfile.setString("weather_city", g_settings.weather_city);
configfile.setString("weather_location", g_settings.weather_location);
#if ENABLE_YOUTUBE_KEY_MANAGE
configfile.setString("youtube_dev_id", g_settings.youtube_dev_id);