aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvektor <devnull@localhost>2005-08-14 16:48:05 (GMT)
committervektor <devnull@localhost>2005-08-14 16:48:05 (GMT)
commitecbd68a3e42c87b326f77eeb139d11673bf9f91a (patch)
tree5fdb57e83befb8a04fd1a91701f8e27693a19983
parentb242a621474fea2dea34b96a8f792c4041f72999 (diff)
* tvtime/src/commands.c:
* tvtime/src/station.c: * tvtime/src/tvtimeconf.c: * tvtime/src/bands.h: Add a South Africa band. Patch by Jan Gutter. * tvtime/docs/man/en/stationlist.xml.5: Documentation. * tvtime/docs/man/de/stationlist.xml.5: Documentation. * tvtime/docs/html/usage.html: Add southafrica to the list. * tvtime/AUTHORS: Add Jan Gutter. * tvtime/ChangeLog: Note this in the ChangeLog.
-rw-r--r--AUTHORS3
-rw-r--r--ChangeLog1
-rw-r--r--docs/html/usage.html1
-rw-r--r--docs/man/de/stationlist.xml.51
-rw-r--r--docs/man/en/stationlist.xml.51
-rw-r--r--src/bands.h33
-rw-r--r--src/commands.c15
-rw-r--r--src/station.c3
-rw-r--r--src/tvtimeconf.c2
9 files changed, 46 insertions, 14 deletions
diff --git a/AUTHORS b/AUTHORS
index 437e651..51b7296 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -120,6 +120,9 @@ Authors and contributors
Robert Jessop <rj200@users.sourceforge.net>
- Patch for mattes for 16:10 monitors.
+ Jan Gutter <bollie@users.sourceforge.net>
+ - Patch to add South Africa stations.
+
Translators
Per von Zweigbergk <pvz@e.kth.se>
diff --git a/ChangeLog b/ChangeLog
index 64ad5ca..b2ca0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
1.0 -
+ * vektor: Add a South Africa station list submitted by Jan Gutter.
* vektor: Add mattes for 16:10 monitors.
* vektor: Compile fixes for gcc4 from Than Ngo.
diff --git a/docs/html/usage.html b/docs/html/usage.html
index 79fd48e..1ce0259 100644
--- a/docs/html/usage.html
+++ b/docs/html/usage.html
@@ -354,6 +354,7 @@ Entries in a list are in the following form:</p>
<tr><td class="docentry">VHF Australia <td class="docentry">AS1 - AS12, AS5A, AS9A
<tr><td class="docentry">VHF Italy <td class="docentry">A - H, H1, H2
<tr><td class="docentry">VHF Ireland <td class="docentry">I1 - I9
+<tr><td class="docentry">VHF South Africa <td class="docentry">1 - 13
<tr><td class="docentry">UHF <td class="docentry">U21 - U69
<tr><td class="docentry">UHF Australia <td class="docentry">AU28 - AU69
<tr><td class="docentry">Australia Optus <td class="docentry">01 - 058
diff --git a/docs/man/de/stationlist.xml.5 b/docs/man/de/stationlist.xml.5
index 9d9d852..07893be 100644
--- a/docs/man/de/stationlist.xml.5
+++ b/docs/man/de/stationlist.xml.5
@@ -126,6 +126,7 @@ VHF Russia@R1\[en]R12, SR1\[en]SR19
VHF Australia@AS1\[en]AS12, AS5A, AS9A
VHF Italy@A\[en]H, H1, H2
VHF Ireland@I1\[en]I9
+VHF South Africa@1\[en]13
UHF@U21\[en]U69
UHF Australia@AU28\[en]AU69
Australia Optus@01\[en]058
diff --git a/docs/man/en/stationlist.xml.5 b/docs/man/en/stationlist.xml.5
index a2ec357..4839cf6 100644
--- a/docs/man/en/stationlist.xml.5
+++ b/docs/man/en/stationlist.xml.5
@@ -126,6 +126,7 @@ VHF Russia@R1\[en]R12, SR1\[en]SR19
VHF Australia@AS1\[en]AS12, AS5A, AS9A
VHF Italy@A\[en]H, H1, H2
VHF Ireland@I1\[en]I9
+VHF South Africa@1\[en]13
UHF@U21\[en]U69
UHF Australia@AU28\[en]AU69
Australia Optus@01\[en]058
diff --git a/src/bands.h b/src/bands.h
index db326e0..f2f8a08 100644
--- a/src/bands.h
+++ b/src/bands.h
@@ -297,6 +297,17 @@ const band_entry_t band_data_cn_bcast[] = {
{ "C3", 583250 }, { "C4", 591250 }, { "C5", 599250 }
};
+/**
+ * South African bands.
+ */
+const band_entry_t band_data_vhf_za[] = {
+ { "1", 175250 }, { "2", 183250 }, { "3", 191250 },
+ { "4", 199250 }, { "5", 207250 }, { "6", 215250 },
+ { "7", 223250 }, { "8", 231250 }, { "9", 239250 },
+ { "10", 247250 }, { "11", 255250 }, { "12", 263250 },
+ { "13", 271250 }
+};
+
const band_entry_t band_data_japan_bcast[] = {
{ "1", 91250 }, { "2", 97250 }, { "3", 103250 },
{ "4", 171250 }, { "5", 177250 }, { "6", 183250 },
@@ -369,6 +380,7 @@ const band_t bands[] = {
{ "US Two-Way", band_data_us_twoway, sizeof( band_data_us_twoway ) / sizeof( band_entry_t ) },
{ "US Broadcast", band_data_us_bcast, sizeof( band_data_us_bcast ) / sizeof( band_entry_t ) },
{ "China Broadcast", band_data_cn_bcast, sizeof( band_data_cn_bcast ) / sizeof( band_entry_t ) },
+ { "VHF South Africa", band_data_vhf_za, sizeof( band_data_vhf_za ) / sizeof( band_entry_t ) },
{ "Japan Broadcast", band_data_japan_bcast, sizeof( band_data_japan_bcast ) / sizeof( band_entry_t ) },
{ "Japan Cable", band_data_japan_catv, sizeof( band_data_japan_catv ) / sizeof( band_entry_t ) },
{ "VHF E2-E12", band_data_vhf_e1_e12, sizeof( band_data_vhf_e1_e12 ) / sizeof( band_entry_t ) },
@@ -387,16 +399,17 @@ const int numbands = ( sizeof( bands ) / sizeof( band_t ) );
const band_t *us_cable_band = &(bands[ 0 ]);
/*
- UK VHF Ireland, VHF Misc, UHF
- Europe VHF Italy, VHF E1-E12, VHF S1-S41, VHF Russia, UHF
- France VHF France, UHF
- East VHF Russia, UHF
- Australia VHF Australia, UHF-AU
- NZ VHF E1-E12, UHF
- US Cable US CATV
- US Air US Bcast
- JP Cable JP Cable
- JP Air JP Bcast
+ UK VHF Ireland, VHF Misc, UHF
+ Europe VHF Italy, VHF E1-E12, VHF S1-S41, VHF Russia, UHF
+ France VHF France, UHF
+ East VHF Russia, UHF
+ Australia VHF Australia, UHF-AU
+ NZ VHF E1-E12, UHF
+ US Cable US CATV
+ US Air US Bcast
+ JP Cable JP Cable
+ JP Air JP Bcast
+ South Africa VHF South Africa, UHF
*/
#define NTSC_CABLE_HRC(x) ((x == 77250) ? 78000 : ((x == 83250) ? 84000 : (x - 1250)))
diff --git a/src/commands.c b/src/commands.c
index 4201772..6906d09 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -749,18 +749,25 @@ static void reset_frequency_menu( menu_t *menu, int norm, const char *tablename
_("China Broadcast") );
menu_set_text( menu, 7, string );
menu_set_enter_command( menu, 7, TVTIME_SET_FREQUENCY_TABLE, "china-broadcast" );
+
+ snprintf( string, sizeof( string ),
+ !strcasecmp( tablename, "southafrica" ) ?
+ TVTIME_ICON_RADIOON " %s" : TVTIME_ICON_RADIOOFF " %s",
+ _("South Africa") );
+ menu_set_text( menu, 8, string );
+ menu_set_enter_command( menu, 8, TVTIME_SET_FREQUENCY_TABLE, "southafrica" );
snprintf( string, sizeof( string ),
!strcasecmp( tablename, "custom" ) ?
TVTIME_ICON_RADIOON " %s" : TVTIME_ICON_RADIOOFF " %s",
_("Custom (first run tvtime-scanner)") );
- menu_set_text( menu, 8, string );
- menu_set_enter_command( menu, 8, TVTIME_SET_FREQUENCY_TABLE, "custom" );
+ menu_set_text( menu, 9, string );
+ menu_set_enter_command( menu, 9, TVTIME_SET_FREQUENCY_TABLE, "custom" );
snprintf( string, sizeof( string ), TVTIME_ICON_PLAINLEFTARROW " %s",
_("Back") );
- menu_set_text( menu, 9, string );
- menu_set_enter_command( menu, 9, TVTIME_SHOW_MENU, "stations" );
+ menu_set_text( menu, 10, string );
+ menu_set_enter_command( menu, 10, TVTIME_SHOW_MENU, "stations" );
}
}
diff --git a/src/station.c b/src/station.c
index bb7026f..a47c2a8 100644
--- a/src/station.c
+++ b/src/station.c
@@ -412,6 +412,9 @@ station_mgr_t *station_new( const char *norm, const char *table,
station_add_band( mgr, "us broadcast" );
} else if( !strcasecmp( frequencies, "china-broadcast" ) ) {
station_add_band( mgr, "china broadcast" );
+ } else if( !strcasecmp( frequencies, "southafrica" ) ) {
+ station_add_band( mgr, "vhf south africa" );
+ station_add_band( mgr, "uhf" );
} else if( !strcasecmp( frequencies, "japan-cable" ) ) {
station_add_band( mgr, "japan cable" );
} else if( !strcasecmp( frequencies, "japan-broadcast" ) ) {
diff --git a/src/tvtimeconf.c b/src/tvtimeconf.c
index 51e9566..5666f0b 100644
--- a/src/tvtimeconf.c
+++ b/src/tvtimeconf.c
@@ -596,6 +596,7 @@ static void print_usage( char **argv )
" us-cable100\n"
" us-broadcast\n"
" china-broadcast\n"
+ " southafrica\n"
" japan-cable\n"
" japan-broadcast\n"
" europe\n"
@@ -647,6 +648,7 @@ static void print_config_usage( char **argv )
" us-cable100\n"
" us-broadcast\n"
" china-broadcast\n"
+ " southafrica\n"
" japan-cable\n"
" japan-broadcast\n"
" europe\n"

Privacy Policy