#include <boost/thread.hpp>
#include <wx/taskbar.h>
#include <wx/icon.h>
-#include "wx_util.h"
+#include "wx/wx_util.h"
#include "lib/util.h"
#include "lib/server.h"
#include "lib/config.h"
using std::cout;
using std::string;
+using std::exception;
using boost::shared_ptr;
using boost::thread;
using boost::bind;
return _log;
}
+ string head_and_tail (int amount = 1024) const {
+ if (int (_log.size ()) < (2 * amount)) {
+ return _log;
+ }
+
+ return _log.substr (0, amount) + _log.substr (_log.size() - amount - 1, amount);
+ }
+
private:
void do_log (string m)
{
SetSizer (_sizer);
_sizer->Layout ();
- Connect (ID_timer, wxEVT_TIMER, wxTimerEventHandler (StatusDialog::update));
+ Bind (wxEVT_TIMER, boost::bind (&StatusDialog::update, this), ID_timer);
_timer.Start (1000);
}
private:
- void update (wxTimerEvent &)
+ void update ()
{
_text->ChangeValue (std_to_wx (memory_log->get ()));
_sizer->Layout ();
#endif
#ifdef __WXGTK__
wxInitAllImageHandlers();
- wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
+ wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
SetIcon (icon, std_to_wx ("DCP-o-matic encode server"));
#endif
- Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
- Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit));
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit);
}
wxMenu* CreatePopupMenu ()
}
private:
- void status (wxCommandEvent &)
+ void status ()
{
StatusDialog* d = new StatusDialog;
d->Show ();
}
- void quit (wxCommandEvent &)
+ void quit ()
{
wxTheApp->ExitMainLoop ();
}
};
-class App : public wxApp
+class App : public wxApp, public ExceptionStore
{
public:
App ()
_icon = new TaskBarIcon;
_thread = new thread (bind (&App::main_thread, this));
+
+ Bind (wxEVT_TIMER, boost::bind (&App::check, this));
+ _timer.reset (new wxTimer (this));
+ _timer->Start (1000);
return true;
}
}
void main_thread ()
- {
- Server server (memory_log);
+ try {
+ Server server (memory_log, false);
server.run (Config::instance()->num_local_encoding_threads ());
+ } catch (...) {
+ store_current ();
+ }
+
+ void check ()
+ {
+ try {
+ rethrow ();
+ } catch (exception& e) {
+ error_dialog (0, std_to_wx (e.what ()));
+ wxTheApp->ExitMainLoop ();
+ } catch (...) {
+ error_dialog (0, _("An unknown error has occurred with the DCP-o-matic server."));
+ wxTheApp->ExitMainLoop ();
+ }
}
boost::thread* _thread;
TaskBarIcon* _icon;
+ shared_ptr<wxTimer> _timer;
};
IMPLEMENT_APP (App)