summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epg_events.cpp10
-rw-r--r--epg_events.h12
-rw-r--r--pages/whats_on.ecpp6
-rw-r--r--po/ca_ES.po6
-rw-r--r--po/cs_CZ.po6
-rw-r--r--po/da_DK.po6
-rw-r--r--po/de_DE.po7
-rw-r--r--po/el_GR.po6
-rw-r--r--po/es_ES.po6
-rw-r--r--po/et_EE.po6
-rw-r--r--po/fi_FI.po10
-rw-r--r--po/fr_FR.po7
-rw-r--r--po/hr_HR.po6
-rw-r--r--po/hu_HU.po6
-rw-r--r--po/it_IT.po10
-rw-r--r--po/nl_NL.po7
-rw-r--r--po/nn_NO.po6
-rw-r--r--po/pl_PL.po6
-rw-r--r--po/pt_PT.po6
-rw-r--r--po/ro_RO.po6
-rw-r--r--po/ru_RU.po6
-rw-r--r--po/sl_SI.po6
-rw-r--r--po/sv_SE.po6
-rw-r--r--po/tr_TR.po6
24 files changed, 138 insertions, 27 deletions
diff --git a/epg_events.cpp b/epg_events.cpp
index 9496714..7d22cdf 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -98,11 +98,6 @@ namespace vdrlive
return "";
}
- const cChannel* EpgString::Channel() const
- {
- return NULL;
- }
-
// virtual const std::string Archived() const { return std::string(); }
time_t EpgString::GetStartTime() const
@@ -169,11 +164,6 @@ namespace vdrlive
return (info && info->Description()) ? info->Description() : "";
}
- const cChannel* EpgRecording::Channel() const
- {
- return NULL;
- }
-
const string EpgRecording::Archived() const
{
if (!m_checkedArchived) {
diff --git a/epg_events.h b/epg_events.h
index f1b8bdf..8678eef 100644
--- a/epg_events.h
+++ b/epg_events.h
@@ -35,7 +35,7 @@ namespace vdrlive
virtual std::string const LongDescr() const = 0;
- virtual const cChannel* Channel() const = 0;
+ virtual cChannel const * Channel() const { return 0; }
virtual std::string const Archived() const { return ""; }
@@ -84,8 +84,6 @@ namespace vdrlive
virtual time_t GetEndTime() const;
- virtual const cChannel* Channel() const;
-
private:
const std::string m_info;
};
@@ -99,7 +97,7 @@ namespace vdrlive
protected:
EpgEvent(std::string const &id,
cEvent const *event,
- const char* channelName);
+ char const *channelName);
public:
virtual ~EpgEvent();
@@ -114,10 +112,10 @@ namespace vdrlive
virtual time_t GetEndTime() const { return m_event->EndTime(); }
- virtual const cChannel* Channel() const { return Channels.GetByChannelID(m_event->ChannelID());}
+ virtual cChannel const * Channel() const { return Channels.GetByChannelID(m_event->ChannelID());}
private:
- const cEvent* m_event;
+ cEvent const * m_event;
};
// -------------------------------------------------------------------------
@@ -150,8 +148,6 @@ namespace vdrlive
virtual time_t GetEndTime() const;
- virtual const cChannel* Channel() const;
-
private:
const cRecording* m_recording;
bool m_ownCaption;
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 4a7948f..7744b4d 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -132,13 +132,13 @@ if (type == "now") {
if (!Event) {
continue;
}
-
+
EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event);
eventList.push_back(epgEvent);
}
}
- }
- else // get favorite broadcasts from epgsearch
+ }
+ else // get favorite broadcasts from epgsearch
{
SearchResults results;
SearchTimers timers;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 64222ff..3c60aec 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -111,6 +111,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -564,6 +567,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index daf2766..549a7f5 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index 97fb28c..fd777e8 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 1aafb3c..c05e8d2 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -111,6 +111,10 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+#, fuzzy
+msgid "channels"
+msgstr "Kanal"
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -564,6 +568,9 @@ msgstr "Fehlerberichte und Vorschläge"
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr "Für Fehler oder Verbesserungsvorschläge steht unser Bugtracker bereit"
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr "Liste der Aufnahmen"
diff --git a/po/el_GR.po b/po/el_GR.po
index aa9cf93..5161941 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 02de7dc..7e125c7 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index e151d6a..7d11e82 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 232d0b5..e76f122 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -109,6 +109,10 @@ msgstr "Ensisijaisen DVB-sovittimen käyttäminen epäonnistui!"
msgid "Couldn't grab image from primary device"
msgstr "Kuvan kaappaus ensisijaiselta DVB-sovittimelta epäonnistui!"
+#, fuzzy
+msgid "channels"
+msgstr "Kanava"
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr "Kanavien käyttäminen epäonnistui! Yritä myöhemmin uudelleen."
@@ -562,6 +566,9 @@ msgstr "Virheraportoinnit ja parannusehdotukset"
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr "Voit raportoida sekä virheet että parannusehdotukset suoraan havaintotietokantaan"
+msgid "RecDate"
+msgstr "Tallenteen päiväys"
+
msgid "List of recordings"
msgstr "Tallennelistaus"
@@ -751,6 +758,3 @@ msgstr "Listanäkymä"
#, fuzzy
#~ msgid "hours"
#~ msgstr "Tekijät"
-
-#~ msgid "RecDate"
-#~ msgstr "Tallenteen päiväys"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index a3ced0e..fe047d4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -113,6 +113,10 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+#, fuzzy
+msgid "channels"
+msgstr "à la chaîne"
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -566,6 +570,9 @@ msgstr "Bogues et suggestions"
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr "Si vous rencontrez n'importe quels bogue ou voudriez suggérer de nouveaux dispositifs, employer notre bugtracker svp"
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr "Liste des enregistrements"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 8d4f0e6..c26b923 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 882a63e..c08531b 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index d21a539..8125e20 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -111,6 +111,10 @@ msgstr "Impossibile identificare scheda primaria"
msgid "Couldn't grab image from primary device"
msgstr "Impossibile ottenere immagine da scheda primaria"
+#, fuzzy
+msgid "channels"
+msgstr "Canale"
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr "Impossibile avere accesso ai canali, per favore riprova più tardi."
@@ -564,6 +568,9 @@ msgstr "Rapporto errori e proposte"
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr "Se riscontri degli errori o vuoi chiedere nuove funzioni utilizza il nostro bugtracker"
+msgid "RecDate"
+msgstr "Data reg."
+
msgid "List of recordings"
msgstr "Lista registrazioni"
@@ -753,6 +760,3 @@ msgstr "Vedi come elenco"
#, fuzzy
#~ msgid "hours"
#~ msgstr "Autori"
-
-#~ msgid "RecDate"
-#~ msgstr "Data reg."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9e2f7ee..d195b1e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -112,6 +112,10 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+#, fuzzy
+msgid "channels"
+msgstr "tot kanaal"
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -565,6 +569,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index abbdfa5..a084c19 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 3c1d821..48fffac 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e7fbc49..b67b1a0 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index fcbfacb..9afff41 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1ed1b33..ccbac58 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index bc7593f..d60fd98 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 99699d7..5337d23 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -110,6 +110,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -563,6 +566,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 9b74900..bf653ae 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -109,6 +109,9 @@ msgstr ""
msgid "Couldn't grab image from primary device"
msgstr ""
+msgid "channels"
+msgstr ""
+
msgid "Couldn't aquire access to channels, please try again later."
msgstr ""
@@ -562,6 +565,9 @@ msgstr ""
msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
msgstr ""
+msgid "RecDate"
+msgstr ""
+
msgid "List of recordings"
msgstr ""
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 07:13:20 +0000