#include "lib/encoded_log_entry.h"
#include "lib/encode_server.h"
#include "lib/config.h"
+#ifdef DCPOMATIC_GROK
+#include "lib/grok/context.h"
+#endif
#include "lib/log.h"
#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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/icon.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/splash.h>
+#include <wx/taskbar.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include <boost/optional.hpp>
#include <iostream>
+
using std::cout;
using std::string;
using std::exception;
using namespace boost::placeholders;
#endif
+
enum {
ID_status = 1,
ID_quit,
boost::signals2::signal<void(int)> Removed;
private:
- void do_log (shared_ptr<const LogEntry> entry)
+ void do_log (shared_ptr<const LogEntry> entry) override
{
time_t const s = entry->seconds ();
struct tm* local = localtime (&s);
Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
}
- wxMenu* CreatePopupMenu ()
+ wxMenu* CreatePopupMenu () override
{
auto menu = new wxMenu;
menu->Append (ID_status, std_to_wx ("Status..."));
#else
string const colour = gui_is_dark() ? "white" : "black";
wxBitmap bitmap (
- bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+ bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
wxBITMAP_TYPE_PNG
);
wxIcon icon;
private:
- bool OnInit ()
+ bool OnInit () override
{
if (!wxApp::OnInit()) {
return false;
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::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1));
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
auto splash = maybe_show_splash ();
SetExitOnFrameDelete (false);
+#ifdef DCPOMATIC_GROK
+ grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+ setup_grok_library_path();
+#endif
+
return true;
}
- int OnExit ()
+ int OnExit () override
{
delete _icon;
return wxApp::OnExit ();
signal_manager->ui_idle ();
}
- void config_failed_to_load ()
+ void config_failed_to_load(Config::LoadFailure what)
{
- message_dialog (nullptr, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ report_config_load_failure(nullptr, what);
}
void config_warning (string m)