Use $HOME rather than hard-coded user name.

[dcpomatic.git] / src / tools / dcpomatic_cli.cc

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 96bf830863f2b53266a34176357c8d29f97237fe..65252ff29dfd1efb6d8804d8a336840446f9a122 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -91,19 +91,20 @@ print_dump (shared_ptr<Film> film)
        cout << film->dcp_name (true) << "\n"
             << film->container()->container_nickname() << " at " << ((film->resolution() == Resolution::TWO_K) ? "2K" : "4K") << "\n"
             << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n"
+            << "Duration " << (film->length().timecode(film->video_frame_rate())) << "\n"
             << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n"
             << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n";
 
        for (auto c: film->content()) {
                cout << "\n"
-                    << c->path(0) << "\n"
+                    << c->path(0).string() << "\n"
                     << "\tat " << c->position().seconds ()
                     << " length " << c->full_length(film).seconds ()
                     << " start trim " << c->trim_start().seconds ()
                     << " end trim " << c->trim_end().seconds () << "\n";
 
-               if (c->video) {
-                       cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
+               if (c->video && c->video->size()) {
+                       cout << "\t" << c->video->size()->width << "x" << c->video->size()->height << "\n"
                             << "\t" << c->active_video_frame_rate(film) << "fps\n"
                             << "\tcrop left " << c->video->requested_left_crop()
                             << " right " << c->video->requested_right_crop()