Use 1.0 branch of libdcp.

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 381c47a9ae606253a7207a492351965987638c58..fd3a318b03419c043787db235f990efc638f3729 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -27,6 +27,7 @@
 #include <iostream>
 #include <fstream>
 #include <climits>
+#include <stdexcept>
 #ifdef DCPOMATIC_POSIX
 #include <execinfo.h>
 #include <cxxabi.h>
@@ -47,6 +48,7 @@
 #include <openssl/md5.h>
 #include <magick/MagickCore.h>
 #include <magick/version.h>
+#include <pangomm/init.h>
 #include <libdcp/version.h>
 #include <libdcp/util.h>
 #include <libdcp/signer_chain.h>
@@ -92,12 +94,14 @@ using std::istream;
 using std::numeric_limits;
 using std::pair;
 using std::cout;
+using std::bad_alloc;
 using std::streampos;
+using std::set_terminate;
 using boost::shared_ptr;
 using boost::thread;
 using boost::lexical_cast;
 using boost::optional;
-using libdcp::Size;
+using dcp::Size;
 
 static boost::thread::id ui_thread;
 static boost::filesystem::path backtrace_file;
@@ -247,7 +251,7 @@ dependency_version_summary ()
          << N_("libswscale ") << ffmpeg_version_to_string (swscale_version()) << N_(", ")
          << MagickVersion << N_(", ")
          << N_("libssh ") << ssh_version (0) << N_(", ")
-         << N_("libdcp ") << libdcp::version << N_(" git ") << libdcp::git_commit;
+         << N_("libdcp ") << dcp::version << N_(" git ") << dcp::git_commit;
 
        return s.str ();
 }
@@ -271,6 +275,33 @@ LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
 }
 #endif
 
+/* From http://stackoverflow.com/questions/2443135/how-do-i-find-where-an-exception-was-thrown-in-c */
+void
+terminate ()
+{
+       static bool tried_throw = false;
+
+       try {
+               // try once to re-throw currently active exception
+               if (!tried_throw++) {
+                       throw;
+               }
+       }
+       catch (const std::exception &e) {
+               std::cerr << __FUNCTION__ << " caught unhandled exception. what(): "
+                         << e.what() << std::endl;
+       }
+       catch (...) {
+               std::cerr << __FUNCTION__ << " caught unknown/unhandled exception." 
+                         << std::endl;
+       }
+
+#ifdef DCPOMATIC_POSIX
+       stacktrace (cout, 50);
+#endif
+       abort();
+}
+
 /** Call the required functions to set up DCP-o-matic's static arrays, etc.
  *  Must be called from the UI thread, if there is one.
  */
@@ -307,9 +338,12 @@ dcpomatic_setup ()
        boost::filesystem::path lib = app_contents ();
        lib /= "lib";
        setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
-#endif 
+#endif
+
+       set_terminate (terminate);
 
-       libdcp::init ();
+       Pango::init ();
+       dcp::init ();
        
        Ratio::setup_ratios ();
        DCPContentType::setup_dcp_content_types ();
@@ -350,6 +384,8 @@ dcpomatic_setup_gettext_i18n (string lang)
                putenv (cmd);
                snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
                putenv (cmd);
+               snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
+               putenv (cmd);
        }
 
        setlocale (LC_ALL, "");
@@ -539,7 +575,7 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
        } while (ec == boost::asio::error::would_block);
 
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_connect (%1)"), ec.value ()));
        }
 
        if (!_socket.is_open ()) {
@@ -563,7 +599,7 @@ Socket::accept (int port)
        _acceptor = 0;
        
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ()));
        }
 }
 
@@ -584,7 +620,7 @@ Socket::write (uint8_t const * data, int size)
        } while (ec == boost::asio::error::would_block);
 
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_write (%1)"), ec.value ()));
        }
 }
 
@@ -612,7 +648,7 @@ Socket::read (uint8_t* data, int size)
        } while (ec == boost::asio::error::would_block);
        
        if (ec) {
-               throw NetworkError (ec.message ());
+               throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ()));
        }
 }
 
@@ -747,7 +783,7 @@ ensure_ui_thread ()
  *  @return Equivalent number of audio frames for `v'.
  */
 int64_t
-video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second)
+video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second)
 {
        return ((int64_t) v * audio_sample_rate / frames_per_second);
 }
@@ -853,7 +889,7 @@ tidy_for_filename (string f)
        return t;
 }
 
-shared_ptr<const libdcp::Signer>
+shared_ptr<const dcp::Signer>
 make_signer ()
 {
        boost::filesystem::path const sd = Config::instance()->signer_chain_directory ();
@@ -873,47 +909,47 @@ make_signer ()
                if (!boost::filesystem::exists (p)) {
                        boost::filesystem::remove_all (sd);
                        boost::filesystem::create_directories (sd);
-                       libdcp::make_signer_chain (sd, openssl_path ());
+                       dcp::make_signer_chain (sd, openssl_path ());
                        break;
                }
 
                ++i;
        }
        
-       libdcp::CertificateChain chain;
+       dcp::CertificateChain chain;
 
        {
                boost::filesystem::path p (sd);
                p /= "ca.self-signed.pem";
-               chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
+               chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (p)));
        }
 
        {
                boost::filesystem::path p (sd);
                p /= "intermediate.signed.pem";
-               chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
+               chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (p)));
        }
 
        {
                boost::filesystem::path p (sd);
                p /= "leaf.signed.pem";
-               chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (p)));
+               chain.add (shared_ptr<dcp::Certificate> (new dcp::Certificate (p)));
        }
 
        boost::filesystem::path signer_key (sd);
        signer_key /= "leaf.key";
 
-       return shared_ptr<const libdcp::Signer> (new libdcp::Signer (chain, signer_key));
+       return shared_ptr<const dcp::Signer> (new dcp::Signer (chain, signer_key));
 }
 
-libdcp::Size
-fit_ratio_within (float ratio, libdcp::Size full_frame)
+dcp::Size
+fit_ratio_within (float ratio, dcp::Size full_frame)
 {
        if (ratio < full_frame.ratio ()) {
-               return libdcp::Size (rint (full_frame.height * ratio), full_frame.height);
+               return dcp::Size (rint (full_frame.height * ratio), full_frame.height);
        }
        
-       return libdcp::Size (full_frame.width, rint (full_frame.width / ratio));
+       return dcp::Size (full_frame.width, rint (full_frame.width / ratio));
 }
 
 DCPTime
@@ -922,3 +958,13 @@ time_round_up (DCPTime t, DCPTime nearest)
        DCPTime const a = t + nearest - 1;
        return a - (a % nearest);
 }
+
+void *
+wrapped_av_malloc (size_t s)
+{
+       void* p = av_malloc (s);
+       if (!p) {
+               throw bad_alloc ();
+       }
+       return p;
+}