Emit no audio from DCPs if none is mapped

[dcpomatic.git] / src / lib / file_group.h

diff --git a/src/lib/file_group.h b/src/lib/file_group.h
index a696343a0ca14e118109496f2e0a5fed33a8a069..aac72c2288ef1d394bd681059c8d2e07adfdbf3f 100644 (file)
--- a/src/lib/file_group.h
+++ b/src/lib/file_group.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,22 @@
 
 */
 
+
 /** @file  src/lib/file_group.h
  *  @brief FileGroup class.
  */
 
+
 #ifndef DCPOMATIC_FILE_GROUP_H
 #define DCPOMATIC_FILE_GROUP_H
 
+
+#include <dcp/file.h>
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <vector>
 
+
 /** @class FileGroup
  *  @brief A class to make a list of files behave like they were concatenated.
  */
@@ -37,15 +43,24 @@ public:
        FileGroup ();
        explicit FileGroup (boost::filesystem::path);
        explicit FileGroup (std::vector<boost::filesystem::path> const &);
-       ~FileGroup ();
 
        FileGroup (FileGroup const&) = delete;
        FileGroup& operator= (FileGroup const&) = delete;
 
        void set_paths (std::vector<boost::filesystem::path> const &);
 
+       struct Result {
+               Result(int bytes_read_, bool eof_)
+                       : bytes_read(bytes_read_)
+                       , eof(eof_)
+               {}
+
+               int bytes_read = 0;
+               bool eof = false;
+       };
+
        int64_t seek (int64_t, int) const;
-       int read (uint8_t*, int) const;
+       Result read (uint8_t*, int) const;
        int64_t length () const;
 
 private:
@@ -53,10 +68,11 @@ private:
 
        std::vector<boost::filesystem::path> _paths;
        /** Index of path that we are currently reading from */
-       mutable size_t _current_path;
-       mutable FILE* _current_file;
-       mutable size_t _current_size;
-       mutable int64_t _position;
+       mutable size_t _current_path = 0;
+       mutable boost::optional<dcp::File> _current_file;
+       mutable size_t _current_size = 0;
+       mutable int64_t _position = 0;
 };
 
+
 #endif