summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-24 10:32:52 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-24 10:32:52 +0100
commit49a51ff9778f3b72ee962d3e8bd9cf71944f3c2b (patch)
tree2b916b15eabd8132bbc80b00e4a4f09edfd9eb92 /src/wx
parent084d5155d410eef68f87635876e136b224db91dc (diff)
Rename Content::_file to path and support md5sums of directories.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/audio_dialog.cc2
-rw-r--r--src/wx/timeline.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 22e09cc7a..d885e2d4d 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -94,7 +94,7 @@ AudioDialog::set_content (shared_ptr<AudioContent> c)
_content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
- SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->file().filename().string()).data()));
+ SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->path().filename().string()).data()));
}
void
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 7227fcffc..90fcf8d5c 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -156,7 +156,7 @@ private:
gc->StrokePath (path);
gc->FillPath (path);
- wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->file().filename().string()).data(), type().data());
+ wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path().filename().string()).data(), type().data());
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;