From 8465398c6d2a57bc30a07fb61353a7c8ba6db574 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 21 Oct 2001 18:00:00 +0200 Subject: =?UTF-8?q?Version=200.97=20-=20Implemented=20a=20lock=20file=20to?= =?UTF-8?q?=20prevent=20more=20than=20one=20instance=20of=20VDR=20from=20r?= =?UTF-8?q?emoving=20=20=20files=20from=20the=20video=20directory=20at=20t?= =?UTF-8?q?he=20same=20time.=20-=20The=20new=20setup=20parameter=20SplitEd?= =?UTF-8?q?itedFiles=20can=20be=20used=20to=20control=20whether=20or=20=20?= =?UTF-8?q?=20not=20the=20result=20of=20an=20editing=20process=20shall=20b?= =?UTF-8?q?e=20written=20into=20separate=20files.=20-=20Fixed=20handling?= =?UTF-8?q?=20repeat=20function=20when=20using=20LIRC=20(thanks=20to=20Mat?= =?UTF-8?q?thias=20Weingart).=20-=20The=20shutdown=20program=20(defined=20?= =?UTF-8?q?with=20the=20'-s'=20option)=20now=20also=20gets=20the=20channel?= =?UTF-8?q?=20=20=20number=20and=20recording=20title=20of=20the=20timer=20?= =?UTF-8?q?(see=20INSTALL).=20-=20New=20channel=20data=20for=20'Premiere?= =?UTF-8?q?=20One',=20'Premiere=20X-Action',=20'Fox=20Kids=20T=FCrkce'=20?= =?UTF-8?q?=20=20and=20'N24'=20(thanks=20to=20Andreas=20Share,=20Ulrich=20?= =?UTF-8?q?R=F6der,=20Uwe=20Scheffler=20and=20Simon=20=20=20Bauschulte).?= =?UTF-8?q?=20Note=20that=20if=20you=20are=20using=20the=20default=20'chan?= =?UTF-8?q?nels.conf'=20or=20=20=20'channels.conf.cable'=20files=20you=20m?= =?UTF-8?q?ay=20need=20to=20check=20any=20exiting=20timers=20to=20see=20?= =?UTF-8?q?=20=20whether=20they=20still=20use=20the=20correct=20channel=20?= =?UTF-8?q?number.=20-=20Fixed=20the=20"EPG=20bugfix"=20(sometimes=20had?= =?UTF-8?q?=20duplicate=20information=20in=20Subtitle=20and=20=20=20Extend?= =?UTF-8?q?ed=20Description).=20-=20Fixed=20checking=20for=20valid=20video?= =?UTF-8?q?=20device=20when=20setting=20the=20video=20mode.=20-=20The=20ex?= =?UTF-8?q?ternal=20command=20'sort'=20is=20no=20longer=20required.=20VDR?= =?UTF-8?q?=20now=20sorts=20the=20list=20of=20=20=20recordings=20itself,?= =?UTF-8?q?=20making=20sure=20that=20recordings=20that=20stem=20from=20rep?= =?UTF-8?q?eating=20timers=20=20=20are=20sorted=20chronologically.=20Sorti?= =?UTF-8?q?ng=20is=20done=20according=20to=20the=20setting=20of=20the=20?= =?UTF-8?q?=20=20current=20locale,=20so=20you=20may=20want=20to=20make=20s?= =?UTF-8?q?ure=20LC=5FCOLLATE=20is=20set=20to=20the=20desired=20=20=20valu?= =?UTF-8?q?e=20(see=20INSTALL).=20-=20Fixed=20handling=20'newline'=20chara?= =?UTF-8?q?cters=20in=20EPG=20texts=20(thanks=20to=20Rolf=20Hakenes=20for?= =?UTF-8?q?=20=20=20an=20improved=20version=20of=20his=20'libdtv').=20=20?= =?UTF-8?q?=20Newline=20characters=20are=20always=20mapped=20to=20a=20sing?= =?UTF-8?q?le=20"blank"=20in=20VDR,=20because=20they=20=20=20would=20other?= =?UTF-8?q?wise=20disturb=20the=20Title=20and=20Subtitle=20layout=20in=20t?= =?UTF-8?q?he=20channel=20display=20=20=20(where=20these=20are=20assumed?= =?UTF-8?q?=20to=20be=20single=20line=20texts)=20and=20would=20have=20to?= =?UTF-8?q?=20be=20=20=20specially=20handled=20in=20the=20'epg.data'=20fil?= =?UTF-8?q?e=20and=20the=20LSTE=20command=20in=20SVDRP.=20-=20Mapping=20`?= =?UTF-8?q?=20("backtick")=20characters=20in=20EPG=20texts=20to=20'=20(sin?= =?UTF-8?q?gle=20quote).=20-=20Fixed=20timers=20starting=20and=20ending=20?= =?UTF-8?q?at=20unexpected=20times.=20'localtime()'=20was=20not=20=20=20th?= =?UTF-8?q?read=20safe,=20now=20using=20localtime=5Fr().=20-=20Removed=20t?= =?UTF-8?q?he=20"system=20time=20seen..."=20message.=20-=20Fixed=20a=20bug?= =?UTF-8?q?=20in=20the=20replay=20mode=20display=20when=20pressing=20the?= =?UTF-8?q?=20Green=20or=20Yellow=20=20=20button=20while=20in=20trick=20mo?= =?UTF-8?q?de=20(thanks=20to=20Stefan=20Huelswitt)=20-=20Closing=20all=20o?= =?UTF-8?q?pen=20file=20descriptors=20when=20calling=20external=20programs?= =?UTF-8?q?.=20-=20The=20menu=20timeout=20now=20also=20works=20when=20pres?= =?UTF-8?q?sing=20the=20"Back"=20button=20during=20replay=20=20=20to=20ent?= =?UTF-8?q?er=20the=20"Recordings"=20menu.=20-=20Updated=20'channels.conf'?= =?UTF-8?q?=20for=20the=20"Bundesliga"=20channels=20of=20Premiere=20World?= =?UTF-8?q?=20=20=20(thanks=20to=20Helmut=20Sch=E4chner).=20-=20Fixed=20re?= =?UTF-8?q?ading=20timers.conf=20and=20channels.conf=20that=20contain=20bl?= =?UTF-8?q?anks=20after=20numeric=20=20=20values.=20-=20Fixed=20handling?= =?UTF-8?q?=20trick=20modes=20near=20the=20beginning=20and=20end=20of=20a?= =?UTF-8?q?=20recording.=20-=20Pressing=20the=20"Back"=20button=20while=20?= =?UTF-8?q?replaying=20a=20DVD=20now=20leads=20to=20the=20DVD=20menu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libdtv/libsi/include/libsi.h | 178 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 166 insertions(+), 12 deletions(-) (limited to 'libdtv/libsi/include/libsi.h') diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h index 3790ae1..dda2b1e 100644 --- a/libdtv/libsi/include/libsi.h +++ b/libdtv/libsi/include/libsi.h @@ -4,9 +4,9 @@ /// /// ////////////////////////////////////////////////////////////// -// $Revision: 1.1 $ -// $Date: 2001/06/26 07:18:43 $ -// $Author: kls $ +// $Revision: 1.4 $ +// $Date: 2001/10/07 10:24:46 $ +// $Author: hakenes $ // // (C) 2001 Rolf Hakenes , under the GNU GPL. // @@ -288,18 +288,20 @@ struct PidInfo { } while (0) -#define STREAMTYPE_ISO_VIDEO 1 +#define STREAMTYPE_11172_VIDEO 1 #define STREAMTYPE_13818_VIDEO 2 #define STREAMTYPE_11172_AUDIO 3 #define STREAMTYPE_13818_AUDIO 4 -#define STREAMTYPE_VIDEOTEXT 6 -#define STREAMTYPE_13522_MPEG 7 -#define STREAMTYPE_ITU_222 8 -#define STREAMTYPE_13818_A 9 -#define STREAMTYPE_13818_B 10 -#define STREAMTYPE_13818_C 11 -#define STREAMTYPE_13818_D 12 -#define STREAMTYPE_13818_AUX 13 +#define STREAMTYPE_13818_PRIVATE 5 +#define STREAMTYPE_13818_PES_PRIVATE 6 +#define STREAMTYPE_13522_MHPEG 7 +#define STREAMTYPE_13818_DSMCC 8 +#define STREAMTYPE_ITU_222_1 9 +#define STREAMTYPE_13818_A 10 +#define STREAMTYPE_13818_B 11 +#define STREAMTYPE_13818_C 12 +#define STREAMTYPE_13818_D 13 +#define STREAMTYPE_13818_AUX 14 /* Descriptors */ @@ -331,6 +333,58 @@ struct Iso639LanguageDescriptor { } while (0) +/* Ac3Descriptor */ + +#define AC3_TYPE_FLAG 0x0001 +#define BS_ID_FLAG 0x0002 +#define MAIN_ID_FLAG 0x0004 +#define ASVC_FLAG 0x0008 + +struct Ac3Descriptor { + struct NODE Node; + unsigned short Tag; + unsigned short PresentFlags; + unsigned short Ac3Type; + unsigned short BsId; + unsigned short MainId; + unsigned short Asvc; + unsigned short Amount; /* AdditionalData */ + unsigned char *AdditionalData; +}; + +#define CreateAc3Descriptor(descr) \ + do \ + { \ + xCreateNode (((struct Ac3Descriptor *)descr), NULL); \ + ((struct Ac3Descriptor *)descr)->Tag = DESCR_AC3; \ + } while (0) + +#define AddAc3FlagAndValue(descr, flg, val) \ + do \ + { \ + if ((flg) & AC3_TYPE_FLAG) { \ + ((struct Ac3Descriptor *)descr)->PresentFlags |= AC3_TYPE_FLAG; \ + ((struct Ac3Descriptor *)descr)->Ac3Type = (val); } \ + else if ((flg) & BS_ID_FLAG) { \ + ((struct Ac3Descriptor *)descr)->PresentFlags |= BS_ID_FLAG; \ + ((struct Ac3Descriptor *)descr)->BsId = (val); } \ + else if ((flg) & MAIN_ID_FLAG) { \ + ((struct Ac3Descriptor *)descr)->PresentFlags |= MAIN_ID_FLAG; \ + ((struct Ac3Descriptor *)descr)->MainId = (val); } \ + else if ((flg) & ASVC_FLAG) { \ + ((struct Ac3Descriptor *)descr)->PresentFlags |= ASVC_FLAG; \ + ((struct Ac3Descriptor *)descr)->Asvc = (val); } \ + } while (0) + +#define AddAc3AdditionalData(descr, ptr, len) \ + do \ + { \ + xMemAlloc ((len)+1, &(((struct Ac3Descriptor *) \ + descr)->AdditionalData)); \ + memcpy ((((struct Ac3Descriptor *)descr)->AdditionalData),(ptr),(len)); \ + } while (0) + + /* AncillaryDataDescriptor */ struct AncillaryDataDescriptor { @@ -778,6 +832,106 @@ struct ShortEventDescriptor { } while (0) +/* TeletextDescriptor */ + +struct TeletextDescriptor { + struct NODE Node; + unsigned short Tag; + struct LIST *Items; +}; + +#define CreateTeletextDescriptor(descr) \ + do \ + { \ + xCreateNode (((struct TeletextDescriptor *)descr), NULL); \ + ((struct TeletextDescriptor *)descr)->Tag = DESCR_TELETEXT; \ + ((struct TeletextDescriptor *)descr)->Items = xNewList (NULL); \ + } while (0) + +#define TELETEXT_TYPE_INITIAL_PAGE 0x0001 +#define TELETEXT_TYPE_SUBTITLE_PAGE 0x0002 +#define TELETEXT_TYPE_ADDITIONAL_INFO 0x0003 +#define TELETEXT_TYPE_PROGRAM_SCHEDULE 0x0004 +#define TELETEXT_TYPE_HEARING_IMPAIRED 0x0005 + +struct TeletextItem { + struct NODE Node; + char LanguageCode[4]; + unsigned short Type; + unsigned short MagazineNumber; + unsigned short PageNumber; +}; + +#define CreateTeletextItem(itm, tp, mg, pg, lc1, lc2, lc3) \ + do \ + { \ + xCreateNode (itm, NULL); \ + ((struct TeletextItem *)itm)->Type = (tp); \ + ((struct TeletextItem *)itm)->MagazineNumber = (mg); \ + ((struct TeletextItem *)itm)->PageNumber = (mg); \ + ((struct TeletextItem *)itm)->LanguageCode[0] = (lc1); \ + ((struct TeletextItem *)itm)->LanguageCode[1] = (lc2); \ + ((struct TeletextItem *)itm)->LanguageCode[2] = (lc3); \ + ((struct TeletextItem *)itm)->LanguageCode[3] = '\0'; \ + } while (0) + +#define AddTeletextItem(desc, tp, mg, pg, lc1, lc2, lc3) \ + do \ + { \ + struct TeletextItem *item; \ + \ + CreateTeletextItem(item, tp, mg, pg, lc1, lc2, lc3); \ + xAddTail (((struct TeletextDescriptor *)desc)->Items, item); \ + } while (0) + + +/* SubtitlingDescriptor */ + +struct SubtitlingDescriptor { + struct NODE Node; + unsigned short Tag; + struct LIST *Items; +}; + +#define CreateSubtitlingDescriptor(descr) \ + do \ + { \ + xCreateNode (((struct SubtitlingDescriptor *)descr), NULL); \ + ((struct SubtitlingDescriptor *)descr)->Tag = DESCR_SUBTITLING; \ + ((struct SubtitlingDescriptor *)descr)->Items = xNewList (NULL); \ + } while (0) + +struct SubtitlingItem { + struct NODE Node; + char LanguageCode[4]; + unsigned char Type; + unsigned short CompositionPageId; + unsigned short AncillaryPageId; +}; + +#define CreateSubtitlingItem(itm, tp, cp, ap, lc1, lc2, lc3) \ + do \ + { \ + xCreateNode (itm, NULL); \ + ((struct SubtitlingItem *)itm)->Type = (tp); \ + ((struct SubtitlingItem *)itm)->CompositionPageId = (cp); \ + ((struct SubtitlingItem *)itm)->AncillaryPageId = (ap); \ + ((struct SubtitlingItem *)itm)->LanguageCode[0] = (lc1); \ + ((struct SubtitlingItem *)itm)->LanguageCode[1] = (lc2); \ + ((struct SubtitlingItem *)itm)->LanguageCode[2] = (lc3); \ + ((struct SubtitlingItem *)itm)->LanguageCode[3] = '\0'; \ + } while (0) + +#define AddSubtitlingItem(desc, tp, cp, ap, lc1, lc2, lc3) \ + do \ + { \ + struct SubtitlingItem *item; \ + \ + CreateSubtitlingItem(item, tp, cp, ap, lc1, lc2, lc3); \ + xAddTail (((struct SubtitlingDescriptor *)desc)->Items, item); \ + } while (0) + + /* Prototypes */ -- cgit v1.2.3