timidity: added Timidity_GetSongTime (from libtimidity.)

icculus · Mar 18, 2021 · 2918964 · 2918964
1 parent 267deeb
commit 2918964
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/timidity/playmidi.c b/src/timidity/playmidi.c
@@ -1,13 +1,11 @@
 /*
-
     TiMidity -- Experimental MIDI to WAVE converter
     Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the Perl Artistic License, available in COPYING.
 
     playmidi.c -- random stuff in need of rearrangement
-
 */
 
 #define __SDL_SOUND_INTERNAL__
@@ -647,6 +645,13 @@ Uint32 Timidity_GetSongLength(MidiSong *song)
   return retvalue;
 }
 
+Uint32 Timidity_GetSongTime(MidiSong *song)
+{
+  Uint32 retvalue = (song->current_sample / song->rate) * 1000;
+  retvalue       += (song->current_sample % song->rate) * 1000 / song->rate;
+  return retvalue;
+}
+
 int Timidity_PlaySome(MidiSong *song, void *stream, Sint32 len)
 {
   Sint32 start_sample, end_sample, samples;

diff --git a/src/timidity/timidity.h b/src/timidity/timidity.h
@@ -151,6 +151,7 @@ extern MidiSong *Timidity_LoadSong(SDL_RWops *rw, SDL_AudioSpec *audio);
 extern void Timidity_Start(MidiSong *song);
 extern void Timidity_Seek(MidiSong *song, Uint32 ms);
 extern Uint32 Timidity_GetSongLength(MidiSong *song); /* returns millseconds */
+extern Uint32 Timidity_GetSongTime(MidiSong *song);   /* returns millseconds */
 extern void Timidity_FreeSong(MidiSong *song);
 extern void Timidity_Exit(void);