fix #29796
fix 2 compiler warnings

and convert enum DrumsetKi9nd into an enum class in the due course