projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use boost::signals2; fix bugs with x-thread signalling.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 384cf85109757e73fbbad4b6cf197a3410738d9c..27be4331c6c3d3a1c60be34c57894047352b85d5 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-30,6
+30,7
@@
#include <inttypes.h>
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <inttypes.h>
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
+#include <boost/signals2.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
}
extern "C" {
#include <libavcodec/avcodec.h>
}
@@
-376,7
+377,7
@@
public:
void set_frames_per_second (float);
/** Emitted when some property has changed */
void set_frames_per_second (float);
/** Emitted when some property has changed */
- mutable
sigc::signal1<void, Property
> Changed;
+ mutable
boost::signals2::signal<void (Property)
> Changed;
private:
private:
@@
-387,9
+388,12
@@
private:
boost::shared_ptr<ExamineContentJob> _examine_content_job;
std::string thumb_file_for_frame (int) const;
boost::shared_ptr<ExamineContentJob> _examine_content_job;
std::string thumb_file_for_frame (int) const;
+ std::string thumb_file_for_frame_locked (int) const;
std::string thumb_base_for_frame (int) const;
std::string thumb_base_for_frame (int) const;
+ std::string thumb_base_for_frame_locked (int) const;
void signal_changed (Property);
std::string file_locked (std::string) const;
void signal_changed (Property);
std::string file_locked (std::string) const;
+ std::string dir_locked (std::string d) const;
void examine_content_finished ();
/** Complete path to directory containing the film metadata;
void examine_content_finished ();
/** Complete path to directory containing the film metadata;