Skip to content

Commit

Permalink
Merge branch '1.13.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
nickdowell committed Apr 15, 2024
2 parents 2bb61fe + 06b9094 commit c6f76df
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions NEWS
@@ -1,3 +1,8 @@
amsynth 1.13.3 --

- Fixed an error when building DSSI GUI with GCC 14 or Clang.


amsynth 1.13.2 -- 2022-02-01

- Fixed a packaging error that cause preset banks to be omitted.
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
@@ -1,7 +1,7 @@
dnl
dnl amsynth configure.ac
dnl
dnl Copyright (C) 2001-2022 Nick Dowell
dnl Copyright (C) 2001 Nick Dowell
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Expand All @@ -18,9 +18,9 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl

AC_COPYRIGHT([Copyright (C) 2001-2023 Nick Dowell])
AC_COPYRIGHT([Copyright (C) 2001-2024 Nick Dowell])

AC_INIT([amsynth], [1.13.2],
AC_INIT([amsynth], [1.13.3],
[https://github.com/amsynth/amsynth/issues],
[amsynth],
[https://github.com/amsynth/amsynth])
Expand Down
14 changes: 7 additions & 7 deletions src/amsynth_dssi_gtk.cpp
Expand Up @@ -96,7 +96,7 @@ static gboolean osc_input_handler(GIOChannel *source, GIOCondition condition, gp
// handle message sent by plugin host
//

static int osc_control_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_control_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
assert(types[0] == 'i');
assert(types[1] == 'f');
Expand All @@ -110,38 +110,38 @@ static int osc_control_handler(const char *path, const char *types, lo_arg **arg
return 0;
}

static int osc_samplerate_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_samplerate_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
assert(types[0] == 'i');
return 0;
}

static int osc_program_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_program_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
assert(types[0] == 'i');
assert(types[1] == 'i');
return 0;
}

static int osc_show_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_show_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
gtk_window_present(_window);
return 0;
}

static int osc_hide_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_hide_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
gtk_widget_hide(GTK_WIDGET(_window));
return 0;
}

static int osc_quit_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_quit_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
gtk_main_quit();
return 0;
}

static int osc_fallback_handler(const char *path, const char *types, lo_arg **argv, int argc, void *data, void *user_data)
static int osc_fallback_handler(const char *path, const char *types, lo_arg **argv, int argc, lo_message data, void *user_data)
{
fprintf(stderr, "unhandled OSC message (path = '%s' types = '%s')\n", path, types);
return 1;
Expand Down

0 comments on commit c6f76df

Please sign in to comment.