Merge pull request #1648 from DragoonBoots/#1604

Add in/out point support to ola_recorder

Author: peternewman

examples/ShowLoader.cpp

@@ -91,6 +91,14 @@ void ShowLoader::Reset() {
 }
 
 
+/**
+ * @brief Get most recent line number read (1-indexed)
+ */
+unsigned int ShowLoader::GetCurrentLineNumber() const {
+  return m_line;
+}
+
+
 /**
  * Get the next time offset
  * @param timeout a pointer to the timeout in ms
@@ -141,6 +149,26 @@ ShowLoader::State ShowLoader::NextFrame(unsigned int *universe,
 }
 
 
+/**
+ * Read the next show file entry
+ * @param entry a ShowEntry to fill with data
+ */
+ShowLoader::State ShowLoader::NextEntry(ShowEntry *entry) {
+  State state = NextFrame(&entry->universe, &entry->buffer);
+  if (state != State::OK) {
+    return state;
+  }
+
+  state = NextTimeout(&entry->next_wait);
+  if (state == State::END_OF_FILE) {
+    // Ensure the entry is whole before sending.
+    entry->next_wait = 0;
+  }
+
+  return state;
+}
+
+
 void ShowLoader::ReadLine(string *line) {
   getline(m_show_file, *line);
   ola::StripSuffix(line, "\r");

examples/ShowLoader.h

@@ -26,6 +26,15 @@
 #ifndef EXAMPLES_SHOWLOADER_H_
 #define EXAMPLES_SHOWLOADER_H_
 
+/**
+ * Holds a single entry in the show file
+ */
+struct ShowEntry {
+  unsigned int universe;
+  ola::DmxBuffer buffer;
+  unsigned int next_wait;
+};
+
 /**
  * Loads a show file and reads the DMX data.
  */
@@ -42,9 +51,9 @@ class ShowLoader {
 
   bool Load();
   void Reset();
+  unsigned int GetCurrentLineNumber() const;
 
-  State NextTimeout(unsigned int *timeout);
-  State NextFrame(unsigned int *universe, ola::DmxBuffer *data);
+  State NextEntry(ShowEntry *entry);
 
  private:
   const std::string m_filename;
@@ -54,5 +63,7 @@ class ShowLoader {
   static const char OLA_SHOW_HEADER[];
 
   void ReadLine(std::string *line);
+  State NextTimeout(unsigned int *timeout);
+  State NextFrame(unsigned int *universe, ola::DmxBuffer *data);
 };
 #endif  // EXAMPLES_SHOWLOADER_H_