static unsigned int const log_lines = 32;
+
class ServerLog : public Log, public Signaller
{
public:
}
_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
#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);
{
public:
TaskBarIcon ()
- : _status (0)
{
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
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 ()
- , _icon (0)
{}
private:
bool OnInit ()
{
- if (!wxApp::OnInit ()) {
+ if (!wxApp::OnInit()) {
return false;
}
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 ();
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;
+ TaskBarIcon* _icon = nullptr;
shared_ptr<wxTimer> _timer;
};
dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
- optional<dcpomatic::Rect<double> > subs = _viewer->outline_subtitles();
+ auto subs = _viewer->outline_subtitles();
if (subs) {
wxPen p (wxColour(0, 255, 0), 2);
dc.SetPen (p);
}
display_next_frame (false);
- DCPTime const next = position() + _viewer->one_video_frame();
+ auto const next = position() + _viewer->one_video_frame();
if (next >= length()) {
_viewer->finished ();
VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
- NextFrameResult const r = get_next_frame (non_blocking);
+ auto const r = get_next_frame (non_blocking);
if (r != SUCCESS) {
return r;
}