Merge pull request #2139 from Wallacoloo/git-2138

Export percentage calculation now takes into account loop markers when necessary
2015-07-13 19:12:56 -07:00
parent 7786fb1902 ffba37c7f2
commit 1002fd60f0
3 changed files with 30 additions and 4 deletions
--- a/include/Song.h
+++ b/include/Song.h
@@ -25,6 +25,8 @@
 #ifndef SONG_H
 #define SONG_H

+#include <utility>
+
 #include <QtCore/QSharedMemory>
 #include <QtCore/QVector>

@@ -163,6 +165,7 @@ public:
 	}

 	bool isExportDone() const;
+	std::pair<MidiTime, MidiTime> getExportEndpoints() const;

 	inline void setRenderBetweenMarkers( bool renderBetweenMarkers )
 	{