From 595d425d73ab429054dca310db9d940acfac1795 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 22 Jan 2023 13:49:38 -0500 Subject: [PATCH] make a small change to sound interface add a const --- include/sndprocs.h | 4 ++-- sound/windsound/windsound.c | 4 ++-- src/sounds.c | 2 +- win/Qt/qt_bind.cpp | 2 +- win/Qt/qt_bind.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/sndprocs.h b/include/sndprocs.h index 682690dab..7c3dfac9c 100644 --- a/include/sndprocs.h +++ b/include/sndprocs.h @@ -24,7 +24,7 @@ * interface function pointer used to invoke it: * * void (*sound_hero_playnotes)(int32_t instrument, - * char *str, int32_t volume); + * const char *str, int32_t volume); * * SNDCAP_ACHIEVEMENTS Invoked by the core when an in-game achievement * is reached. The soundlib routines could play @@ -105,7 +105,7 @@ struct sound_procs { void (*sound_exit_nhsound)(const char *); void (*sound_achievement)(schar, schar, int32_t); void (*sound_soundeffect)(char *desc, int32_t, int32_t volume); - void (*sound_hero_playnotes)(int32_t instrument, char *str, int32_t volume); + void (*sound_hero_playnotes)(int32_t instrument, const char *str, int32_t volume); void (*sound_play_usersound)(char *filename, int32_t volume, int32_t idx); }; diff --git a/sound/windsound/windsound.c b/sound/windsound/windsound.c index 9771b0a83..d6732bc44 100644 --- a/sound/windsound/windsound.c +++ b/sound/windsound/windsound.c @@ -20,7 +20,7 @@ static void windsound_init_nhsound(void); static void windsound_exit_nhsound(const char *); static void windsound_achievement(schar, schar, int32_t); static void windsound_soundeffect(char *, int32_t, int32_t); -static void windsound_hero_playnotes(int32_t instrument, char *str, int32_t volume); +static void windsound_hero_playnotes(int32_t instrument, const char *str, int32_t volume); static void windsound_play_usersound(char *, int32_t, int32_t); struct sound_procs windsound_procs = { @@ -77,7 +77,7 @@ windsound_soundeffect(char *desc, int32_t seid, int32_t volume) #define WAVEMUSIC_SOUNDS void -windsound_hero_playnotes(int32_t instrument, char *str, int32_t volume) +windsound_hero_playnotes(int32_t instrument, const char *str, int32_t volume) { #ifdef WAVEMUSIC_SOUNDS int reslt = 0; diff --git a/src/sounds.c b/src/sounds.c index 6d06063d2..f5ae0c161 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1753,7 +1753,7 @@ struct sound_procs nosound_procs = { (void (*)(const char *)) 0, /* exit_nhsound */ (void (*)(schar, schar, int32_t)) 0, /* achievement */ (void (*)(char *, int32_t, int32_t)) 0, /* sound effect */ - (void (*)(int32_t, char *, int32_t)) 0, /* hero_playnotes */ + (void (*)(int32_t, const char *, int32_t)) 0, /* hero_playnotes */ (void (*)(char *, int32_t, int32_t)) 0, /* play_usersound */ }; diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp index f6a83c9d2..17dc354a5 100644 --- a/win/Qt/qt_bind.cpp +++ b/win/Qt/qt_bind.cpp @@ -1056,7 +1056,7 @@ void NetHackQtBind::qtsound_soundeffect(char *desc UNUSED, int32_t seid UNUSED, { } -void NetHackQtBind::qtsound_hero_playnotes(int32_t instrument UNUSED, char *str UNUSED, int32_t volume UNUSED) +void NetHackQtBind::qtsound_hero_playnotes(int32_t instrument UNUSED, const char *str UNUSED, int32_t volume UNUSED) { } #endif diff --git a/win/Qt/qt_bind.h b/win/Qt/qt_bind.h index 98bf252a1..3bb7d0a8b 100644 --- a/win/Qt/qt_bind.h +++ b/win/Qt/qt_bind.h @@ -100,7 +100,7 @@ public: static void qtsound_exit_nhsound(const char *); static void qtsound_achievement(schar, schar, int32_t); static void qtsound_soundeffect(char *, int32_t, int32_t); - static void qtsound_hero_playnotes(int32_t instrument, char *str, int32_t volume); + static void qtsound_hero_playnotes(int32_t instrument, const char *str, int32_t volume); static void qtsound_play_usersound(char *, int32_t, int32_t); #endif