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/sound_asset.h | |
| parent | c597fcee56abc2e6d92e3cfbbfe3c7817d9d0cbe (diff) | |
Use signals2 rather than sigc++
Diffstat (limited to 'src/sound_asset.h')
| -rw-r--r-- | src/sound_asset.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound_asset.h b/src/sound_asset.h index a19d6726..3189c067 100644 --- a/src/sound_asset.h +++ b/src/sound_asset.h @@ -49,7 +49,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 ); @@ -65,10 +65,10 @@ public: * @param channels Number of audio channels. */ SoundAsset ( - sigc::slot<std::string, Channel> get_path, + boost::function<std::string (Channel)> 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 channels @@ -100,7 +100,7 @@ public: } private: - void construct (sigc::slot<std::string, Channel> get_path); + void construct (boost::function<std::string (Channel)> get_path); std::string path_from_channel (Channel channel, std::vector<std::string> const & files); /** Number of channels in the asset */ |
