return a;
}
- string head_and_tail (int) const {
- /* Not necessary */
- return "";
- }
-
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
: 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);
TaskBarIcon ()
: _status (0)
{
+#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
+#else
+ wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+ wxIcon icon;
+ icon.CopyFromBitmap (bitmap);
+#endif
SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
public:
App ()
: wxApp ()
- , _thread (0)
, _icon (0)
{}
*/
Config::instance();
-#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+#ifdef DCPOMATIC_LINUX
StatusDialog* d = new StatusDialog ();
d->Show ();
#else
_icon = new TaskBarIcon;
#endif
- _thread = new thread (bind (&App::main_thread, this));
+ _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;
}
message_dialog (0, std_to_wx (m));
}
- boost::thread* _thread;
+ boost::thread _thread;
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;
};