Index: data/callsigntonetwork.txt =================================================================== --- data/callsigntonetwork.txt (revision 12401) +++ data/callsigntonetwork.txt (working copy) @@ -1,5 +1,6 @@ 5MAX CINEMAX ABC ABCau +abc1 abc1 ABC2 ABC2au ACC AustralianChristianCh ACMAXP CINEMAX @@ -20,10 +21,18 @@ AZNNW AZN AZNTV AZN BBCA BBCA +BBCi BBCi +BBCONE-London BBCONE-London +BBCTWO-London BBCTWO-London +BBCTHREE BBCTHREE +BBCFOUR BBCFOUR +BBCNEWS24 BBCNEWS24 +BBCPARLMNT BBCPARLIAMENT BBCWorld BBCWorld BET BET BETJAZZ BET BETP BET +bidtv BidTV BIO BIO BLKFAM BLKFAM BLKSTZ STARZ @@ -52,14 +61,19 @@ C4-22 FLIX C4-23 VH1 Cartoon CartoonNetworkls +CBBC CBBC CBUT CBC +CBeebies CBeebies +Channel4 Channel4 Channel[V] ChannelVAustralia +CITV CITV CMTVP CMTV CNBC CNBC CNN CNN CNNH CNNHEADLINENEWS COMEDY COMEDYCENTRAL COMEDYP COMEDYCENTRAL +Community CommunityChannel CountryMusic CountryMusicChannel COURT COURT COURTP COURT @@ -78,6 +92,8 @@ DSC DISCOVERY DSCP DISCOVERY DTIMES DISCOVERY +E4 E4 +E4+1 E4+1 EACT Encore_Action EDRA Encore_Drama ELOVE Encore_Love @@ -104,7 +120,11 @@ FCSA FOXSPORTS FCSC FOXSPORTS FCSP FOXSPORTS +Film4 Film4 FITV FITV +Five Five +FiveLife FiveLife +FiveUS FiveUS FLIVING FLIVING FLIX FLIX FLIXP FLIX @@ -144,6 +164,7 @@ FSS1 FOXSPORTS FSW FOXSPORTS FSWLD FOXSPORTS +ftn ftn FUSE FUSE FX FX FXP FX @@ -211,10 +232,16 @@ HISTORY HISTORY HISTP HISTORY HSN HOMESHOPPINGNETWORK +IdealWorld IdealWorld IFC IFC INHD INHD INHD2 INHD IPLEX IPLEX +ITV1-London ITV1-London +ITV2 ITV2 +ITV3 ITV3 +ITV4 ITV4 +ITVPlay ITVPlay KAAL ABC KABB FOX KABC ABC @@ -747,6 +774,7 @@ MAXP CINEMAX MILI Military MOMAXP CINEMAX +More4 More4 MovieExtra MovieExtra MovieGreats MovieGreats MovieOne MovieOne @@ -782,6 +810,7 @@ OXYGENP OXYGEN PAXSAT PAXSAT PLAYBOY PLAYBOY +price-droptv PriceDropTV QVC QVC RPLEX RPLEX SBS SpecialBroadcastingService @@ -804,8 +833,12 @@ SHOWX SHOWTIMEEXTREME SHOWXP SHOWTIMEEXTREME SITV SITV -SkyNews SkyNewsAustralia +SkyNews SkyNews +SkyNews-AU SkyNews-AU +SkyNews-UK SkyNews-UK SkyRacing SkyRacing +SkySptsNews SkySportsNews +SkyThree SkyThree SPEED SPEED SPIKEP SPIKE SPIKETV SPIKE @@ -825,6 +858,7 @@ TBSP TBS TCM TCM Ten SouthernCrossTen +TheHITS TheHITS THMAXP CINEMAX TLC TLC TLCP TLC @@ -832,6 +866,7 @@ TMCP TMC TMCX TMC TMCXP TMC +TMF TMF TNT TNT TNTHD TNT TNTP TNT @@ -851,6 +886,8 @@ TVONE TVONE TVSN TVSNau TWC WEATHERCHANNEL +UKTVHistory UKTVHistory +UKTVBr'tIdeas UKTVBr'tIdeas UNIP UNIVISION USA USA USAP USA Index: data/networktourl.txt =================================================================== --- data/networktourl.txt (revision 12401) +++ data/networktourl.txt (working copy) @@ -1,4 +1,5 @@ ABC [zap2it]/abc.jpg +abc1 [ls-logo]/aa/abc1.jpg ABCau [ls-logo]/aa/abcaus.jpg ABC2au [ls-logo]/aa/abc2_au.jpg ABC-WFTV [ls-logo]/ww/wftv.jpg @@ -12,8 +13,16 @@ AustralianChristianCh [ls-logo]/aa/aus_christian_chan.jpg AZN [ls-icon]/aa/azn_tv.gif BBCA [zap2it]/bbca.jpg +BBCi [ls-logo]/bb/bbc_i.jpg +BBCONE-London [ls-logo]/bb/bbc1.jpg +BBCTWO-London [ls-logo]/bb/bbc2.jpg +BBCTHREE [ls-logo]/bb/bbc_three.jpg +BBCFOUR [ls-logo]/bb/bbc4.jpg +BBCNEWS24 [ls-logo]/bb/bbc_news_24.jpg +BBCPARLIAMENT [ls-logo]/bb/bbcparliament.jpg BBCWorld [ls-logo]/bb/bbc_world.jpg BET [zap2it]/bet.jpg +BidTV [ls-logo]/bb/bid_tv.jpg BIO [ls-icon]/bb/biography.gif BLKFAM [ls-icon]/bb/black_family_channel.gif BLOOM [zap2it]/bloom.jpg @@ -21,16 +30,21 @@ BRAVO [zap2it]/bravo.jpg CARTOONNETWORK [zap2it]/toon.gif CartoonNetworkls [ls-logo]/cc/cartoonnet.jpg +CBBC [ls-logo]/cc/cbbc.jpg CBC [zap2it2]/cbc.gif +CBeebies [ls-logo]/bb/bbc_cbeebies.jpg CBS [zap2it]/cbs.jpg CBS-WKMG [ls-logo]/ww/wkmg_orlando.jpg +Channel4 [ls-logo]/cc/channel4.jpg ChannelVAustralia [ls-logo]/cc/channel_v_au.jpg CINEMAX [zap2it]/max.jpg +CITV [ls-logo]/cc/citv.jpg CMTV [zap2it]/cmtv.gif CNBC [zap2it]/cnbc.jpg CNN [zap2it]/cnn.jpg CNNHEADLINENEWS [zap2it]/cnnh.jpg COMEDYCENTRAL [zap2it]/comedy.jpg +CommunityChannel [ls-logo]/cc/communitychannel_uk.jpg CountryMusicChannel [ls-logo]/cc/cmc_country_music.jpg COURT [zap2it]/court.jpg CSPAN [zap2it]/cspan.jpg @@ -47,6 +61,8 @@ DISNEY [zap2it]/disn.jpg DisneyChannel [ls-logo]/dd/disney_channel_interactif.jpg DIY [ls-icon]/dd/diy_net_us.gif +E4 [ls-logo]/ee/e4_uk.jpg +E4+1 [ls-logo]/ee/e4_plus1.jpg ESPN [zap2it]/espn.jpg ESPN2 [zap2it]/espn2.jpg ESPNCL [zap2it]/espncl.jpg @@ -64,7 +80,11 @@ Encore_Westerns [ls-logo]/ee/encore_westerns.jpg ExpoChannel [ls-logo]/ee/expo_channel.jpg FashionTV [ls-logo]/ff/fashion_tv.jpg +Film4 [ls-logo]/ff/film4.jpg FITV [zap2it]/thn.gif +Five [ls-logo]/ff/five.jpg +FiveLife [ls-logo]/ff/five_life.jpg +FiveUS [ls-logo]/ff/five_us.jpg FLIVING [ls-icon]/ff/fineliving.gif FLIX [zap2it2]/flix.jpg FOOD [zap2it]/food.jpg @@ -78,6 +98,7 @@ FOXSPORTS [zap2it]/foxsports.jpg FoxSportsNetwork [ls-logo]/ff/fsn.jpg FSE [zap2it]/fswe_logo.jpg +ftn [ls-logo]/ff/ftn.jpg FUSE [zap2it2]/fuse.jpg FX [zap2it]/fx.jpg G4 [ls-icon]/gg/g4_video_game_tv.gif @@ -95,6 +116,7 @@ HISTORY [ls-logo]/hh/historychannel.jpg HISTORY_INT [ls-logo]/hh/history_int.jpg HOMESHOPPINGNETWORK [zap2it]/hsn.jpg +IdealWorld [ls-logo]/ii/ideal_world.jpg IFC [ls-icon]/ii/ifc_us.gif INHD [ls-icon]/ii/inhd.gif IND-WACX [ls-logo]/ww/wacx_tv55_orlando.jpg @@ -103,6 +125,11 @@ IND-WSBK [ls-logo]/ww/wsbk_tv38_boston.jpg IND-WTGL [ls-logo]/ww/wtgl_52_cocoa.jpg IPLEX [ls-icon]/ee/encore_indieplex.gif +ITV1-London [ls-logo]/ii/itv1.jpg +ITV2 [ls-logo]/ii/itv2.jpg +ITV3 [ls-logo]/ii/itv3.jpg +ITV4 [ls-logo]/ii/itv4.jpg +ITVPlay [ls-logo]/ii/itv_play.jpg KBCB [ls-icon]/kk/kbcb_24_world_tv_seattle.gif KHCV [ls-icon]/kk/khcv45_seattle.gif KIRO [ls-icon]/kk/kiro_cbs7_seattle.gif @@ -117,6 +144,7 @@ MainEventPPV [ls-logo]/mm/mainevent_ppv.jpg Max [ls-logo]/mm/max_au.jpg MNTV [zap2it]/mynetworktv_affiliate.gif +More4 [ls-logo]/mm/more4.jpg MovieExtra [ls-logo]/mm/movie_extra_aus.jpg MovieGreats [ls-logo]/mm/movie_greats_aus.jpg MovieOne [ls-logo]/mm/movie_one_aus.jpg @@ -329,6 +357,7 @@ PBS-WYIN [pbs]/WYIN.gif PBS_Sprout [ls-logo]/pp/pbs_kids_sprout.jpg PLAYBOY [zap2it2]/playboy.gif +PriceDropTV [ls-logo]/pp/price_drop_tv.jpg QVC [zap2it]/qvc.jpg RPLEX [ls-icon]/ee/encore_retroplex.gif SCIFI [zap2it]/scifi.jpg @@ -341,8 +370,12 @@ ShowtimeGreats [ls-logo]/ss/showtime_greats.jpg SHOWTIMEEXTREME [zap2it2]/showtimeextreme.jpg SITV [zap2it]/sitv.gif -SkyNewsAustralia [ls-logo]/ss/sky_news_au.jpg +SkyNews [ls-logo]/ss/sky_news.jpg +SkyNews-AU [ls-logo]/ss/sky_news_au.jpg +SkyNews-UK [ls-logo]/ss/sky_news.jpg SkyRacing [ls-logo]/ss/skyracing.jpg +SkySportsNews [ls-logo]/ss/sky_sports_news.jpg +SkyThree [ls-logo]/ss/sky_three.jpg SouthernCrossTen [ls-logo]/ss/southern_cross_ten.jpg SpecialBroadcastingService [ls-logo]/ss/sbs.jpg SPEED [zap2it]/speed.gif @@ -353,8 +386,10 @@ TBS [zap2it]/tbs.jpg TCM [zap2it]/tcm.jpg TELEMUNDO [zap2it2]/telemundo.gif +TheHITS [ls-logo]/tt/the_hits.jpg TLC [zap2it]/tlc.jpg TMC [zap2it]/tmc.jpg +TMF [ls-logo]/tt/tmf_nl.jpg TNT [zap2it]/tnt.jpg TRAV [zap2it]/trav.gif TV1au [ls-logo]/tt/tv1_aus.jpg @@ -362,6 +397,8 @@ TVLAND [zap2it]/tvland.jpg TVONE [ls-logo]/tt/tv_one_us.jpg TVSNau [ls-logo]/tt/tvsn_au.jpg +UKTVHistory [ls-logo]/uu/uktv_history.jpg +UKTVBr'tIdeas [ls-logo]/uu/uktv_bright_ideas.jpg UNIVISION [zap2it]/uni.jpg UPN [zap2it]/upn.jpg USA [zap2it]/usa.jpg