diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-25 08:38:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-25 08:38:53 +0000 |
| commit | 4ec1def1154d3d6b305bf556bf227df7b4f74b16 (patch) | |
| tree | 93ac4cc14681727ca07ccb6d10f675c6d2623224 /src/lib | |
| parent | 589abeb702278ec209b4972f6c4c993949fa78ee (diff) | |
Remove another use of fstream.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 1 | ||||
| -rw-r--r-- | src/lib/writer.cc | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index a3720c458..b1b868984 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -64,7 +64,6 @@ using std::multimap; using std::pair; using std::map; using std::vector; -using std::ifstream; using std::setfill; using std::min; using std::make_pair; diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 103ac2ba1..f4128e6c5 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -36,13 +36,13 @@ #include "audio_mapping.h" #include "config.h" #include "job.h" +#include "cross.h" #include "i18n.h" using std::make_pair; using std::pair; using std::string; -using std::ifstream; using std::list; using std::cout; using boost::shared_ptr; @@ -141,8 +141,9 @@ Writer::fake_write (int frame, Eyes eyes) { boost::mutex::scoped_lock lock (_mutex); - ifstream ifi (_film->info_path (frame, eyes).string().c_str()); + FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r"); libdcp::FrameInfo info (ifi); + fclose (ifi); QueueItem qi; qi.type = QueueItem::FAKE; @@ -430,8 +431,9 @@ bool Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes) { /* Read the frame info as written */ - ifstream ifi (_film->info_path (f, eyes).string().c_str()); + FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r"); libdcp::FrameInfo info (ifi); + fclose (ifi); if (info.size == 0) { _film->log()->log (String::compose ("Existing frame %1 has no info file", f)); return false; |
