Changeset 1240

Timestamp:

Nov 18, 2009, 2:37:08 AM (14 years ago)

Author:

mbarry

Message:

More Foxtel changes (with oztivo support) as per #225

Location:

trunk

Files:

• grabbers/oztivo (modified) (5 diffs)
• references/channel_list (modified) (1 diff)
• status (modified) (2 diffs)

trunk/grabbers/oztivo

@@ -43 +43 @@
 my $progname = 'oztivo';
 my $nicename = 'OzTivo';
-my $version = '2.34';
+my $version = '2.35';
 my $config_file = "$progname.pw";
 my $output_file = undef;
@@ -470 +470 @@
                 'CartoonNetwork' => 'CART',
                 'CBeebies' => 'CBEEB',
-                'ChannelV2' => 'V2',
+                'VHits' => 'V2',
                 'ChannelV' => 'V',
                 # '????' => 'Cinemax',
@@ -482 +482 @@
                 'CNN' => 'CNNI',
                 # '????' => 'CNNfn',
-                'CountryMusicChannel' => 'CMC',
+                'CMC' => 'CMC',
                 'Crime' => 'CRIME',
                 # '????' => 'D4NEWS',
@@ -597 +597 @@
                 # '????' => 'ServiceNSW',
                 'showcase' => 'SHWC',
-                'SHOWTIME2' => 'SHW2',
+                'showtimetwo' => 'SHW2',
                 'SHOWTIMEGreats' => 'SHWGRTS',
-                'SHOWTIME' => 'SHOW',
+                'showtimepremiere' => 'SHOW',
                 'SkyNewsAustralia' => 'SKYN',
                 'SkyNewsBusiness' => 'SKYB',
@@ -635 +635 @@
                 'W' => 'W',
                 # '????' => 'WZONE',
+                '13THSTREET' => '13THST',
+                '111HITS2' => 'HITS+2',
+                'Discovery2' => 'DISC+2',
+                'DiscoveryTurboMAX' => 'DTM',
+                'DiscTurboMAX2' => 'DTM+2',
+                'FMC' => 'FMC',
+                'LifestyleFOOD2' => 'FOOD+2',
+                'KidsCo' => 'KIDSCO',
+                'LifeStyleYOU' => 'LYOU',
+                'LifStyleYOU2' => 'LYOU+2',
+                'NATGEOWILD' => 'NGW',
+                'showtimeaction' => 'SACT',
+                'showtimecomedy' => 'SCOM',
+                'showtimedrama' => 'SDRA',
+                'showcasetwo' => 'SHWC+2',
+                'STARPICS1' => 'SPICS',
+                'STARPICS2' => 'SPICS+2',
+                'SCIFI2' => 'Sci-Fi+2',
+                'TheStyleNetwork' => 'STYLE',
         }
 );

trunk/references/channel_list

@@ -42 +42 @@
 267:ABC1,ABC2,SBS ONE,SBS TWO,Prime HD,Prime,WIN,SC10,ABC HD,SBS HD,One HD,GO!
 268:ABC1,ABC2,SBS ONE,SBS TWO,Prime HD,Prime,WIN,SC10,ABC HD,SBS HD,One HD,GO!
