Changeset 1241


Ignore:
Timestamp:
01/15/10 20:48:18 (11 years ago)
Author:
landlord
Message:

Now the new 'oscam.srvid' format supports comments and empty lines, too, thanks to alno

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Distribution/doc/example/oscam.srvid

    r1237 r1241  
     1#
     2# Sky Deutschland
     3#
     4
    151702,1722,1833,1834,09C4:000C|Sky|Nat Geo Wild|TV|Sky Welt
    261702,1722,1833,1834,09C4:000D|Sky|National Geographic Channel|TV|Sky Welt
     
    19231702,1722,1833,1834,09C4:00A8|Sky|Motorvision TV|TV|Sky Welt
    20241702,1722,1833,1834,09C4:0206|Sky|Goldstar TV|TV|Sky Welt
     25
    21261702,1722,1833,1834,09C4:0096|Sky|Deutsche Charts|Radio|Sky MCE
    22271702,1722,1833,1834,09C4:0097|Sky|Rock Hymnen|Radio|Sky MCE
     
    26311702,1722,1833,1834,09C4:009B|Sky|R&B/Hip Hop|Radio|Sky MCE
    27321702,1722,1833,1834,09C4:009C|Sky|Country|Radio|Sky MCE
     33
    28341702,1722,1833,1834,09C4:0008|Sky|Sky Comedy|TV|Sky Film
    29351702,1722,1833,1834,09C4:0009|Sky|Sky Action|TV|Sky Film
     
    36421702,1722,1833,1834,09C4:0203|Sky|MGM|TV|Sky Film
    37431702,1722,1833,1834,09C4:0204|Sky|Sky Nostalgie|TV|Sky Film
     44
    38451702,1722,1833,1834,09C4:0011|Sky|Sky Sport Info|TV|Sky Sport
    39461702,1833,09C4:0035|Sky|Sky Sport Austria|TV|Sky Sport
     
    51581702,1722,1833,1834,09C4:016B|Sky|Sky Sport 016B|TV|Sky Sport
    52591702,1722,1833,1834,09C4:0175|Sky|Sky Sport 0175|TV|Sky Sport
     60
    53611702,1722,1833,1834,09C4:00DF|Sky|Sky Bundesliga|TV|Sky Bundesliga
    54621702,1722,1833,1834,09C4:00FC|Sky|Sky Bundesliga 00FC|TV|Sky Bundesliga
     
    63711702,1722,1833,1834,09C4:0156|Sky|Sky Bundesliga 0156|TV|Sky Bundesliga
    64721702,1722,1833,1834,09C4:0160|Sky|Sky Bundesliga 0160|TV|Sky Bundesliga
     73
    65741702,1722,1833,1834,09C4:00FB|Sky|Sky Select 00FB|TV|Sky Select
    66751702,1722,1833,1834,09C4:00FE|Sky|Sky Select 00FE|TV|Sky Select
     
    74831702,1722,1833,1834,09C4:0141|Sky|Sky Select 0141|TV|Sky Select
    75841702,1722,1833,1834,09C4:014B|Sky|Sky Select 014B|TV|Sky Select
     85
    76861702,1722,1833,1834,09C4:007E|Sky|Disney Cinemagic HD|TV|Sky HD
    77871702,1722,1833,1834,09C4:007F|Sky|National Geographic HD|TV|Sky HD
     
    81911702,1722,1833,1834,09C4:0083|Sky|Sky Cinema HD|TV|Sky HD
    82921702,1722,1833,1834,09C4:0084|Sky|Eurosport HD|TV|Sky HD
     93
    83941702,1833,09C4:003C|Sky|Kinowelt TV|TV|Sky Welt Extra
    84951702,1833,09C4,0D22:003D|Sky|TNT Film (TCM)|TV|Sky Welt Extra
     
    991101702,1833,09C4,0D00:7009|Sky|MTV Entertainment|TV|Sky Welt Extra
    1001111702,1833,09C4,0D00:700A|Sky|Nick Premium|TV|Sky Welt Extra
     112
    1011131702,1722,1833,1834,09C4:000F|Sky|BigBrother|TV|Sky sonstige
     114
    1021151702,1722,1833,1834,1836,09C4:0201|Sky|Blue Movie Info|TV|Sky Erotik
    1031161702,1722,1833,1834,1836,09C4:0159|Sky|Blue Movie 1|TV|Sky Erotik
    1041171702,1722,1833,1834,1836,09C4:0163|Sky|Blue Movie 2|TV|Sky Erotik
    1051181702,1722,1833,1834,1836,09C4:016D|Sky|Blue Movie 3|TV|Sky Erotik
     119
     120#
     121# Kabel Deutschland
     122#
     123
    1061241722,1801:C3B5|KD|Fashion TV|TV|
    1071251722,1801:C3B6|KD|Motors TV|TV|
     
    2823001722,1801:CFD3|KD|ATV Avrupa|TV|turkish
    2833011722,1801:CFD5|KD|Euro D|TV|turkish
     302
     303#
     304# ORF
     305#
     306
    2843070D05:32C9|ORF|ORF1|TV|
    2853080D05:32CA|ORF|ORF2|TV|
     
    2933160D05:32D2|ORF|ORF2 St|TV|
    2943170D05:32D3|ORF|ORF2 K|TV|
     318
    2953190D05:32D4|ORF|ATV+|TV|
    2963200D05:3332|ORF|Austria 9 TV|TV|
    2973210D05:4E27|ORF|Puls 4 Austria|TV|
     322
    2983230D05:132F|ORF|ORF1 HD|TV|
    2993240D05:1330|ORF|ORF2 HD|TV|
     325
     326#
     327# MTV Unlimited
     328#
     329
    3003300B00:6FF3|MTV Unlimited|MTV TWO|TV|
    3013310B00:6FEE|MTV Unlimited|MTV Hits|TV|
     
    3043340B00:6FF0|MTV Unlimited|VH1 Europe|TV|
    3053350B00:6FFF|MTV Unlimited|MTV Music|TV|
     336
     337#
     338# Schweizer Fernsehen
     339#
     340
    3063410500:0385|Schweizer Fernsehen|SF1|TV|
    3073420500:038F|Schweizer Fernsehen|SF info|TV|
    3083430500:038B|Schweizer Fernsehen|SF zwei|TV|
     344
    3093450500:03DE|Schweizer Fernsehen|HD suisse|TV|
     346
    3103470500&023800:36B2|Television Suisse Romande|TSR1|TV|
    3113480500&023800:36B8|Television Suisse Romande|TSR2|TV|
     349
    3123500500&023800:36B3|Televisione svizzera di lingua italiana|TSI1|TV|
    3133510500&023800:36B9|Televisione svizzera di lingua italiana|TSI1|TV|
     352
     353#
     354# Astra HD+
     355#
     356
    3143571830:EF10|Astra HD+|RTL HD|TV|
    3153581830:EF11|Astra HD+|VOX HD|TV|
    3163591830:277E|Astra HD+|. (SD)|TV|
     360
     361#
     362# Unity Media
     363#
     364
    3173651722:71ad|UM|Record Internacional Europa|TV|
    3183661722:71ae|UM|Tkshow TV|TV|
  • trunk/Distribution/doc/man/oscam.srvid.5

    r1237 r1241  
    1111mapping between CAID, service ID, provider, name, type and description of service
    1212.RE
    13 
    14 \fIEmpty lines are not allowed in \fBoscam.srvid\fP.\fR
    1513.SH EXAMPLES
    1614 0001,0002,0003:000a|my provider 1|tv name 1|tv|my tv package
  • trunk/Distribution/doc/txt/oscam.srvid.txt

    r1237 r1241  
    1515      tion of service
    1616
    17        Empty lines are not allowed in oscam.srvid.
    18 
    1917EXAMPLES
    2018    0001,0002,0003:000a|my provider 1|tv name 1|tv|my tv package
  • trunk/oscam-config.c

    r1237 r1241  
    10331033        int l;
    10341034        void *ptr;
    1035         if ((l=strlen(trim(token))) < 6) continue;
     1035                char *tmp;
     1036                tmp = trim(token);
     1037
     1038                if (tmp[0] == '#') continue;
     1039                if ((l=strlen(tmp)) < 6) continue;
    10361040        if (!(payload=strchr(token, '|'))) continue;
    10371041        *payload++ = '\0';
    1038         //if (strlen(token)!=4) continue;
    10391042
    10401043        if (!(ptr = malloc(sizeof(struct s_srvid)))) {
Note: See TracChangeset for help on using the changeset viewer.