projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: replace some list with vector.
[dcpomatic.git]
/
src
/
lib
/
cinema.h
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 70508f23321d4a233e7bed4ffc8d62ef095d2eff..6c202a7bfc0e03515925d67162b90ee5c295995f 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2016 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/>.
*/
*/
@@
-21,14
+22,18
@@
* @brief Cinema class.
*/
* @brief Cinema class.
*/
+
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
namespace xmlpp {
class Element;
}
namespace xmlpp {
class Element;
}
-class Screen;
+namespace dcpomatic {
+ class Screen;
+}
/** @class Cinema
* @brief A description of a Cinema for KDM generation.
/** @class Cinema
* @brief A description of a Cinema for KDM generation.
@@
-36,30
+41,32
@@
class Screen;
* This is a cinema name, some metadata and a list of
* Screen objects.
*/
* This is a cinema name, some metadata and a list of
* Screen objects.
*/
-class Cinema : public
boost
::enable_shared_from_this<Cinema>
+class Cinema : public
std
::enable_shared_from_this<Cinema>
{
public:
{
public:
- Cinema
(std::string const & n, std::list<std::string> const & e
, int utc_offset_hour, int utc_offset_minute)
- : name (n)
+ Cinema
(std::string const & name_, std::vector<std::string> const & e, std::string notes_
, int utc_offset_hour, int utc_offset_minute)
+ : name (n
ame_
)
, emails (e)
, emails (e)
+ , notes (notes_)
, _utc_offset_hour (utc_offset_hour)
, _utc_offset_minute (utc_offset_minute)
{}
, _utc_offset_hour (utc_offset_hour)
, _utc_offset_minute (utc_offset_minute)
{}
- Cinema (cxml::ConstNodePtr);
+
explicit
Cinema (cxml::ConstNodePtr);
void read_screens (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
void read_screens (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
- void add_screen (
boost::shared_ptr<
Screen>);
- void remove_screen (
boost::shared_ptr<
Screen>);
+ void add_screen (
std::shared_ptr<dcpomatic::
Screen>);
+ void remove_screen (
std::shared_ptr<dcpomatic::
Screen>);
void set_utc_offset_hour (int h);
void set_utc_offset_minute (int m);
std::string name;
void set_utc_offset_hour (int h);
void set_utc_offset_minute (int m);
std::string name;
- std::list<std::string> emails;
+ std::vector<std::string> emails;
+ std::string notes;
int utc_offset_hour () const {
return _utc_offset_hour;
int utc_offset_hour () const {
return _utc_offset_hour;
@@
-69,12
+76,12
@@
public:
return _utc_offset_minute;
}
return _utc_offset_minute;
}
- std::
list<boost::shared_ptr<Screen> > screens
() const {
+ std::
vector<std::shared_ptr<dcpomatic::Screen>> screens
() const {
return _screens;
}
private:
return _screens;
}
private:
- std::
list<boost::shared_ptr<Screen>
> _screens;
+ std::
vector<std::shared_ptr<dcpomatic::Screen>
> _screens;
/** Offset such that the equivalent time in UTC can be determined
by subtracting the offset from the local time.
*/
/** Offset such that the equivalent time in UTC can be determined
by subtracting the offset from the local time.
*/