summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Eskola <timo@tolleri.net>2018-09-03 12:26:02 +0300
committerTimo Eskola <timo@tolleri.net>2018-09-03 12:26:02 +0300
commitfd9080c0778c5145842bbcd5d0ab14faca3956d0 (patch)
treede4a2caccf3a76d5e8c78c5c325d8bfc780671b4
parent7d8b8bf75276bd0d3dff03a707f7af64ca31b25f (diff)
downloadvdr-plugin-duplicates-fd9080c0778c5145842bbcd5d0ab14faca3956d0.tar.gz
vdr-plugin-duplicates-fd9080c0778c5145842bbcd5d0ab14faca3956d0.tar.bz2
Expose std::string in cDuplicateRecording.
-rw-r--r--menu.c4
-rw-r--r--recording.c4
-rw-r--r--recording.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/menu.c b/menu.c
index d584994..def6110 100644
--- a/menu.c
+++ b/menu.c
@@ -108,7 +108,7 @@ public:
cMenuDuplicateItem::cMenuDuplicateItem(cDuplicateRecording *DuplicateRecording) : visibility(DuplicateRecording->Visibility()) {
fileName = DuplicateRecording->FileName();
- SetText(DuplicateRecording->Text());
+ SetText(DuplicateRecording->Text().c_str());
}
// --- cMenuDuplicates -------------------------------------------------------
@@ -157,7 +157,7 @@ void cMenuDuplicates::Set(bool Refresh) {
CurrentRecording = cReplayControl::LastReplayed();
Clear();
for (cDuplicateRecording *Duplicates = DuplicateRecordings.First(); Duplicates; Duplicates = DuplicateRecordings.Next(Duplicates)) {
- Add(SeparatorItem(Duplicates->Text()));
+ Add(SeparatorItem(Duplicates->Text().c_str()));
for (cDuplicateRecording *Duplicate = Duplicates->Duplicates()->First(); Duplicate; Duplicate = Duplicates->Duplicates()->Next(Duplicate)) {
cMenuDuplicateItem *Item = new cMenuDuplicateItem(Duplicate);
Add(Item);
diff --git a/recording.c b/recording.c
index 05cad27..b1762e1 100644
--- a/recording.c
+++ b/recording.c
@@ -181,14 +181,14 @@ void cDuplicateRecordingScannerThread::Scan(void) {
}
}
if (duplicate->Duplicates()->Count() > 1) {
- duplicate->SetText(cString::sprintf(tr("%d duplicate recordings"), duplicate->Duplicates()->Count()));
+ duplicate->SetText(std::string(cString::sprintf(tr("%d duplicate recordings"), duplicate->Duplicates()->Count())));
duplicates.Add(duplicate);
} else
delete duplicate;
}
}
if (descriptionless->Duplicates()->Count() > 0) {
- descriptionless->SetText(cString::sprintf(tr("%d recordings without description"), descriptionless->Duplicates()->Count()));
+ descriptionless->SetText(std::string(cString::sprintf(tr("%d recordings without description"), descriptionless->Duplicates()->Count())));
duplicates.Add(descriptionless);
} else
delete descriptionless;
diff --git a/recording.h b/recording.h
index 1d2ffb2..37ec660 100644
--- a/recording.h
+++ b/recording.h
@@ -35,8 +35,8 @@ public:
bool Checked() { return checked; }
cVisibility Visibility() { return visibility; }
std::string FileName(void) { return fileName; }
- void SetText(const char *t) { text = std::string(t); }
- const char *Text(void) { return text.c_str(); }
+ void SetText(std::string t) { text = t; }
+ std::string Text(void) { return text; }
cList<cDuplicateRecording> *Duplicates(void) { return duplicates; }
};