aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/adlmidi_midiplay.cpp9
-rw-r--r--src/adlmidi_private.hpp3
2 files changed, 10 insertions, 2 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 8742b3d..d1ee447 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -401,6 +401,13 @@ double MIDIplay::Tick(double s, double granularity)
{
//if(CurrentPositionNew.began)
CurrentPositionNew.wait -= s;
+ CurrentPositionNew.absTimePosition += s;
+
+ #ifdef DEBUG_SHOW_AUDIO_TIMER
+ std::fprintf(stdout, " \r");
+ std::fprintf(stdout, "Time position: %10f\r", CurrentPositionNew.absTimePosition);
+ std::fflush(stdout);
+ #endif
int antiFreezeCounter = 10000;//Limit 10000 loops to avoid freezing
while((CurrentPositionNew.wait <= granularity * 0.5) && (antiFreezeCounter > 0))
@@ -1227,7 +1234,7 @@ bool MIDIplay::ProcessEventsNew()
#ifdef DEBUG_TIME_CALCULATION
std::fprintf(stdout, " \r");
- std::fprintf(stdout, "Time: %10f\r", maxTime);
+ std::fprintf(stdout, "Time: %10f; Audio: %10f\r", maxTime, CurrentPositionNew.absTimePosition);
std::fflush(stdout);
#endif
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index c75dc59..75094d2 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -397,6 +397,7 @@ private:
bool began;
char padding[7];
double wait;
+ double absTimePosition;
struct TrackInfo
{
size_t ptr;
@@ -407,7 +408,7 @@ private:
TrackInfo(): ptr(0), delay(0), status(0), pos(NULL) {}
};
std::vector<TrackInfo> track;
- PositionNew(): began(false), wait(0.0), track()
+ PositionNew(): began(false), wait(0.0), absTimePosition(0.0), track()
{}
} CurrentPositionNew, LoopBeginPositionNew, trackBeginPositionNew;