comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into firpbch2_mode

This commit is contained in:
Charles J. Cliffe 2018-02-20 00:17:37 -05:00
parent 8cb5e9e244 7f732735ce
commit b193456ccb
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/AudioFileWAV.cpp
View File

@ -106,7 +106,7 @@ bool AudioFileWAV::closeFile()
// Fix the data chunk header to contain the data size
outputFileStream.seekp(dataChunkPos + 4);
write_word(outputFileStream, file_length - dataChunkPos + 8);
write_word(outputFileStream, file_length - (dataChunkPos + 8), 4);
// Fix the file header to contain the proper RIFF chunk size, which is (file size - 8) bytes
outputFileStream.seekp(0 + 4);

39
src/util/GLFont.cpp
View File

@ -15,7 +15,7 @@
#endif
#ifndef RES_FOLDER
#define RES_FOLDER ""
#define RES_FOLDER L""
#endif
#define GC_DRAW_COUNT_PERIOD 50
@ -216,21 +216,30 @@ void GLFont::loadFontOnce() {
#else
wxString resourceFolder = RES_FOLDER;
#endif
//full font file path
wxFileName exePath = wxFileName(wxStandardPaths::Get().GetExecutablePath());
//1) First try : RES_FOLDER/fonts/*
wxFileName fontDefFileName = wxFileName(resourceFolder + L"/" + fontDefFileSource);
bool fontFilePathFound = fontDefFileName.Exists();
// 2) Second try: [Cubic exe path]/RES_FOLDER/fonts/*
if (!fontFilePathFound) {
fontDefFileName = wxFileName(exePath.GetPath() + L"/" + RES_FOLDER + L"/" + fontDefFileSource);
fontFilePathFound = fontDefFileName.Exists();
}
// 3) Third try: [Cubic exe path]/fonts/*
if (!fontFilePathFound) {
fontDefFileName = wxFileName(exePath.GetPath() + L"/" + fontDefFileSource);
fontFilePathFound = fontDefFileName.Exists();
}
if (!fontDefFileName.Exists()) {
wxFileName exePath = wxFileName(wxStandardPaths::Get().GetExecutablePath());
if (fontFilePathFound) {
//Full Path where the fonts are, including file name
fontDefFileName = wxFileName(exePath.GetPath() + L"/"+ fontDefFileSource);
if (!fontDefFileName.FileExists()) {
std::cout << "Font file " << fontDefFileName.GetFullPath() << " does not exist?" << std::endl;
return;
}
if (!fontDefFileName.IsFileReadable()) {
std::cout << "Font file " << fontDefFileName.GetFullPath() << " is not readable?" << std::endl;
return;
@ -238,8 +247,8 @@ void GLFont::loadFontOnce() {
}
else {
if (!fontDefFileName.IsFileReadable()) {
std::cout << "Font file " << fontDefFileName.GetFullPath() << " is not readable?" << std::endl;
if (!fontDefFileName.FileExists()) {
std::cout << "Font file " << fontDefFileName.GetFullPath() << " does not exist?" << std::endl;
return;
}
}