Index: data/callsigntonetwork.txt =================================================================== --- data/callsigntonetwork.txt (revision 11597) +++ data/callsigntonetwork.txt (working copy) @@ -1,14 +1,18 @@ 5MAX CINEMAX +ACCNET ACCESS-CJAL ACMAXP CINEMAX ACTON Encore_Action ACTONP Encore_Action AETVP AE AMC AMC +AMCCAN AMC AMCP AMC ANGEL1 ANGEL1 ANIMAL ANIMALPLANET ANIMALP ANIMALPLANET +APTN APTN ARTS AE +ARTSC AE ARTSP AE ATMAX CINEMAX AZNNW AZN @@ -22,7 +26,9 @@ BLKSTZ STARZ BLKSTZP STARZ BLOOM BLOOM +BNEWS BROADCASTNEWS BRAVO BRAVO +BRAVOC BRAVO-CA BRAVOP BRAVO C3-02 TLC C3-07 CSPAN @@ -43,17 +49,29 @@ C4-21 DISCOVERY C4-22 FLIX C4-23 VH1 +CBNEW CBC-NewsWorld CBUT CBC +CBXFT CBC-CBXFT +CBXT CBC-CBXT +CLT CLT +CMT CMT CMTVP CMTV +CFRN CTV-CFRN +CHCA GLOBAL-CHCA +CITV GLOBAL-CITV +CKEM CITYTV-CKEM CNBC CNBC CNN CNN CNNH CNNHEADLINENEWS COMEDY COMEDYCENTRAL COMEDYP COMEDYCENTRAL +COMEDCP COMEDYCENTRAL COURT COURT COURTP COURT +CPAC CPAC CSPAN CSPAN CSPAN2 CSPAN2 +CWEA WEATHERCHANNEL DCHOME DISCOVERY DCKIDS DISCOVERY DCWINGS DISCOVERY @@ -65,6 +83,7 @@ DSC DISCOVERY DSCP DISCOVERY DTIMES DISCOVERY +EA2 Encore_Avenue EACT Encore_Action EDRA Encore_Drama ELOVE Encore_Love @@ -96,6 +115,7 @@ FMC FOXMOVIE FNC FOXNEWS FOOD FOOD +FOODC FOOD-CA FOODP FOOD FOXW2 FOXSPORTS FSAZ FOXSPORTS @@ -185,9 +205,11 @@ HBOZ HBOZONE HBOZP HBOZONE HGTV HGTV +HGTVc HGTV-CA HGTVP HGTV HISI HISTORY_INT HISTORY HISTORY +HISTCP HISTORY HISTP HISTORY HSN HOMESHOPPINGNETWORK IFC IFC @@ -516,6 +538,7 @@ KRCB PBS-KRCB KRCR ABC KRDO ABC +KREM CBS-KREM KRGV ABC KRIS NBC KRIV FOX @@ -716,6 +739,7 @@ KZWB WB LIFE LIFETIME LIFEP LIFETIME +LIFENET LIFENETWORK LMN LIFETIMEMOVIE LOVE Encore_Love LOVEP Encore_Love @@ -723,19 +747,23 @@ MAXP CINEMAX MILI Military MOMAXP CINEMAX +MOMUSIC MUCHMUSIC-MORE MPLEX Encore MSNBC MSNBC MTV MTV MTV2 MTV2 +MTVCAN MTV-CA MTV2P MTV2 MTVL MTV MTVP MTV MTVS MTV +MUCHMUSIC MUCHMUSIC MYSTERY Encore_Mystery MYSTERYP Encore_Mystery NASA NASA NET1 PBS-KUON NEWSENG NEWSENG +NEWSNET CTV-NEWSNET NEXTP SHOWTIME NFL NFL NFLHD NFL @@ -745,6 +773,7 @@ NIKTON Nick_Toons NOGN Noggin NWCN NWCN +OLCC OLN OLN OLN OMAX CINEMAX OXYGEN OXYGEN @@ -752,10 +781,15 @@ PAXSAT PAXSAT PLAYBOY PLAYBOY QVC QVC +RDI RDI +ROBTV ROBTV RPLEX RPLEX +RSW RSN-RSW +SHCASEP SHOWCASE-CA SCIENCE DISCOVERY SCIFI SCIFI SCIFIP SCIFI +SCR SCORE SHOCSE SHOWTIME3 SHOCSEP SHOWTIME3 SHOTOO SHOWTIME2 @@ -767,10 +801,14 @@ SHOWX SHOWTIMEEXTREME SHOWXP SHOWTIMEEXTREME SITV SITV +SPACEC SPACE +SPCCAN SPACE SPEED SPEED +SPIKEC SPIKE SPIKEP SPIKE SPIKETV SPIKE SPROUT PBS_Sprout +STAR STAR STARZ STARZ STARZC STARZ STARZCP STARZ @@ -785,6 +823,9 @@ TBS TBS TBSP TBS TCM TCM +TCMC TCM +TDCC DISCOVERY +TFCP TFC-West THMAXP CINEMAX TLC TLC TLCP TLC @@ -796,13 +837,18 @@ TNTHD TNT TNTP TNT TOON CARTOONNETWORK +TOONCP TELETOON-CA TOOND DISNEY -TOONDP DISNEY TOONP CARTOONNETWORK TRAV TRAV TRAVP TRAV +TREEC TREEHOUSE +TROPP TVTROPOLIS TRUE Encore TRUEP Encore +TSC THESHOPPINGCHANNEL +TSN TSN +TVAW TVA-CFTM TV5 TV5 TVLAND TVLAND TVLANDP TVLAND @@ -818,6 +864,8 @@ VH1CNTRY VH1 VH1P VH1 VH1SOUL VH1 +VISION VISIONTV +VOICE VOICETV W1-06 NBC W1-10 ABC W1-22 CBS @@ -1230,6 +1278,7 @@ WOTV ABC WOUB PBS-WOUB WOWT NBC +WP WNETWORK WPBA PBS-WPBA WPBF ABC WPBN NBC @@ -1322,6 +1371,7 @@ WTAE ABC WTAP NBC WTAT FOX +WTBS TBS-WTBS WTCI PBS-WTCI WTCN WB WTEN ABC @@ -1454,3 +1504,4 @@ Waco WB XETV FOX XUPN UPN +YTVP IND-YTVP Index: data/networktourl.txt =================================================================== --- data/networktourl.txt (revision 11597) +++ data/networktourl.txt (working copy) @@ -1,30 +1,44 @@ ABC [zap2it]/abc.jpg ABC-WFTV [ls-logo]/ww/wftv.jpg ABCFAMILY [zap2it]/fam.jpg +ACCESS-CJAL [ls-logo]/cc/cjal_access9_edmonton.jpg AE [zap2it]/aetv.jpg AMC [zap2it]/amc.gif ANGEL1 [zap2it]/angelone.jpg ANIMALPLANET [zap2it]/animal.jpg AZN [ls-icon]/aa/azn_tv.gif +APTN [ls-logo]/aa/aboriginal_peoples_tvnet.jpg BBCA [zap2it]/bbca.jpg BET [zap2it]/bet.jpg BIO [ls-icon]/bb/biography.gif BLKFAM [ls-icon]/bb/black_family_channel.gif BLOOM [zap2it]/bloom.jpg BRAVO [zap2it]/bravo.jpg +BRAVO-CA [ls-logo]/bb/bravo_ca.jpg +BROADCASTNEWS [ls-logo]/bb/broadcast_news.jpg CARTOONNETWORK [zap2it]/toon.gif CBC [zap2it2]/cbc.gif +CBC-CBXT [ls-logo]/cc/cbc_edmonton.jpg +CBC-CBXFT [ls-logo]/cc/cbc_src.jpg +CBC-NewsWorld [ls-logo]/cc/cbc_newsworld.jpg CBS [zap2it]/cbs.jpg +CBS-KREM [ls-logo]/kk/krem_cbs2_spokane.jpg CBS-WKMG [ls-logo]/ww/wkmg_orlando.jpg CINEMAX [zap2it]/max.jpg +CITYTV-CKEM [ls-logo]/cc/ckem_city_tv_edmonton.jpg +CLT [ls-logo]/cc/clt.jpg +CMT [ls-logo]/cc/cmt_ca.jpg CMTV [zap2it]/cmtv.gif CNBC [zap2it]/cnbc.jpg CNN [zap2it]/cnn.jpg CNNHEADLINENEWS [zap2it]/cnnh.jpg COMEDYCENTRAL [zap2it]/comedy.jpg COURT [zap2it]/court.jpg +CPAC [ls-logo]/cc/cpac.jpg CSPAN [zap2it]/cspan.jpg CSPAN2 [zap2it]/cspan2.jpg +CTV-CFRN [ls-logo]/cc/cfrn_edmonton.jpg +CTV-NEWSNET [ls-logo]/cc/ctv_newsnet.jpg CW [zap2it2]/cw.gif CW-KTLA [ls-logo]/kk/ktla.jpg CW-KWGN [ls-logo]/kk/kwgn_cw2_denver.jpg @@ -54,6 +68,7 @@ FLIVING [ls-icon]/ff/fineliving.gif FLIX [zap2it2]/flix.jpg FOOD [zap2it]/food.jpg +FOOD-CA [ls-logo]/ff/foodnetwork_ca.jpg FOX [zap2it]/fox.jpg FOX-WOFL [ls-logo]/ww/wofl_fox35_orlando.jpg FOXMOVIE [ls-icon]/ff/fox_moviechannel.gif @@ -64,6 +79,8 @@ FX [zap2it]/fx.jpg G4 [ls-icon]/gg/g4_video_game_tv.gif GAMESHOWNETWORK [zap2it]/gameshownetwork.jpg +GLOBAL-CITV [ls-logo]/gg/global_edmonton.jpg +GLOBAL-CHCA [ls-logo]/cc/chca_red_deer.jpg GOLF [zap2it]/golf.gif HALMRK [zap2it]/halmrk.gif HBO [ls-logo]/hh/hbo.jpg @@ -74,6 +91,7 @@ HBOZONE [ls-logo]/hh/hbo_zone.jpg HBO_HD [ls-logo]/hh/hbo_hdtv.jpg HGTV [ls-logo]/hh/hgtv.jpg +HGTV-CA [ls-logo]/hh/hgtvcanada.jpg HISTORY [ls-logo]/hh/historychannel.jpg HISTORY_INT [ls-logo]/hh/history_int.jpg HOMESHOPPINGNETWORK [zap2it]/hsn.jpg @@ -84,6 +102,7 @@ IND-WRDQ [ls-logo]/ww/wrdq_action27_orlando.jpg IND-WSBK [ls-logo]/ww/wsbk_tv38_boston.jpg IND-WTGL [ls-logo]/ww/wtgl_52_cocoa.jpg +IND-YTVP [ls-logo]/yy/youth_tv.jpg IPLEX [ls-icon]/ee/encore_indieplex.gif KBCB [ls-icon]/kk/kbcb_24_world_tv_seattle.gif KHCV [ls-icon]/kk/khcv45_seattle.gif @@ -93,12 +112,16 @@ KONG [ls-icon]/kk/kong6_16_seattle.gif KSTW [ls-icon]/kk/kstw_cw11_seattle.gif KWOG [ls-icon]/kk/kwog_nbc51_seattle.gif +LIFENETWORK [ls-logo]/ll/life_network.jpg LIFETIME [zap2it]/life.jpg LIFETIMEMOVIE [ls-icon]/ll/lifetime_movie.gif MNTV [zap2it]/mynetworktv_affiliate.gif MSNBC [zap2it]/msnbc.jpg MTV [zap2it]/mtv.jpg MTV2 [zap2it]/mtv2.gif +MTV-CA [ls-logo]/mm/mtv_ca.jpg +MUCHMUSIC [ls-logo]/mm/muchmusic.jpg +MUCHMUSIC-MORE [ls-logo]/mm/muchmoremusic.jpg MYTV-WRBW [ls-logo]/ww/wrbw_my65_orlando.jpg MYTV-WWOR [ls-logo]/ww/wwor_my9_secaucus.jpg Military [ls-logo]/mm/military_channel_discovery.jpg @@ -112,7 +135,7 @@ Nick_Toons [ls-logo]/nn/nicktoons_us.jpg Nickelodeon [ls-logo]/nn/nickelodeon.jpg Noggin [ls-logo]/nn/noggin.jpg -OLN [zap2it]/oln.gif +OLN [ls-logo]/oo/outdoor_life_network.jpg OXYGEN [ls-icon]/oo/oxygen.gif PAX [zap2it]/pax.jpg PAX-WOPX [ls-logo]/ww/wopx_pax56_orlando.jpg @@ -305,35 +328,53 @@ PBS_Sprout [ls-logo]/pp/pbs_kids_sprout.jpg PLAYBOY [zap2it2]/playboy.gif QVC [zap2it]/qvc.jpg +RDI [ls-logo]/rr/rdi_tv.jpg +ROBTV [ls-logo]/rr/robtv.jpg RPLEX [ls-icon]/ee/encore_retroplex.gif +RSN-RSW [ls-logo]/rr/rogers_sportsnet_west.jpg SCIFI [zap2it]/scifi.jpg +SCORE [ls-logo]/tt/the_score.jpg +SHOWCASE-CA [ls-logo]/ss/showcase_ca.jpg SHOWTIME [zap2it]/show.jpg SHOWTIME2 [zap2it2]/showtime2.jpg SHOWTIME3 [zap2it2]/showtime3.jpg SHOWTIMEEXTREME [zap2it2]/showtimeextreme.jpg SITV [zap2it]/sitv.gif +SPACE [ls-logo]/ss/space_arg.jpg SPEED [zap2it]/speed.gif SPIKE [ls-icon]/ss/spike_tv.gif +STAR [ls-logo]/ss/star_tv_ca.jpg STARZ [zap2it2]/starz.jpg STYLE [ls-icon]/ss/style.gif SUNDANCE [zap2it2]/sundancechannel.jpg TBS [zap2it]/tbs.jpg +TBS-WTBS [ls-logo]/ww/wtbs_17_atlanta.jpg TCM [zap2it]/tcm.jpg TELEMUNDO [zap2it2]/telemundo.gif +TELETOON-CA [ls-logo]/tt/teletoon_ca.jpg +TFC-West [ls-logo]/ff/family.jpg +THESHOPPINGCHANNEL [ls-logo]/tt/tsc.jpg TLC [zap2it]/tlc.jpg TMC [zap2it]/tmc.jpg TNT [zap2it]/tnt.jpg TRAV [zap2it]/trav.gif -TV5 [zap2it]/tv5.gif +TREEHOUSE [ls-logo]/tt/treehouse.jpg +TSN [ls-logo]/tt/tsn.jpg +TVA-CFTM [ls-logo]/cc/cftm_montreal.jpg +TV5 [ls-logo]/tt/tv5_quebec.jpg TVLAND [zap2it]/tvland.jpg TVONE [ls-logo]/tt/tv_one_us.jpg +TVTROPOLIS [ls-logo]/tt/tv_tropolis.jpg UNIVISION [zap2it]/uni.jpg UPN [zap2it]/upn.jpg USA [zap2it]/usa.jpg UWTV [ls-icon]/uu/uwtv_washington.gif VH1 [ls-logo]/vv/vh1.jpg VH1_Classic [ls-logo]/vv/vh1_classic.jpg +VISIONTV [ls-logo]/vv/visiontv.jpg +VOICETV [ls-logo]/vv/voice_tv.jpg WB [zap2it]/wb.jpg WE [zap2it]/we.gif WEATHERCHANNEL [zap2it]/twc.gif +WNETWORK [ls-logo]/ww/w_network.jpg WRNN [zap2it]/rnn.gif