zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 06:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2.1.x' into master

Browse source
This commit is contained in:
derselbst 2021-01-29 14:42:04 +01:00
commit b84e8b83e0
4 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -29,7 +29,7 @@ set ( PACKAGE "fluidsynth" )
# FluidSynth package version
set ( FLUIDSYNTH_VERSION_MAJOR 2 )
set ( FLUIDSYNTH_VERSION_MINOR 1 )
set ( FLUIDSYNTH_VERSION_MICRO 6 )
set ( FLUIDSYNTH_VERSION_MICRO 7 )
set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )

4
doc/fluidsynth-v20-devdoc.txt
View file

@ -8,8 +8,8 @@
\author David Henningsson
\author Tom Moebert
\author Copyright © 2003-2021 Peter Hanappe, Conrad Berhörster, Antoine Schmitt, Pedro López-Cabanillas, Josh Green, David Henningsson, Tom Moebert
\version Revision 2.1.6
\date 2021-01-02
\version Revision 2.1.7
\date 2021-01-29
All the source code examples in this document are in the public domain; you can use them as you please. This document is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ . The FluidSynth library is distributed under the GNU Lesser General Public License. A copy of the GNU Lesser General Public License is contained in the FluidSynth package; if not, visit http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

25
src/bindings/fluid_cmd.c
View file

@ -2079,14 +2079,10 @@ fluid_handle_get(void *data, int ac, char **av, fluid_ostream_t out)
case FLUID_STR_TYPE:
{
char *s;
char *s = NULL;
fluid_settings_dupstr(handler->settings, av[0], &s); /* ++ alloc string */
fluid_ostream_printf(out, "%s\n", s ? s : "NULL");
if(s)
{
FLUID_FREE(s); /* -- free string */
}
FLUID_FREE(s); /* -- free string */
break;
}
@ -2164,14 +2160,10 @@ static void fluid_handle_settings_iter2(void *data, const char *name, int type)
case FLUID_STR_TYPE:
{
char *s;
char *s = NULL;
fluid_settings_dupstr(d->settings, name, &s); /* ++ alloc string */
fluid_ostream_printf(d->out, "%s\n", s ? s : "NULL");
if(s)
{
FLUID_FREE(s); /* -- free string */
}
FLUID_FREE(s); /* -- free string */
break;
}
@ -2298,19 +2290,16 @@ fluid_handle_info(void *d, int ac, char **av, fluid_ostream_t out)
case FLUID_STR_TYPE:
{
char *s;
char *s = NULL;
fluid_settings_dupstr(settings, av[0], &s); /* ++ alloc string */
fluid_ostream_printf(out, "%s:\n", av[0]);
fluid_ostream_printf(out, "Type: string\n");
fluid_ostream_printf(out, "Value: %s\n", s ? s : "NULL");
FLUID_FREE(s); /* -- free string */
fluid_settings_getstr_default(settings, av[0], &s);
fluid_ostream_printf(out, "Default value: %s\n", s);
if(s)
{
FLUID_FREE(s);
}
data.out = out;
data.first = 1;
fluid_ostream_printf(out, "Options: ");

2
src/synth/fluid_synth.c
View file

@ -544,7 +544,6 @@ fluid_sample_timer_t *new_fluid_sample_timer(fluid_synth_t *synth, fluid_timer_c
}
fluid_sample_timer_reset(synth, result);
result->isfinished = 0;
result->data = data;
result->callback = callback;
result->next = synth->sample_timers;
@ -576,6 +575,7 @@ void delete_fluid_sample_timer(fluid_synth_t *synth, fluid_sample_timer_t *timer
void fluid_sample_timer_reset(fluid_synth_t *synth, fluid_sample_timer_t *timer)
{
timer->starttick = fluid_synth_get_ticks(synth);
timer->isfinished = 0;
}
/***************************************************************