summaryrefslogtreecommitdiff
path: root/src/picture_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-25 20:52:58 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-25 20:52:58 +0100
commitee7187c25d83a47a106493e66b89888eca6d4344 (patch)
tree68ee60efb9044bf5a201925f89c9f8ddbfe7df81 /src/picture_asset.h
parentc597fcee56abc2e6d92e3cfbbfe3c7817d9d0cbe (diff)
Use signals2 rather than sigc++
Diffstat (limited to 'src/picture_asset.h')
-rw-r--r--src/picture_asset.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/picture_asset.h b/src/picture_asset.h
index da3eb7d0..08eb338a 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -34,7 +34,7 @@ class StereoPictureFrame;
class PictureAsset : public MXFAsset
{
public:
- PictureAsset (std::string directory, std::string mxf_name, sigc::signal1<void, float>* progress, int fps, int entry_point, int length);
+ PictureAsset (std::string directory, std::string mxf_name, boost::signals2::signal<void (float)>* progress, int fps, int entry_point, int length);
/** Write details of this asset to a CPL stream.
* @param s Stream.
@@ -83,7 +83,7 @@ public:
std::vector<std::string> const & files,
std::string directory,
std::string mxf_name,
- sigc::signal1<void, float>* progress,
+ boost::signals2::signal<void (float)>* progress,
int fps,
int length,
int width,
@@ -102,10 +102,10 @@ public:
* @param height Height of images in pixels.
*/
MonoPictureAsset (
- sigc::slot<std::string, int> get_path,
+ boost::function<std::string (int)> get_path,
std::string directory,
std::string mxf_name,
- sigc::signal1<void, float>* progress,
+ boost::signals2::signal<void (float)>* progress,
int fps,
int length,
int width,
@@ -119,7 +119,7 @@ public:
private:
std::string path_from_list (int f, std::vector<std::string> const & files) const;
- void construct (sigc::slot<std::string, int>);
+ void construct (boost::function<std::string (int)>);
};
/** A 3D (stereoscopic) picture asset */