projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing noncopyable.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle.cc
diff --git
a/src/lib/dcp_subtitle.cc
b/src/lib/dcp_subtitle.cc
index 17874c27eca9520f50a3bee4a2c2e12d812a095b..f9aa7e0d9f103da6f38d54f5e35621c23c3b6731 100644
(file)
--- a/
src/lib/dcp_subtitle.cc
+++ b/
src/lib/dcp_subtitle.cc
@@
-1,60
+1,58
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "dcp_subtitle.h"
#include "exceptions.h"
*/
#include "dcp_subtitle.h"
#include "exceptions.h"
-#include <dcp/interop_subtitle_content.h>
-#include <dcp/smpte_subtitle_content.h>
+#include "compose.hpp"
+#include <dcp/interop_subtitle_asset.h>
+#include <dcp/smpte_subtitle_asset.h>
#include "i18n.h"
#include "i18n.h"
+using std::string;
+using std::exception;
using boost::shared_ptr;
using boost::shared_ptr;
-shared_ptr<dcp::Subtitle
Conten
t>
+shared_ptr<dcp::Subtitle
Asse
t>
DCPSubtitle::load (boost::filesystem::path file) const
{
DCPSubtitle::load (boost::filesystem::path file) const
{
- shared_ptr<dcp::SubtitleContent> sc;
-
- try {
- sc.reset (new dcp::InteropSubtitleContent (file));
- } catch (...) {
-
- }
+ shared_ptr<dcp::SubtitleAsset> sc;
+ string interop_error;
+ string smpte_error;
- if (!sc) {
- try {
- sc.reset (new dcp::SMPTESubtitleContent (file, true));
- } catch (...) {
-
- }
+ try {
+ sc.reset (new dcp::InteropSubtitleAsset (file));
+ } catch (exception& e) {
+ interop_error = e.what ();
}
if (!sc) {
try {
}
if (!sc) {
try {
- sc.reset (new dcp::SMPTESubtitle
Content (file, fals
e));
- } catch (
...
) {
-
+ sc.reset (new dcp::SMPTESubtitle
Asset (fil
e));
+ } catch (
exception& e
) {
+ smpte_error = e.what();
}
}
if (!sc) {
}
}
if (!sc) {
- throw FileError (
_("Could not read subtitles"
), file);
+ throw FileError (
String::compose (_("Could not read subtitles (%1 / %2)"), interop_error, smpte_error
), file);
}
return sc;
}
return sc;