mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-07-10 11:05:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Push before merge

Browse Source
This commit is contained in:
Ryzerth
2020-09-06 15:39:09 +02:00
parent 7190acfe9e
commit c0825dbeeb
35 changed files with 90 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -44,9 +44,15 @@ int main() {
spdlog::info("SDR++ v" VERSION_STR);
#ifdef _WIN32
config::setRootDirectory(".");
#else
config::setRootDirectory("/etc/sdrpp");
#endif
// Load config
spdlog::info("Loading config");
config::load("config.json");
config::load(config::getRootDirectory() + "/config.json");
config::startAutoSave();
// Setup window
@ -80,7 +86,7 @@ int main() {
// Load app icon
GLFWimage icons[10];
icons[0].pixels = stbi_load("res/icons/sdrpp.png", &icons[0].width, &icons[0].height, 0, 4);
icons[0].pixels = stbi_load((config::getRootDirectory() + "/res/icons/sdrpp.png").c_str(), &icons[0].width, &icons[0].height, 0, 4);
icons[1].pixels = (unsigned char*)malloc(16 * 16 * 4); icons[1].width = icons[1].height = 16;
icons[2].pixels = (unsigned char*)malloc(24 * 24 * 4); icons[2].width = icons[2].height = 24;
icons[3].pixels = (unsigned char*)malloc(32 * 32 * 4); icons[3].width = icons[3].height = 32;
@ -127,10 +133,10 @@ int main() {
icons::load();
spdlog::info("Loading band plans");
bandplan::loadFromDir("bandplans");
bandplan::loadFromDir(config::getRootDirectory() + "/bandplans");
spdlog::info("Loading band plans color table");
bandplan::loadColorTable("band_colors.json");
bandplan::loadColorTable(config::getRootDirectory() + "/band_colors.json");
windowInit();