#include "util.h"
#include "exceptions.h"
#include "scaler.h"
-#include "format.h"
#include "dcp_content_type.h"
#include "filter.h"
#include "sound_processor.h"
#include "config.h"
-#ifdef DVDOMATIC_WINDOWS
+#include "ratio.h"
+#ifdef DCPOMATIC_WINDOWS
#include "stack.hpp"
#endif
using boost::optional;
using libdcp::Size;
-boost::thread::id ui_thread;
-boost::filesystem::path backtrace_file;
+static boost::thread::id ui_thread;
+static boost::filesystem::path backtrace_file;
/** Convert some number of seconds to a string representation
* in hours, minutes and seconds.
return hms.str ();
}
-string
-time_to_hms (Time t)
-{
- return seconds_to_hms (t / TIME_HZ);
-}
-
/** @param s Number of seconds.
* @return String containing an approximate description of s (e.g. "about 2 hours")
*/
stacktrace (ostream& out, int levels)
{
void *array[200];
- size_t size;
- char **strings;
- size_t i;
-
- size = backtrace (array, 200);
- strings = backtrace_symbols (array, size);
+ size_t size = backtrace (array, 200);
+ char** strings = backtrace_symbols (array, size);
if (strings) {
- for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
+ for (size_t i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
out << N_(" ") << demangle (strings[i]) << "\n";
}
return t.tv_sec + (double (t.tv_usec) / 1e6);
}
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
{
dbg::stack s;
}
#endif
-/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+/** 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.
*/
void
dcpomatic_setup ()
{
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
backtrace_file /= g_get_user_config_dir ();
backtrace_file /= "backtrace.txt";
SetUnhandledExceptionFilter(exception_handler);
avfilter_register_all ();
- Format::setup_formats ();
+ Ratio::setup_ratios ();
DCPContentType::setup_dcp_content_types ();
Scaler::setup_scalers ();
Filter::setup_filters ();
#endif
}
-/** @param start Start position for the crop within the image.
- * @param size Size of the cropped area.
- * @return FFmpeg crop filter string.
- */
-string
-crop_string (Position start, libdcp::Size size)
-{
- stringstream s;
- s << N_("crop=") << size.width << N_(":") << size.height << N_(":") << start.x << N_(":") << start.y;
- return s.str ();
-}
-
/** @param s A string.
* @return Parts of the string split at spaces, except when a space is within quotation marks.
*/
return 96000;
}
-/** @param index Colour LUT index.
- * @return Human-readable name.
- */
-string
-colour_lut_index_to_name (int index)
-{
- switch (index) {
- case 0:
- return _("sRGB");
- case 1:
- return _("Rec 709");
- }
-
- assert (false);
- return N_("");
-}
-
Socket::Socket (int timeout)
: _deadline (_io_service)
, _socket (_io_service)
return a - (a % t);
}
-int
-stride_lookup (int c, int const * stride)
-{
- return stride[c];
-}
-
/** Read a sequence of key / value pairs from a text stream;
* the keys are the first words on the line, and the values are
* the remainder of the line following the key. Lines beginning
* @return Equivalent number of audio frames for `v'.
*/
int64_t
-video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second)
+video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second)
{
return ((int64_t) v * audio_sample_rate / frames_per_second);
}
-/** @return A pair containing CPU model name and the number of processors */
-pair<string, int>
-cpu_info ()
-{
- pair<string, int> info;
- info.second = 0;
-
-#ifdef DCPOMATIC_POSIX
- ifstream f (N_("/proc/cpuinfo"));
- while (f.good ()) {
- string l;
- getline (f, l);
- if (boost::algorithm::starts_with (l, N_("model name"))) {
- string::size_type const c = l.find (':');
- if (c != string::npos) {
- info.first = l.substr (c + 2);
- }
- } else if (boost::algorithm::starts_with (l, N_("processor"))) {
- ++info.second;
- }
- }
-#endif
-
- return info;
-}
-
string
audio_channel_name (int c)
{
{
char const * old = setlocale (LC_NUMERIC, 0);
- if (old) {
- _old = strdup (old);
- if (strcmp (_old, "C")) {
- setlocale (LC_NUMERIC, "C");
- }
- }
+ if (old) {
+ _old = strdup (old);
+ if (strcmp (_old, "C")) {
+ setlocale (LC_NUMERIC, "C");
+ }
+ }
}
LocaleGuard::~LocaleGuard ()