diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-25 20:52:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-25 20:52:58 +0100 |
| commit | ee7187c25d83a47a106493e66b89888eca6d4344 (patch) | |
| tree | 68ee60efb9044bf5a201925f89c9f8ddbfe7df81 /src/util.cc | |
| parent | c597fcee56abc2e6d92e3cfbbfe3c7817d9d0cbe (diff) | |
Use signals2 rather than sigc++
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/util.cc b/src/util.cc index 22041180..c5ddb611 100644 --- a/src/util.cc +++ b/src/util.cc @@ -36,8 +36,11 @@ #include "argb_frame.h" #include "lut.h" -using namespace std; -using namespace boost; +using std::string; +using std::stringstream; +using std::min; +using std::max; +using boost::shared_ptr; using namespace libdcp; string @@ -51,9 +54,9 @@ libdcp::make_uuid () } string -libdcp::make_digest (string filename, sigc::signal1<void, float>* progress) +libdcp::make_digest (string filename, boost::signals2::signal<void (float)>* progress) { - int const file_size = filesystem::file_size (filename); + int const file_size = boost::filesystem::file_size (filename); Kumu::FileReader reader; if (ASDCP_FAILURE (reader.OpenRead (filename.c_str ()))) { |