DCPOMATIC_ENABLE_WARNINGS
#include <RtAudio.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
class AudioMappingView;
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+ return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
}
#endif
wxWindow* parent,
wxString title,
int border,
- boost::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
- boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
- boost::function<bool (void)> nag_alter
+ std::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
+ std::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
+ std::function<bool (void)> nag_alter
);
void add_button (wxWindow* button);
wxStaticText* _private_key_bad;
wxSizer* _sizer;
wxBoxSizer* _button_sizer;
- boost::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
- boost::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
- boost::function<bool (void)> _nag_alter;
+ std::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+ std::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
+ std::function<bool (void)> _nag_alter;
};
class KeysPage : public Page
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+ return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
}
#endif
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const
{
- return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+ return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
}
#endif