#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,
static unsigned int const log_lines = 32;
+
class ServerLog : public Log, public Signaller
{
public:
+ ServerLog ()
+ : _fps (0)
+ {}
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;
}
_last_time = *local;
- shared_ptr<const EncodedLogEntry> encoded = dynamic_pointer_cast<const EncodedLogEntry> (entry);
+ auto encoded = dynamic_pointer_cast<const EncodedLogEntry> (entry);
if (encoded) {
_history.push_back (encoded->seconds ());
if (_history.size() > 48) {
void append (string s)
{
_log.push_back (s);
- emit (boost::bind (boost::ref (Appended), s));
+ emit (boost::bind(boost::ref(Appended), s));
}
list<string> _log;
float _fps;
};
+
static shared_ptr<ServerLog> server_log;
+
class StatusDialog : public wxDialog
{
public:
StatusDialog ()
: wxDialog (
- 0, wxID_ANY, _("DCP-o-matic Encode Server"),
+ nullptr, wxID_ANY, _("DCP-o-matic Encode Server"),
wxDefaultPosition, wxDefaultSize,
+#ifdef DCPOMATIC_OSX
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
+#else
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+#endif
)
{
- wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
+ auto state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
_fps = new StaticText (this, wxT(""));
state_sizer->Add (_fps);
- wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
+ auto log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
log_sizer->AddGrowableCol (0, 1);
wxClientDC dc (this);
wxTextCtrl* _text;
wxStaticText* _fps;
- boost::shared_ptr<wxTimer> _timer;
+ std::shared_ptr<wxTimer> _timer;
};
class TaskBarIcon : public wxTaskBarIcon
{
public:
TaskBarIcon ()
- : _status (0)
{
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
#else
- wxInitAllImageHandlers();
-#ifdef DCPOMATIC_LINUX
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
-#ifdef DCPOMATIC_OSX
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
-#endif
+ wxBitmap bitmap (bitmap_path("dcpomatic_small_black"), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
wxMenu* CreatePopupMenu ()
{
- wxMenu* menu = new wxMenu;
+ auto menu = new wxMenu;
menu->Append (ID_status, std_to_wx ("Status..."));
menu->Append (ID_quit, std_to_wx ("Quit"));
return menu;
StatusDialog* _status;
};
+
class App : public wxApp, public ExceptionStore
{
public:
App ()
: wxApp ()
- , _thread (0)
- , _icon (0)
{}
private:
bool OnInit ()
{
- if (!wxApp::OnInit ()) {
+ if (!wxApp::OnInit()) {
return false;
}
+ wxInitAllImageHandlers ();
+
server_log.reset (new ServerLog);
+ server_log->set_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
dcpomatic_log = server_log;
Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
- wxSplashScreen* splash = maybe_show_splash ();
+ auto splash = maybe_show_splash ();
dcpomatic_setup_path_encoding ();
dcpomatic_setup_i18n ();
signal_manager = new wxSignalManager (this);
Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
+ /* Bad things happen (on Linux at least) if the config is reloaded by main_thread;
+ it seems like there's a race which results in the locked_sstream mutex being
+ locked before it is initialised. Calling Config::instance() here loads the config
+ again in this thread, which seems to work around the problem.
+ */
+ Config::instance();
+
+#ifdef DCPOMATIC_LINUX
+ StatusDialog* d = new StatusDialog ();
+ d->Show ();
+#else
_icon = new TaskBarIcon;
- _thread = new thread (bind (&App::main_thread, this));
+#endif
+ _thread = thread (bind (&App::main_thread, this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
_timer.reset (new wxTimer (this));
splash->Destroy ();
}
+ SetExitOnFrameDelete (false);
+
return true;
}
try {
rethrow ();
} catch (exception& e) {
- error_dialog (0, std_to_wx (e.what ()));
+ error_dialog (nullptr, std_to_wx(e.what()));
wxTheApp->ExitMainLoop ();
} catch (...) {
- error_dialog (0, _("An unknown error has occurred with the DCP-o-matic server."));
+ error_dialog (nullptr, _("An unknown error has occurred with the DCP-o-matic server."));
wxTheApp->ExitMainLoop ();
}
}
void config_failed_to_load ()
{
- message_dialog (0, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ message_dialog (nullptr, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
}
void config_warning (string m)
{
- message_dialog (0, std_to_wx (m));
+ message_dialog (nullptr, std_to_wx(m));
}
- boost::thread* _thread;
- TaskBarIcon* _icon;
+ boost::thread _thread;
+ TaskBarIcon* _icon = nullptr;
shared_ptr<wxTimer> _timer;
};
projects / dcpomatic.git / blobdiff