projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
playlist.cc
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index 48053bbf485aa893ddd903646ee911baaba05bdc..287f23fd4f929bb368cf691c225ac22f34f4248c 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-34,7
+34,7
@@
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
-#include <boost/
shared_ptr
.hpp>
+#include <boost/
bind/placeholders
.hpp>
#include <boost/foreach.hpp>
#include <iostream>
#include <boost/foreach.hpp>
#include <iostream>
@@
-48,10
+48,13
@@
using std::max;
using std::string;
using std::pair;
using boost::optional;
using std::string;
using std::pair;
using boost::optional;
-using
boost
::shared_ptr;
-using
boost
::weak_ptr;
-using
boost
::dynamic_pointer_cast;
+using
std
::shared_ptr;
+using
std
::weak_ptr;
+using
std
::dynamic_pointer_cast;
using namespace dcpomatic;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
Playlist::Playlist ()
: _sequence (true)
Playlist::Playlist ()
: _sequence (true)
@@
-70,13
+73,6
@@
Playlist::~Playlist ()
void
Playlist::content_change (weak_ptr<const Film> weak_film, ChangeType type, weak_ptr<Content> content, int property, bool frequent)
{
void
Playlist::content_change (weak_ptr<const Film> weak_film, ChangeType type, weak_ptr<Content> content, int property, bool frequent)
{
- /* Make sure we only hear about atomic changes (e.g. a PENDING always with the DONE/CANCELLED)
- Ignore any DONE/CANCELLED that arrives without a PENDING.
- */
- if (_checker.send (type, property)) {
- return;
- }
-
shared_ptr<const Film> film = weak_film.lock ();
DCPOMATIC_ASSERT (film);
shared_ptr<const Film> film = weak_film.lock ();
DCPOMATIC_ASSERT (film);