diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/subtitle_asset.cc | 27 | ||||
| -rw-r--r-- | src/subtitle_asset_internal.cc | 2 |
2 files changed, 25 insertions, 4 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 083a8040..aeec99d7 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -385,13 +385,33 @@ SubtitleAsset::maybe_add_subtitle (string text, list<ParseState> const & parse_s ) ); break; - case ParseState::IMAGE: + case ParseState::Type::IMAGE: + { + switch (standard) { + case INTEROP: + if (text.size() >= 4) { + /* Remove file extension */ + text = text.substr(0, text.size() - 4); + } + break; + case SMPTE: + /* It looks like this urn:uuid: is required, but DoM wasn't expecting it (and not writing it) + * until around 2.15.140 so I guess either: + * a) it is not (always) used in the field, or + * b) nobody noticed / complained. + */ + if (text.substr(0, 9) == "urn:uuid:") { + text = text.substr(9); + } + break; + } + /* Add a subtitle with no image data and we'll fill that in later */ _subtitles.push_back ( shared_ptr<Subtitle> ( new SubtitleImage ( - Data (), - standard == INTEROP ? text.substr(0, text.size() - 4) : text, + Data(), + text, ps.in.get(), ps.out.get(), ps.h_position.get_value_or(0), @@ -405,6 +425,7 @@ SubtitleAsset::maybe_add_subtitle (string text, list<ParseState> const & parse_s ); break; } + } } list<shared_ptr<Subtitle> > diff --git a/src/subtitle_asset_internal.cc b/src/subtitle_asset_internal.cc index 7b9e18e9..25e03f0b 100644 --- a/src/subtitle_asset_internal.cc +++ b/src/subtitle_asset_internal.cc @@ -239,7 +239,7 @@ order::Image::as_xml (xmlpp::Element* parent, Context& context) const position_align (e, context, _h_align, _h_position, _v_align, _v_position); if (context.standard == SMPTE) { - e->add_child_text (_id); + e->add_child_text ("urn:uuid:" + _id); } else { e->add_child_text (_id + ".png"); } |