Skip to content

Fix some encoding issues (mostly on Windows) #4401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhysSong merged 6 commits into from
Jul 6, 2018
Merged

Fix some encoding issues (mostly on Windows) #4401

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
792e478
Fix file name encoding issues with VST on Windows
PhysSong May 28, 2018
9d0aae2
Fix file name encoding issues with ZynAddSubFX on Windows
PhysSong May 28, 2018
ddcae47
Fix sample file loading on Windows
PhysSong May 29, 2018
1af0f08
Fix WAV exporting on Windows
PhysSong May 29, 2018
3e538d5
Fix MIDI import encoding issue on Windows
PhysSong Jun 4, 2018
62d505b
Improve STK rawwave path encoding handling
PhysSong Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix file name encoding issues with ZynAddSubFX on Windows
  • Loading branch information
@PhysSong
PhysSong committed Jul 5, 2018
commit 9d0aae2708aed2fc0a18b16f31fef05f2496fd26
19 changes: 12 additions & 7 deletions plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@
#include <sstream>
#include <cstdarg>
#include <zlib.h>
#include "lmmsconfig.h"
#include "../globals.h"
#include "Util.h"

// Include LMMS headers
#include "lmmsconfig.h"
#include "IoHelper.h"


struct XmlData
{
Expand Down Expand Up @@ -193,11 +196,12 @@ int QtXmlWrapper::dosavefile(const char *filename,
int compression,
const char *xmldata) const
{
FILE *file = F_OPEN_UTF8(std::string(filename), "w");
if(file == NULL) {
return -1;
}

if(compression == 0) {
FILE *file;
file = fopen(filename, "w");
if(file == NULL)
return -1;
fputs(xmldata, file);
fclose(file);
}
Expand All @@ -210,7 +214,7 @@ int QtXmlWrapper::dosavefile(const char *filename,
snprintf(options, 10, "wb%d", compression);

gzFile gzfile;
gzfile = gzopen(filename, options);
gzfile = gzdopen(fileToDescriptor(file), options);
if(gzfile == NULL)
return -1;
gzputs(gzfile, xmldata);
Expand Down Expand Up @@ -313,7 +317,8 @@ int QtXmlWrapper::loadXMLfile(const std::string &filename)
char *QtXmlWrapper::doloadfile(const std::string &filename) const
{
char *xmldata = NULL;
gzFile gzfile = gzopen(filename.c_str(), "rb");

gzFile gzfile = gzdopen(fileToDescriptor(F_OPEN_UTF8(filename, "rb")), "rb");

if(gzfile != NULL) { //The possibly compressed file opened
std::stringstream strBuf; //reading stream
Expand Down