Skip to content

Commit

Permalink
Revert "- Attempt to cope with utf8 encoded strings in fluid_settings…
Browse files Browse the repository at this point in the history
… (GH issue #82 possible fix)"

This reverts commit 1ec61bf.
  • Loading branch information
rncbc committed Apr 30, 2024
1 parent b728bf6 commit 853a1ad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/qsynthSetupForm.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// qsynthSetupForm.cpp
//
/****************************************************************************
Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -52,7 +52,7 @@ static void qsynth_settings_foreach_option (
{
qsynth_settings_data *pData = (qsynth_settings_data *) pvData;

pData->options.append(QString::fromUtf8(pszOption));
pData->options.append(pszOption);
}

static void qsynth_settings_foreach (
Expand Down Expand Up @@ -163,24 +163,24 @@ static void qsynth_settings_foreach (
#else
::fluid_settings_getstr(pFluidSettings, pszName, &pszCurrent);
#endif
(pData->pListItem)->setText(iCol++, QString::fromUtf8(pszCurrent));
(pData->pListItem)->setText(iCol++, QString::fromUtf8(pszDefault));
(pData->pListItem)->setText(iCol++, pszCurrent);
(pData->pListItem)->setText(iCol++, pszDefault);
(pData->pListItem)->setText(iCol++, QString());
(pData->pListItem)->setText(iCol++, QString());
#ifdef CONFIG_FLUID_SETTINGS_DUPSTR
#ifdef CONFIG_FLUID_FREE
#ifdef CONFIG_FLUID_FREE
::fluid_free(pszCurrent);
#else
#else
::free(pszCurrent);
#endif
#endif
#endif
break;
}}

// Check for options.
pData->options.clear();
::fluid_settings_foreach_option(pFluidSettings, pszName, pvData, qsynth_settings_foreach_option);
(pData->pListItem)->setText(iCol++, pData->options.join(' '));
(pData->pListItem)->setText(iCol++, pData->options.join(" "));
}


Expand Down
2 changes: 1 addition & 1 deletion src/qsynthSetupForm.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// qsynthSetupForm.h
//
/****************************************************************************
Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down
2 changes: 1 addition & 1 deletion src/qsynthSetupForm.ui
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<author>rncbc aka Rui Nuno Capela</author>
<comment>qsynth - A fluidsynth Qt GUI Interface.

Copyright (C) 2003-2024, rncbc aka Rui Nuno Capela. All rights reserved.
Copyright (C) 2003-2022, rncbc aka Rui Nuno Capela. All rights reserved.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down

0 comments on commit 853a1ad

Please sign in to comment.