Oops, missed part of gip::Programme::radio

jjl · Mar 11, 2010 · 705df81 · 705df81
1 parent e4b6e60
commit 705df81
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/lib/gip/Programme/radio.pm b/lib/gip/Programme/radio.pm
@@ -1,3 +1,84 @@
+package Programme::radio;
+
+use Env qw[@PATH];
+use Fcntl;
+use File::Copy;
+use File::Path;
+use File::stat;
+use HTML::Entities;
+use HTTP::Cookies;
+use HTTP::Headers;
+use IO::Seekable;
+use IO::Socket;
+use LWP::ConnCache;
+use LWP::UserAgent;
+use POSIX qw(mkfifo);
+use strict;
+use Time::Local;
+use URI;
+
+# Inherit from Programme class
+use base 'Programme::bbciplayer';
+
+# Class vars
+sub index_min { return 10001 }
+sub index_max { return 19999 };
+sub channels {
+	return {
+		'bbc_1xtra'				=> 'BBC 1Xtra',
+		'bbc_radio_one'				=> 'BBC Radio 1',
+		'bbc_radio_two'				=> 'BBC Radio 2',
+		'bbc_radio_three'			=> 'BBC Radio 3',
+		'bbc_radio_four'			=> 'BBC Radio 4',
+		'bbc_radio_five_live'			=> 'BBC Radio 5 live',
+		'bbc_radio_five_live_sports_extra'	=> 'BBC 5 live Sports Extra',
+		'bbc_6music'				=> 'BBC 6 Music',
+		'bbc_7'					=> 'BBC 7',
+		'bbc_asian_network'			=> 'BBC Asian Network',
+		'bbc_radio_foyle'			=> 'BBC Radio Foyle',
+		'bbc_radio_scotland'			=> 'BBC Radio Scotland',
+		'bbc_radio_nan_gaidheal'		=> 'BBC Radio Nan Gaidheal',
+		'bbc_radio_ulster'			=> 'BBC Radio Ulster',
+		'bbc_radio_wales'			=> 'BBC Radio Wales',
+		'bbc_radio_cymru'			=> 'BBC Radio Cymru',
+		'bbc_world_service'			=> 'BBC World Service',
+		'bbc_radio_cumbria'			=> 'BBC Cumbria',
+		'bbc_radio_newcastle'			=> 'BBC Newcastle',
+		'bbc_tees'				=> 'BBC Tees',
+		'bbc_radio_lancashire'			=> 'BBC Lancashire',
+		'bbc_radio_merseyside'			=> 'BBC Merseyside',
+		'bbc_radio_manchester'			=> 'BBC Manchester',
+		'bbc_radio_leeds'			=> 'BBC Leeds',
+		'bbc_radio_sheffield'			=> 'BBC Sheffield',
+		'bbc_radio_york'			=> 'BBC York',
+		'bbc_radio_humberside'			=> 'BBC Humberside',
+		'bbc_radio_lincolnshire'		=> 'BBC Lincolnshire',
+		'bbc_radio_nottingham'			=> 'BBC Nottingham',
+		'bbc_radio_leicester'			=> 'BBC Leicester',
+		'bbc_radio_derby'			=> 'BBC Derby',
+		'bbc_radio_stoke'			=> 'BBC Stoke',
+		'bbc_radio_shropshire'			=> 'BBC Shropshire',
+		'bbc_wm'				=> 'BBC WM',
+		'bbc_radio_coventry_warwickshire'	=> 'BBC Coventry & Warwickshire',
+		'bbc_radio_hereford_worcester'		=> 'BBC Hereford & Worcester',
+		'bbc_radio_northampton'			=> 'BBC Northampton',
+		'bbc_three_counties_radio'		=> 'BBC Three Counties',
+		'bbc_radio_cambridge'			=> 'BBC Cambridgeshire',
+		'bbc_radio_norfolk'			=> 'BBC Norfolk',
+		'bbc_radio_suffolk'			=> 'BBC Suffolk',
+		'bbc_radio_essex'			=> 'BBC Essex',
+		'bbc_london'				=> 'BBC London',
+		'bbc_radio_kent'			=> 'BBC Kent',
+		'bbc_radio_surrey'			=> 'BBC Surrey',
+		'bbc_radio_sussex'			=> 'BBC Sussex',
+		'bbc_radio_oxford'			=> 'BBC Oxford',
+		'bbc_radio_berkshire'			=> 'BBC Berkshire',
+		'bbc_radio_solent'			=> 'BBC Solent',
+		'bbc_radio_gloucestershire'		=> 'BBC Gloucestershire',
+		'bbc_radio_wiltshire'			=> 'BBC Wiltshire',
+		'bbc_radio_bristol'			=> 'BBC Bristol',
+		'bbc_radio_somerset_sound'		=> 'BBC Somerset',
+		'bbc_radio_devon'			=> 'BBC Devon',
 		'1xtra/programmes/schedules'		=> 'BBC 1Xtra',
 		'radio1/programmes/schedules/england'	=> 'BBC Radio 1 England',
 		'radio1/programmes/schedules/northernireland'=> 'BBC Radio 1 Northern Ireland',

diff --git a/main.pl b/main.pl
@@ -2964,87 +2964,6 @@ sub regex_numbers {
 
 
 ################### Radio class #################
-package Programme::radio;
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme::bbciplayer';
-
-# Class vars
-sub index_min { return 10001 }
-sub index_max { return 19999 };
-sub channels {
-	return {
-		'bbc_1xtra'				=> 'BBC 1Xtra',
-		'bbc_radio_one'				=> 'BBC Radio 1',
-		'bbc_radio_two'				=> 'BBC Radio 2',
-		'bbc_radio_three'			=> 'BBC Radio 3',
-		'bbc_radio_four'			=> 'BBC Radio 4',
-		'bbc_radio_five_live'			=> 'BBC Radio 5 live',
-		'bbc_radio_five_live_sports_extra'	=> 'BBC 5 live Sports Extra',
-		'bbc_6music'				=> 'BBC 6 Music',
-		'bbc_7'					=> 'BBC 7',
-		'bbc_asian_network'			=> 'BBC Asian Network',
-		'bbc_radio_foyle'			=> 'BBC Radio Foyle',
-		'bbc_radio_scotland'			=> 'BBC Radio Scotland',
-		'bbc_radio_nan_gaidheal'		=> 'BBC Radio Nan Gaidheal',
-		'bbc_radio_ulster'			=> 'BBC Radio Ulster',
-		'bbc_radio_wales'			=> 'BBC Radio Wales',
-		'bbc_radio_cymru'			=> 'BBC Radio Cymru',
-		'bbc_world_service'			=> 'BBC World Service',
-		'bbc_radio_cumbria'			=> 'BBC Cumbria',
-		'bbc_radio_newcastle'			=> 'BBC Newcastle',
-		'bbc_tees'				=> 'BBC Tees',
-		'bbc_radio_lancashire'			=> 'BBC Lancashire',
-		'bbc_radio_merseyside'			=> 'BBC Merseyside',
-		'bbc_radio_manchester'			=> 'BBC Manchester',
-		'bbc_radio_leeds'			=> 'BBC Leeds',
-		'bbc_radio_sheffield'			=> 'BBC Sheffield',
-		'bbc_radio_york'			=> 'BBC York',
-		'bbc_radio_humberside'			=> 'BBC Humberside',
-		'bbc_radio_lincolnshire'		=> 'BBC Lincolnshire',
-		'bbc_radio_nottingham'			=> 'BBC Nottingham',
-		'bbc_radio_leicester'			=> 'BBC Leicester',
-		'bbc_radio_derby'			=> 'BBC Derby',
-		'bbc_radio_stoke'			=> 'BBC Stoke',
-		'bbc_radio_shropshire'			=> 'BBC Shropshire',
-		'bbc_wm'				=> 'BBC WM',
-		'bbc_radio_coventry_warwickshire'	=> 'BBC Coventry & Warwickshire',
-		'bbc_radio_hereford_worcester'		=> 'BBC Hereford & Worcester',
-		'bbc_radio_northampton'			=> 'BBC Northampton',
-		'bbc_three_counties_radio'		=> 'BBC Three Counties',
-		'bbc_radio_cambridge'			=> 'BBC Cambridgeshire',
-		'bbc_radio_norfolk'			=> 'BBC Norfolk',
-		'bbc_radio_suffolk'			=> 'BBC Suffolk',
-		'bbc_radio_essex'			=> 'BBC Essex',
-		'bbc_london'				=> 'BBC London',
-		'bbc_radio_kent'			=> 'BBC Kent',
-		'bbc_radio_surrey'			=> 'BBC Surrey',
-		'bbc_radio_sussex'			=> 'BBC Sussex',
-		'bbc_radio_oxford'			=> 'BBC Oxford',
-		'bbc_radio_berkshire'			=> 'BBC Berkshire',
-		'bbc_radio_solent'			=> 'BBC Solent',
-		'bbc_radio_gloucestershire'		=> 'BBC Gloucestershire',
-		'bbc_radio_wiltshire'			=> 'BBC Wiltshire',
-		'bbc_radio_bristol'			=> 'BBC Bristol',
-		'bbc_radio_somerset_sound'		=> 'BBC Somerset',
-		'bbc_radio_devon'			=> 'BBC Devon',
 
 
 ################### Streamer::rtmp class #################