1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed adding new source types in case they are already registered

This commit is contained in:
Klaus Schmidinger 2014-03-09 12:15:08 +01:00
parent ff1422a75a
commit e823560ec5
5 changed files with 20 additions and 6 deletions

View File

@ -1176,6 +1176,8 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
for a patch that was used to rename the "plp id" to a more general "stream id" for a patch that was used to rename the "plp id" to a more general "stream id"
and add support for DVB-S2 "Input Stream Identifier" (ISI) and add support for DVB-S2 "Input Stream Identifier" (ISI)
for fixing clearing non-editable members in the channel editor for fixing clearing non-editable members in the channel editor
for reporting a problem with adding new source types in case they are already
registered
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

View File

@ -7870,7 +7870,7 @@ Video Disk Recorder Revision History
and also to use the correct directory with --edit (the latter reported by Marko and also to use the correct directory with --edit (the latter reported by Marko
Mäkelä). Mäkelä).
2014-03-08: Version 2.0.6 2014-03-09: Version 2.0.6
- Updated 'sources.conf' (thanks to Antti Hartikainen). - Updated 'sources.conf' (thanks to Antti Hartikainen).
- cFont::CreateFont() now returns a dummy font in case there are no fonts installed. - cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
@ -7904,3 +7904,5 @@ Video Disk Recorder Revision History
on some HD channels to get stuck and resulted in buffer overflows. on some HD channels to get stuck and resulted in buffer overflows.
- Fixed handling PAT packets when detecting frames, so that they can be properly - Fixed handling PAT packets when detecting frames, so that they can be properly
taken into account when regenerating the index of a recording. taken into account when regenerating the index of a recording.
- Fixed adding new source types in case they are already registered (reported by Rolf
Ahrenberg).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: sourceparams.c 1.2 2010/03/06 11:13:39 kls Exp $ * $Id: sourceparams.c 1.2.1.1 2014/03/09 12:13:18 kls Exp $
*/ */
#include "sourceparams.h" #include "sourceparams.h"
@ -21,8 +21,8 @@ cSourceParam::cSourceParam(char Source, const char *Description)
return; return;
} }
SourceParams.Add(this); SourceParams.Add(this);
if (!strchr("ACST", Source)) // no, it's not "ATSC" ;-) if (!Sources.ContainsSourceType(source))
Sources.Add(new cSource(Source, Description)); Sources.Add(new cSource(source, Description));
dsyslog("registered source parameters for '%c - %s'", source, Description); dsyslog("registered source parameters for '%c - %s'", source, Description);
} }
else else

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: sources.c 2.2 2010/02/28 15:15:39 kls Exp $ * $Id: sources.c 2.2.1.1 2014/03/09 12:13:25 kls Exp $
*/ */
#include "sources.h" #include "sources.h"
@ -112,3 +112,12 @@ cSource *cSources::Get(int Code)
} }
return NULL; return NULL;
} }
bool cSources::ContainsSourceType(char SourceType)
{
for (cSource *p = First(); p; p = Next(p)) {
if (cSource::ToChar(p->Code()) == SourceType)
return true;
}
return false;
}

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: sources.h 2.4 2012/06/17 11:19:23 kls Exp $ * $Id: sources.h 2.4.1.1 2014/03/09 12:13:34 kls Exp $
*/ */
#ifndef __SOURCES_H #ifndef __SOURCES_H
@ -47,6 +47,7 @@ public:
class cSources : public cConfig<cSource> { class cSources : public cConfig<cSource> {
public: public:
cSource *Get(int Code); cSource *Get(int Code);
bool ContainsSourceType(char SourceType);
}; };
extern cSources Sources; extern cSources Sources;