Catch case where fopen_boost returns 0 in fake_write.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7740c69365c5485547238606126b1cb4578bef31..909b1e4484d1c19b1cbc56b751131a098215534a 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -190,6 +190,9 @@ Writer::fake_write (int frame, Eyes eyes)
        }
        
        FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
+       if (!ifi) {
+               throw ReadFileError (_film->info_path (frame, eyes));
+       }
        dcp::FrameInfo info (ifi);
        fclose (ifi);
        
@@ -289,7 +292,11 @@ try
                        if (!_queue.empty() && !have_sequenced_image_at_queue_head()) {
                                LOG_WARNING (N_("Finishing writer with a left-over queue of %1:"), _queue.size());
                                for (list<QueueItem>::const_iterator i = _queue.begin(); i != _queue.end(); ++i) {
-                                       LOG_WARNING (N_("- type %1, size %2, frame %3, eyes %4"), i->type, i->size, i->frame, i->eyes);
+                                       if (i->type == QueueItem::FULL) {
+                                               LOG_WARNING (N_("- type FULL, frame %1, eyes %2"), i->frame, i->eyes);
+                                       } else {
+                                               LOG_WARNING (N_("- type FAKE, size %1, frame %2, eyes %3"), i->size, i->frame, i->eyes);
+                                       }                                               
                                }
                                LOG_WARNING (N_("Last written frame %1, last written eyes %2"), _last_written_frame, _last_written_eyes);
                        }
@@ -649,8 +656,6 @@ Writer::write (PlayerSubtitles subs)
                return;
        }
 
-       cout << "write " << subs.text.size() << " " << subs.from << " " << subs.to << "\n";
-       
        if (!_subtitle_content) {
                _subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ()));
        }