summaryrefslogtreecommitdiff
path: root/src/subtitle_asset_internal.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-09 00:43:13 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-09 00:43:13 +0100
commit87c2c54ebfdc1e6ceb0673058c01fd30e13258c2 (patch)
tree10a7d3427cb1f399fc9cb298efff580247427bdd /src/subtitle_asset_internal.h
parent34be688550e3acdd99c3ca612e7e4696710f3438 (diff)
Switch to UUIDs for Interop image subtitle identification (rather than indices). Basic and untested SMPTE image subtitle support.
Diffstat (limited to 'src/subtitle_asset_internal.h')
-rw-r--r--src/subtitle_asset_internal.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h
index e2b1602e..b0034743 100644
--- a/src/subtitle_asset_internal.h
+++ b/src/subtitle_asset_internal.h
@@ -60,7 +60,6 @@ struct Context
int time_code_rate;
Standard standard;
int spot_number;
- int image_number;
};
class Font
@@ -168,9 +167,10 @@ private:
class Image : public Part
{
public:
- Image (boost::shared_ptr<Part> parent, Data png_data, HAlign h_align, float h_position, VAlign v_align, float v_position)
+ Image (boost::shared_ptr<Part> parent, std::string id, Data png_data, HAlign h_align, float h_position, VAlign v_align, float v_position)
: Part (parent)
, _png_data (png_data)
+ , _id (id)
, _h_align (h_align)
, _h_position (h_position)
, _v_align (v_align)
@@ -181,6 +181,7 @@ public:
private:
Data _png_data;
+ std::string _id; ///< the ID of this image (index for Interop, UUID for SMPTE)
HAlign _h_align;
float _h_position;
VAlign _v_align;
@@ -189,8 +190,6 @@ private:
}
-std::string image_subtitle_file (int n);
-
}
#endif