X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffile_group.cc;h=3e8a7b79c43177a8d775889ab91d08855bb0e77e;hp=548e13fef5cd538d357d541077b3d58fa256ea93;hb=1befa3d286a5016e897f1a23cc60cd3d3b96e63a;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index 548e13fef..3e8a7b79c 100644
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,11 +22,12 @@
  *  @brief FileGroup class.
  */
 
-#include <cstdio>
-#include <sndfile.h>
 #include "file_group.h"
 #include "exceptions.h"
 #include "cross.h"
+#include "compose.hpp"
+#include <sndfile.h>
+#include <cstdio>
 #include <iostream>
 
 using std::vector;
@@ -92,7 +93,7 @@ FileGroup::ensure_open_path (size_t p) const
 	_current_path = p;
 	_current_file = fopen_boost (_paths[_current_path], "rb");
 	if (_current_file == 0) {
-		throw OpenFileError (_paths[_current_path]);
+		throw OpenFileError (_paths[_current_path], errno, OpenFileError::READ);
 	}
 }
 
@@ -147,7 +148,7 @@ FileGroup::seek (int64_t pos, int whence) const
 /** Try to read some data from the current position into a buffer.
  *  @param buffer Buffer to write data into.
  *  @param amount Number of bytes to read.
- *  @return Number of bytes read, or -1 in the case of error.
+ *  @return Number of bytes read.
  */
 int
 FileGroup::read (uint8_t* buffer, int amount) const
@@ -161,11 +162,17 @@ FileGroup::read (uint8_t* buffer, int amount) const
 			break;
 		}
 
-		/* See if there is another file to use */
-		if ((_current_path + 1) >= _paths.size()) {
-			break;
+		if (ferror(_current_file)) {
+			throw FileError (String::compose("fread error %1", errno), _paths[_current_path]);
+		}
+
+		if (feof (_current_file)) {
+			/* See if there is another file to use */
+			if ((_current_path + 1) >= _paths.size()) {
+				break;
+			}
+			ensure_open_path (_current_path + 1);
 		}
-		ensure_open_path (_current_path + 1);
 	}
 
 	return read;