files in the program, then also delete it here.
*/
+
+#include "common.h"
+#include "compose.hpp"
+#include "cpl.h"
#include "dcp.h"
+#include "decrypted_kdm.h"
+#include "encrypted_kdm.h"
#include "exceptions.h"
-#include "reel.h"
-#include "sound_asset.h"
+#include "filesystem.h"
+#include "interop_subtitle_asset.h"
+#include "mono_picture_asset.h"
#include "picture_asset.h"
-#include "subtitle_asset.h"
+#include "reel.h"
#include "reel_picture_asset.h"
#include "reel_sound_asset.h"
#include "reel_subtitle_asset.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include "interop_subtitle_asset.h"
#include "smpte_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "encrypted_kdm.h"
-#include "decrypted_kdm.h"
-#include "cpl.h"
-#include "common.h"
-#include "compose.hpp"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
+#include "subtitle_image.h"
+#include "subtitle_string.h"
#include <getopt.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <sstream>
#include <inttypes.h>
-using std::string;
+
using std::cerr;
using std::cout;
+using std::dynamic_pointer_cast;
+using std::exception;
using std::list;
-using std::pair;
-using std::min;
using std::max;
-using std::exception;
-using std::vector;
-using std::stringstream;
+using std::min;
+using std::pair;
using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::string;
+using std::stringstream;
+using std::vector;
using boost::optional;
using namespace dcp;
+
static void
help (string n)
{
switch (c) {
case 'v':
- cout << "libdcp version " << LIBDCP_VERSION << "\n";
+ cout << "libdcp version " << dcp::version << "\n";
exit (EXIT_SUCCESS);
case 'h':
help (argv[0]);
exit (EXIT_FAILURE);
}
- if (!boost::filesystem::exists (argv[optind])) {
+ if (!filesystem::exists(argv[optind])) {
cerr << argv[0] << ": DCP or CPL " << argv[optind] << " not found.\n";
exit (EXIT_FAILURE);
}
only = boost::split(only, *only_string, boost::is_any_of(","));
}
- vector<shared_ptr<CPL> > cpls;
+ vector<shared_ptr<CPL>> cpls;
if (boost::filesystem::is_directory(argv[optind])) {
DCP* dcp = 0;
vector<dcp::VerificationNote> notes;