#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/taskbar.h>
#include <wx/splash.h>
#include <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <iostream>
using std::list;
using std::fixed;
using std::setprecision;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::thread;
using boost::bind;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
enum {
ID_status = 1,
string get () const {
string a;
- BOOST_FOREACH (string const & i, _log) {
+ for (auto const& i: _log) {
a += i + "\n";
}
return a;
}
- string head_and_tail (int) const {
- /* Not necessary */
- return "";
- }
-
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
wxTextCtrl* _text;
wxStaticText* _fps;
- boost::shared_ptr<wxTimer> _timer;
+ std::shared_ptr<wxTimer> _timer;
};
class TaskBarIcon : public wxTaskBarIcon
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
#else
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+ wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
public:
App ()
: wxApp ()
- , _thread (0)
, _icon (0)
{}
#else
_icon = new TaskBarIcon;
#endif
- _thread = new thread (bind (&App::main_thread, this));
+ _thread = thread (bind (&App::main_thread, this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
_timer.reset (new wxTimer (this));
message_dialog (0, std_to_wx (m));
}
- boost::thread* _thread;
+ boost::thread _thread;
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;
};