diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
| commit | e3c78ffdb5e562841e86e6f59a20494159c44de7 (patch) | |
| tree | 81a4384eafabbd84975ccbb733c944cb6205cb46 /src/tools | |
| parent | 4c804a0d92ebd03b70bfc7f736fcaf5f77cb3bb7 (diff) | |
Rename shared_path -> resources_path.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_playlist.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 2 | ||||
| -rw-r--r-- | src/tools/swaroop_dcpomatic_playlist.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 77dd643d7..50fed2c94 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -277,9 +277,9 @@ public: tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE); no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE); #else - boost::filesystem::path tick_path = shared_path() / "tick.png"; + boost::filesystem::path tick_path = resources_path() / "tick.png"; tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG); - boost::filesystem::path no_tick_path = shared_path() / "no_tick.png"; + boost::filesystem::path no_tick_path = resources_path() / "no_tick.png"; no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG); #endif images->Add (tick_icon); diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 696fec09a..b51f29c15 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -218,7 +218,7 @@ public: #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 diff --git a/src/tools/swaroop_dcpomatic_playlist.cc b/src/tools/swaroop_dcpomatic_playlist.cc index 73fcbf802..a15a7c6bd 100644 --- a/src/tools/swaroop_dcpomatic_playlist.cc +++ b/src/tools/swaroop_dcpomatic_playlist.cc @@ -115,9 +115,9 @@ public: tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE); no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE); #else - boost::filesystem::path tick_path = shared_path() / "tick.png"; + boost::filesystem::path tick_path = resources_path() / "tick.png"; tick_icon.LoadFile (std_to_wx(tick_path.string())); - boost::filesystem::path no_tick_path = shared_path() / "no_tick.png"; + boost::filesystem::path no_tick_path = resources_path() / "no_tick.png"; no_tick_icon.LoadFile (std_to_wx(no_tick_path.string())); #endif images->Add (tick_icon); |