/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
* @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;
using std::cout;
/* Already open */
return;
}
-
+
if (_current_file) {
fclose (_current_file);
}
_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, true);
}
}
}
#ifdef DCPOMATIC_WINDOWS
full_pos += _ftelli64 (_current_file);
-#else
+#else
full_pos += ftell (_current_file);
-#endif
+#endif
full_pos += pos;
break;
case SEEK_END:
/** 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
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;