-Foxtel:111HITS2,111Hits,13THSTREET,ACC,AnimalPlanet,Arena,Arena2,Aurora,BBCKnowledge,Bio,CNN,Comedy2,ComedyChannel,Crime,Discovery2,DiscoveryChannel,DiscoveryHD,DiscoveryTurboMAX,E!Entertainment,ESPN,ESPNHD,EXPO,Eurosport,Eurosportnews,FMC,FOX8,FOX82,FOX8HD,FOXClassics,FOXClassics2,FOXNews,FOXSPORTS1,FOXSPORTS2,FOXSPORTS3,FOXSPORTSNews,FUELTV,FashionTV,FoxSports1HD,FoxSports2HD,FoxSports3HD,HOWTOChannel,Hallmark,LifStyleYOU2,LifeStyle2,LifeStyleFOOD,LifeStyleYOU,LifestyleFOOD2,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIEONEHD,MOVIETWO,MTV,NATGEOWILD,NITV,NatGeoAdventure,NatGeoHD,NationalGeographic,Ovation,SCIFI,SCIFI2,STARPICS1,STARPICS1HD,STARPICS2,STARPICS2HD,ShowPremiereHD,SkyNewsAustralia,SkyNewsBusiness,TCM,TV1,TV12,TVN,TVSN,TheHistoryChannel,TheLifeStyleChannel,TheStyleNetwork,TheWeatherChannel,UKTV,UKTV2,UKTVHD,W,W2,WHD,WORLDMOVIES,showcase,showcaseHD,showcasetwo,showtimeaction,showtimeactionHD,showtimecomedy,showtimedrama,showtimepremiere,showtimetwo
+Foxtel:111Hits,ACC,AdultsOnly960,AIR,AnimalPlanet,AntennaPacific,Arena,Arena2,APAC,Aurora,BBCHD,BBCKnowledge,BBCWorldNews,Bio,BloombergTelevision,Boomerang,CartoonNetwork,Cbeebies,ChannelV,CNBC,CNN,ComedyChannel,Comedy2,CMC,Crime,DiscoveryChannel,DiscoveryHD,DiscoveryHealth,DiscoveryScience,DiscoveryTravel,DisneyChannel,E!Entertainment,ESPN,ESPNHD,Eurosportnews,EXPO,FashionTV,FOXClassics,FOXClassics2,FOXNews,FOXSPORTS1,FOXSPORTS2,FOXSPORTS3,FOXSportsHD,FOXSPORTSNews,FOX8,FOX82,FoxtelBoxOffice,FUELTV,Hallmark,HOWTOChannel,LifeStyleFOOD,MainEvent,MAX,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIETWO,MTV,NatGeoAdventure,NatGeoHD,NationalGeographic,NickJr,Nickelodeon,NITV,Ovation,PlayhouseDisney,RAIITALIA,SCIFI,showcase,SHOWTIMEGreats,SkyNewsAustralia,SkyNewsBusiness,SkyRacing,TCM,TheHistoryChannel,TheLifeStyleChannel,LifeStyle2,TheWeatherChannel,TV1,TV12,TVN,TVSN,UKTV,UKTV2,VH1,W,W2,WORLDMOVIES,13THSTREET,LifeStyleYOU,TheStyleNetwork,LifestyleFOOD2,LifStyleYOU2,111HITS2,SCIFI2,FoxSports1HD,FoxSports2HD,FoxSports3HD,FOX8HD,UKTVHD,WHD,ShowPremiereHD,showcaseHD,showtimeactionHD,MOVIEONEHD,STARPICS1HD,STARPICS2HD,showtimepremiere,showtimetwo,showtimeaction,showtimecomedy,showtimedrama,FMC,STARPICS1,STARPICS2,Eurosport,Discovery2,NATGEOWILD,DiscoveryTurboMAX,DiscTurboMAX2,KidsCo,VHits,showcasetwo
 SelecTV:AnimalPlanet,AntennaGreek,BBCWorldNews,BloombergTelevision,CartoonNetwork,CNN,DiscoveryScience,DiscoveryHealth,DiscoveryTravel,DiscoveryRealTime,DisneyChannel,E!Entertainment,ERTGreek,Eurosport,FashionTV,MOVIEEXTRA,MOVIEGREATS,MOVIEONE,MOVIETWO,MTV,NatGeoAdventure,NationalGeographic,Ovation,PlayhouseDisney,SkyRacing,TCM,TVChileSpanish,TVE,VH1
 ---migrate---
-Foxtel:111HITS->111Hits,DiscoveryHomeandHealth->DiscoveryHealth,CrimeandInvestigationNetwork->Crime,CI->Crime,ARENA->Arena,ARENA2->Arena2
+Foxtel:111HITS->111Hits,DiscoveryHomeandHealth->DiscoveryHealth,CrimeandInvestigationNetwork->Crime,CI->Crime,ARENA->Arena,ARENA2->Arena2,ChannelV2->VHits,SHOWTIME->showtimepremiere,SHOWTIME2->showtimetwo
 SelecTV:Eurosportnews->Eurosport,BBCWorld->BBCWorldNews
 *:ABC->ABC1

trunk/status

@@ -1 +1 @@
 application     shepherd            1.3.42
-reference       channel_list        44
+reference       channel_list        45
 reference       Shepherd/Common.pm  0.38
 reference       Shepherd/MythTV.pm  0.9
@@ -7 +7 @@
 grabber         news                1.6
 grabber         abc_website         3.22
-grabber         oztivo              2.34
+grabber         oztivo              2.35
 grabber         yahoo7widget        1.110-r5
 grabber         yahoo7web           0.40-r1