diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-04-24 01:49:09 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-04-24 19:12:36 +0200 |
| commit | 401da185ca664fc8d819fc842ffc08e14d4f6486 (patch) | |
| tree | 5c2ea2d1a7b1b537c04e7e9b3d32c8a44080f168 /src/lib | |
| parent | dbcd1675732d59f6337f7f60d0a39aaa6a1aa3a6 (diff) | |
Restore time zone to Cinema and improve UI to use it (#2473).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/cinema.cc | 15 | ||||
| -rw-r--r-- | src/lib/cinema.h | 5 | ||||
| -rw-r--r-- | src/lib/kdm_cli.cc | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index 6bd063733..b1681fc28 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -41,6 +41,18 @@ Cinema::Cinema (cxml::ConstNodePtr node) for (auto i: node->node_children("Email")) { emails.push_back (i->content ()); } + + int hour = 0; + + if (node->optional_number_child<int>("UTCOffset")) { + hour = node->number_child<int>("UTCOffset"); + } else { + hour = node->optional_number_child<int>("UTCOffsetHour").get_value_or(0); + } + + int minute = node->optional_number_child<int>("UTCOffsetMinute").get_value_or(0); + + utc_offset= { hour, minute }; } /* This is necessary so that we can use shared_from_this in add_screen (which cannot be done from @@ -65,6 +77,9 @@ Cinema::as_xml (xmlpp::Element* parent) const cxml::add_text_child(parent, "Notes", notes); + cxml::add_text_child(parent, "UTCOffsetHour", raw_convert<string>(utc_offset.hour())); + cxml::add_text_child(parent, "UTCOffsetMinute", raw_convert<string>(utc_offset.minute())); + for (auto i: _screens) { i->as_xml(cxml::add_child(parent, "Screen")); } diff --git a/src/lib/cinema.h b/src/lib/cinema.h index 7008659d7..05f6fb7fc 100644 --- a/src/lib/cinema.h +++ b/src/lib/cinema.h @@ -23,6 +23,7 @@ */ +#include <dcp/utc_offset.h> #include <libcxml/cxml.h> #include <memory> @@ -44,10 +45,11 @@ namespace dcpomatic { class Cinema : public std::enable_shared_from_this<Cinema> { public: - Cinema(std::string const & name_, std::vector<std::string> const & e, std::string notes_) + Cinema(std::string const & name_, std::vector<std::string> const & e, std::string notes_, dcp::UTCOffset utc_offset_) : name (name_) , emails (e) , notes (notes_) + , utc_offset(std::move(utc_offset_)) {} explicit Cinema (cxml::ConstNodePtr); @@ -62,6 +64,7 @@ public: std::string name; std::vector<std::string> emails; std::string notes; + dcp::UTCOffset utc_offset; std::vector<std::shared_ptr<dcpomatic::Screen>> screens() const { return _screens; diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc index c442cacdc..21e8c75d3 100644 --- a/src/lib/kdm_cli.cc +++ b/src/lib/kdm_cli.cc @@ -567,7 +567,7 @@ try (for lookup) and by creating a Cinema which the next Screen will be added to. */ cinema_name = optarg; - cinema = make_shared<Cinema>(optarg, vector<string>(), ""); + cinema = make_shared<Cinema>(optarg, vector<string>(), "", dcp::UTCOffset()); break; case 'S': /* Similarly, this could be the name of a new (temporary) screen or the name of a screen |