mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-25 20:07:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed warnings on linux

Browse Source
This commit is contained in:
AlexandreRouma
2020-09-20 01:36:25 +02:00
parent 2aaf254565
commit ab8ce4c53f
9 changed files with 59 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/config.cpp
View File

@ -32,7 +32,7 @@ namespace config {
}
_path = path;
std::ifstream file(path.c_str());
config << file;
file >> config;
file.close();
}

4
core/src/gui/bandplan.cpp
View File

@ -71,7 +71,7 @@ namespace bandplan {
void loadBandPlan(std::string path) {
std::ifstream file(path.c_str());
json data;
data << file;
file >> data;
file.close();
BandPlan_t plan = data.get<BandPlan_t>();
@ -114,7 +114,7 @@ namespace bandplan {
}
std::ifstream file(path.c_str());
json data;
data << file;
file >> data;
file.close();
colorTable = data.get<std::map<std::string, BandPlanColor_t>>();

10
core/src/gui/icons.cpp
View File

@ -11,7 +11,7 @@ namespace icons {
GLuint loadTexture(std::string path) {
int w,h,n;
stbi_uc* data = stbi_load(path.c_str(), &w, &h, &n, NULL);
stbi_uc* data = stbi_load(path.c_str(), &w, &h, &n, 0);
GLuint texId;
glGenTextures(1, &texId);
glBindTexture(GL_TEXTURE_2D, texId);
@ -24,9 +24,9 @@ namespace icons {
}
void load() {
LOGO = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/sdrpp.png");
PLAY = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/play.png");
STOP = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/stop.png");
MENU = (ImTextureID)loadTexture(config::getRootDirectory() + "/res/icons/menu.png");
LOGO = (ImTextureID)(uintptr_t)loadTexture(config::getRootDirectory() + "/res/icons/sdrpp.png");
PLAY = (ImTextureID)(uintptr_t)loadTexture(config::getRootDirectory() + "/res/icons/play.png");
STOP = (ImTextureID)(uintptr_t)loadTexture(config::getRootDirectory() + "/res/icons/stop.png");
MENU = (ImTextureID)(uintptr_t)loadTexture(config::getRootDirectory() + "/res/icons/menu.png");
}
}

3
core/src/gui/waterfall.cpp
View File

@ -199,7 +199,7 @@ namespace ImGui {
ImVec2 dragOrigin(mousePos.x - drag.x, mousePos.y - drag.y);
bool mouseHovered, mouseHeld;
bool mouseClicked = ImGui::ButtonBehavior(ImRect(fftAreaMin, fftAreaMax), ImGuiID("WaterfallID"), &mouseHovered, &mouseHeld,
bool mouseClicked = ImGui::ButtonBehavior(ImRect(fftAreaMin, fftAreaMax), GetID("WaterfallID"), &mouseHovered, &mouseHeld,
ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_PressedOnClick);
bool draging = ImGui::IsMouseDragging(ImGuiMouseButton_Left) && ImGui::IsWindowFocused();
@ -650,7 +650,6 @@ namespace ImGui {
}
void WaterfallVFO::setOffset(float offset) {
printf("WaterfallVFO::SetOffset: %p\n", this);
generalOffset = offset;
if (reference == REF_CENTER) {
centerOffset = offset;

2
core/src/module.cpp
View File

@ -116,7 +116,7 @@ namespace mod {
}
std::ifstream file(path.c_str());
json data;
data << file;
file >> data;
file.close();
std::map<std::string, std::string> list = data.get<std::map<std::string, std::string>>();

1
core/src/signal_path/vfo_manager.cpp
View File

@ -9,7 +9,6 @@ VFOManager::VFO::VFO(std::string name, int reference, float offset, float bandwi
wtfVFO->setBandwidth(bandwidth);
wtfVFO->setOffset(offset);
output = dspVFO->output;
printf("Created VFO: %p", wtfVFO);
gui::waterfall.vfos[name] = wtfVFO;
}