projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
file_group.cc
diff --git
a/src/lib/file_group.cc
b/src/lib/file_group.cc
index d364a395d6a6d2f5ad986e2e7c9ffcaf81fcd9e4..9c8d43204b1b830726c073de894e7b9f5c6e9e22 100644
(file)
--- a/
src/lib/file_group.cc
+++ b/
src/lib/file_group.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,22
+17,38
@@
*/
*/
+/** @file src/lib/file_group.cc
+ * @brief FileGroup class.
+ */
+
#include <cstdio>
#include <sndfile.h>
#include "file_group.h"
#include "exceptions.h"
#include <cstdio>
#include <sndfile.h>
#include "file_group.h"
#include "exceptions.h"
+#include "cross.h"
using std::vector;
using std::cout;
using std::vector;
using std::cout;
+/** Construct a FileGroup with no files */
+FileGroup::FileGroup ()
+ : _current_path (0)
+ , _current_file (0)
+{
+
+}
+
+/** Construct a FileGroup with a single file */
FileGroup::FileGroup (boost::filesystem::path p)
: _current_path (0)
, _current_file (0)
{
_paths.push_back (p);
FileGroup::FileGroup (boost::filesystem::path p)
: _current_path (0)
, _current_file (0)
{
_paths.push_back (p);
+ ensure_open_path (0);
seek (0, SEEK_SET);
}
seek (0, SEEK_SET);
}
+/** Construct a FileGroup with multiple files */
FileGroup::FileGroup (vector<boost::filesystem::path> const & p)
: _paths (p)
, _current_path (0)
FileGroup::FileGroup (vector<boost::filesystem::path> const & p)
: _paths (p)
, _current_path (0)
@@
-42,6
+58,7
@@
FileGroup::FileGroup (vector<boost::filesystem::path> const & p)
seek (0, SEEK_SET);
}
seek (0, SEEK_SET);
}
+/** Destroy a FileGroup, closing any open file */
FileGroup::~FileGroup ()
{
if (_current_file) {
FileGroup::~FileGroup ()
{
if (_current_file) {
@@
-49,6
+66,13
@@
FileGroup::~FileGroup ()
}
}
}
}
+void
+FileGroup::set_paths (vector<boost::filesystem::path> const & p)
+{
+ _paths = p;
+ ensure_open_path (0);
+ seek (0, SEEK_SET);
+}
/** Ensure that the given path index in the content is the _current_file */
void
/** Ensure that the given path index in the content is the _current_file */
void
@@
-64,7
+88,7
@@
FileGroup::ensure_open_path (size_t p) const
}
_current_path = p;
}
_current_path = p;
- _current_file = fopen
(_paths[_current_path].string().c_str()
, "rb");
+ _current_file = fopen
_boost (_paths[_current_path]
, "rb");
if (_current_file == 0) {
throw OpenFileError (_paths[_current_path]);
}
if (_current_file == 0) {
throw OpenFileError (_paths[_current_path]);
}
@@
-73,8
+97,6
@@
FileGroup::ensure_open_path (size_t p) const
int64_t
FileGroup::seek (int64_t pos, int whence) const
{
int64_t
FileGroup::seek (int64_t pos, int whence) const
{
- int64_t const len = length ();
-
/* Convert pos to `full_pos', which is an offset from the start
of all the files.
*/
/* Convert pos to `full_pos', which is an offset from the start
of all the files.
*/
@@
-87,11
+109,15
@@
FileGroup::seek (int64_t pos, int whence) const
for (size_t i = 0; i < _current_path; ++i) {
full_pos += boost::filesystem::file_size (_paths[i]);
}
for (size_t i = 0; i < _current_path; ++i) {
full_pos += boost::filesystem::file_size (_paths[i]);
}
+#ifdef DCPOMATIC_WINDOWS
+ full_pos += _ftelli64 (_current_file);
+#else
full_pos += ftell (_current_file);
full_pos += ftell (_current_file);
+#endif
full_pos += pos;
break;
case SEEK_END:
full_pos += pos;
break;
case SEEK_END:
- full_pos = len - pos;
+ full_pos = len
gth()
- pos;
break;
}
break;
}
@@
-112,7
+138,7
@@
FileGroup::seek (int64_t pos, int whence) const
}
ensure_open_path (i);
}
ensure_open_path (i);
- fseek (_current_file, sub_pos, SEEK_SET);
+
dcpomatic_
fseek (_current_file, sub_pos, SEEK_SET);
return full_pos;
}
return full_pos;
}
@@
-125,7
+151,7
@@
int
FileGroup::read (uint8_t* buffer, int amount) const
{
int read = 0;
FileGroup::read (uint8_t* buffer, int amount) const
{
int read = 0;
- while (
1
) {
+ while (
true
) {
int const this_time = fread (buffer + read, 1, amount - read, _current_file);
read += this_time;
if (read == amount) {
int const this_time = fread (buffer + read, 1, amount - read, _current_file);
read += this_time;
if (read == amount) {
@@
-143,6
+169,7
@@
FileGroup::read (uint8_t* buffer, int amount) const
return read;
}
return read;
}
+/** @return Combined length of all the files */
int64_t
FileGroup::length () const
{
int64_t
FileGroup::length () const
{