#include "wx/wx_util.h"
#include "wx/wx_signal_manager.h"
+#include "wx/static_text.h"
#include "lib/util.h"
#include "lib/encoded_log_entry.h"
#include "lib/encode_server.h"
#include "lib/log.h"
#include "lib/signaller.h"
#include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
#include <wx/taskbar.h>
#include <wx/splash.h>
#include <wx/icon.h>
class ServerLog : public Log, public Signaller
{
public:
+ ServerLog ()
+ : _fps (0)
+ {}
string get () const {
string a;
: wxDialog (
0, 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);
add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
- _fps = new wxStaticText (this, wxID_ANY, wxT(""));
+ _fps = new StaticText (this, wxT(""));
state_sizer->Add (_fps);
wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
#else
- wxInitAllImageHandlers();
-#ifdef DCPOMATIC_LINUX
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.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
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
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));
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;
+#endif
_thread = new thread (bind (&App::main_thread, this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
splash->Destroy ();
}
+ SetExitOnFrameDelete (false);
+
return true;
}
void main_thread ()
try {
- EncodeServer server (server_log, false, Config::instance()->server_encoding_threads());
+ EncodeServer server (false, Config::instance()->server_encoding_threads());
server.run ();
} catch (...) {
store_current ();