miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add _t suffix to (u)int types

Browse Source 
see eaae0bb5e7
This commit is contained in:
Miguel Horta
2024-04-07 13:40:38 +01:00
parent b3830b5816
commit 8a1aafabcd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/music/libtimidity.cpp
View File

@@ -34,17 +34,17 @@ static struct {
MidSong *song; MidSong *song;
MidiState status; MidiState status;
uint32 song_length; uint32_t song_length;
uint32 song_position; uint32_t song_position;
std::mutex synth_mutex; ///< Guard mutex for synth access std::mutex synth_mutex; ///< Guard mutex for synth access
} _midi; ///< Metadata about the midi we're playing. } _midi; ///< Metadata about the midi we're playing.
static void MidiMixMusic(int16 *stream, size_t len) static void MidiMixMusic(int16_t *stream, size_t len)
{ {
std::unique_lock<std::mutex> lock{ _midi.synth_mutex, std::try_to_lock }; std::unique_lock<std::mutex> lock{ _midi.synth_mutex, std::try_to_lock };
if (_midi.status == MIDI_PLAYING) { if (_midi.status == MIDI_PLAYING) {
mid_song_read_wave(_midi.song, (sint8 *)stream, len * 4); mid_song_read_wave(_midi.song, (int8_t *)stream, len * 4);
} }
} }
@@ -59,7 +59,7 @@ const char *MusicDriver_LibTimidity::Start(const StringList &param)
_midi.status = MIDI_STOPPED; _midi.status = MIDI_STOPPED;
_midi.song = NULL; _midi.song = NULL;
volume = TIMIDITY_MAX_VOLUME; // Avoid clipping volume = TIMIDITY_MAX_VOLUME; // Avoid clipping
uint32 samplerate = MxSetMusicSource(MidiMixMusic); uint32_t samplerate = MxSetMusicSource(MidiMixMusic);
if (mid_init(NULL) < 0) { if (mid_init(NULL) < 0) {
/* If init fails, it can be because no configuration was found. /* If init fails, it can be because no configuration was found.

2
src/music/libtimidity.h
View File

@@ -35,7 +35,7 @@ public:
class FMusicDriver_LibTimidity : public DriverFactoryBase { class FMusicDriver_LibTimidity : public DriverFactoryBase {
public: public:
FMusicDriver_LibTimidity() : DriverFactoryBase(Driver::DT_MUSIC, 5, "libtimidity", "LibTimidity MIDI Driver") {} FMusicDriver_LibTimidity() : DriverFactoryBase(Driver::DT_MUSIC, 5, "libtimidity", "LibTimidity MIDI Driver") {}
/* virtual */ Driver *CreateInstance() const { return new MusicDriver_LibTimidity(); } Driver *CreateInstance() const override { return new MusicDriver_LibTimidity(); }
}; };
#endif /* MUSIC_LIBTIMIDITY_H */ #endif /* MUSIC_LIBTIMIDITY_H */