projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename shared_path -> resources_path.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_server.cc
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index 8c6abed5babbbe19bfaca78c3313e6c02cbd48ed..b51f29c15cd1fc6d31b2155f044499142e9b1ae5 100644
(file)
--- a/
src/tools/dcpomatic_server.cc
+++ b/
src/tools/dcpomatic_server.cc
@@
-29,9
+29,12
@@
#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_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 <wx/icon.h>
#include <wx/taskbar.h>
#include <wx/splash.h>
#include <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
@@
-48,6
+51,9
@@
using boost::thread;
using boost::bind;
using boost::optional;
using boost::dynamic_pointer_cast;
using boost::bind;
using boost::optional;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
enum {
ID_status = 1,
enum {
ID_status = 1,
@@
-72,11
+78,6
@@
public:
return a;
}
return a;
}
- string head_and_tail (int) const {
- /* Not necessary */
- return "";
- }
-
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
@@
-217,7
+218,7
@@
public:
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
#else
#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);
+ wxBitmap bitmap (wxString::Format
(wxT("%s/dcpomatic_small.png"), std_to_wx(resources
_path().string())), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif