From 0ecf9599e6eedbc3e9f8dc322d200a8c602724a3 Mon Sep 17 00:00:00 2001 From: tobe Date: Sat, 29 Apr 2006 06:52:33 +0000 Subject: AC3-Streaming, compatible with vdr >= 1.3.47 git-svn-id: svn://svn.berlios.de/ffnetdev/trunk@14 1f4bef6d-8e0a-0410-8695-e467da8aaccf --- ffnetdev.c | 12 +++++++++++- ffnetdev.h | 5 +++++ i18n.c | 16 ++++++++++++++++ pes2ts.c | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ffnetdev.c b/ffnetdev.c index 5a302f1..0687201 100644 --- a/ffnetdev.c +++ b/ffnetdev.c @@ -127,9 +127,19 @@ bool cPluginFFNetDev::ProcessArgs(int argc, char *argv[]) return true; } +#if VDRVERSNUM >= 10347 +cString cPluginFFNetDev::Active(void) { + + if(cOSDWorker::Active() || cTSWorker::Active()) + return tr("ffnetdev is running"); + + return NULL; +} +#elif bool cPluginFFNetDev::Active(void) { - return (cOSDWorker::Active() || cTSWorker::Active()); + return (cOSDWorker::Active() || cTSWorker::Active()); } +#endif bool cPluginFFNetDev::Start(void) { diff --git a/ffnetdev.h b/ffnetdev.h index 9e5e327..cd9848c 100644 --- a/ffnetdev.h +++ b/ffnetdev.h @@ -40,7 +40,12 @@ public: virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); virtual bool SetupParse(const char *Name, const char *Value); + +#if VDRVERSNUM >= 10347 + virtual cString Active(void); +#elif virtual bool Active(void); +#endif void SetPrimaryDevice(); void RestorePrimaryDevice(); diff --git a/i18n.c b/i18n.c index 9a6eff7..7af8c48 100644 --- a/i18n.c +++ b/i18n.c @@ -40,5 +40,21 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO }, + { "ffnetdev is running", + "ffnetdev läuft gerade", + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + "",// TODO + }, { NULL } }; diff --git a/pes2ts.c b/pes2ts.c index 506abd9..f7d7f55 100644 --- a/pes2ts.c +++ b/pes2ts.c @@ -117,7 +117,7 @@ void cPES2TSRemux::Action(void) // check for valid stream id type: is it video or audio or unknown? - if ( (data[3]>=0xC0) && (data[3]<=0xDF) ) { + if ( (data[3]>=0xC0) && (data[3]<=0xDF) || data[3] == 0xBD ) { pid=apid; cc=&acc; } -- cgit v1.2.3