simple osd menu for dvb channel selection; updated dvb_channels and README.dvb

CVS patchset: 3703
CVS date: 2002/12/28 01:46:11

3 files changed, 90 insertions, 62 deletions

diff --git a/doc/README.dvb b/doc/README.dvb
index 15f94e7f1..3c487c395 100644
--- a/doc/README.dvb
+++ b/doc/README.dvb
@@ -82,6 +82,12 @@ this writing). then simply start something like
 $ gxine dvb://
 
 you should be able to zap around using the NumPad-8 / NumPad-2 keys.
-An OSD menu for channel selection is currently being implemented.
+
+An OSD menu is available too. Press NumPad-9 / NumPad-3 to scroll 
+through the channels, then press NumPad-Enter to switch to the channel
+you have selected.
+
+HINT: if audio or video is stuttering, pause (space key) shortly
+to give xine a chance to fill up it's buffers.
 
 Have fun.
diff --git a/doc/dvb_channels b/doc/dvb_channels
index 940e876d0..b0932d158 100644
--- a/doc/dvb_channels
+++ b/doc/dvb_channels
@@ -24,23 +24,23 @@ KABEL1
 0 12483000 2 27502000 2 511 512
 Super RTL
 0 12188000 4 27500000 2 165 120
+Tele 5
+0 12480000 2 27500000 3 1535 1536
 NEUN LIVE Television
 0 12483000 2 27502000 2 767 768
 TW1
 0 12692000 4 22000000 3 166 167
-ARTE
-0 10788000 4 22000000 3 167 136
-ZIK / XXL
-0 12266000 4 27500000 2 164 96
+XXP
+2 11095000 4 27500000 2 33 44
 N24
-0 12483000 2 27502000 2 2047 2048
+0 12483000 2 27500000 2 2047 2048
 n-tv
 0 12670000 2 22000000 3 162 96
 CNN Int.
 0 12168000 2 27500000 2 165 100
 EuroNews
 0 11954000 4 27500000 2 2221 2233
-fox news
+FOX news
 2 10983000 2 27500000 2 523 751
 CNBC
 0 11954000 4 27500000 2 510 520
@@ -50,14 +50,48 @@ Sky News
 0 12552000 2 22000000 3 305 306
 Phoenix
 0 11837000 4 27500000 2 901 902
-XXP
-2 11095000 4 27500000 2 33 44
+WorldNet Europe
+2 12484000 2  8300000 3 4260 4220
+WorldNet
+2 12484000 2  8300000 3 4560 4520
+DW TV America
+2 11143000 2 5500000 7 33 4010
+DW TV Afghanistan
+2 11143000 2 5500000 7 111 112
 DW-TV
 0 10788000 2 22000000 3 305 306
-BR-alpha
-0 11837000 4 27500000 2 701 702
+EbS - Europe by Satellite
+2 12476000 4 27500000 3 101 202
+NBC Europe
+2 11054000 4 27500000 5 550 551
 NBC
 2 11054000 4 27500000 3 550 551
+Gay TV
+2 12149000 2 27500000 3 36 37
+Fashion TV
+2 12245000 4 27500000 3 123 133
+Bahn TV
+0 12633000 4 22000000 5 201 301
+BR-alpha
+0 11837000 4 27500000 2 701 702
+Bibel TV
+0 10832000 4 22000000 5 32 33
+K-TV
+2 11604000 4 27500000 5 711 712
+LibertyTV.com
+0 12610000 2 22000000 5 941 943
+Motors TV
+0 12610000 2 22000000 5 191 194
+RTL TELE Letzebuerg
+0 12552000 2 22000000 3 168 144
+Nordliicht TV
+0 12552000 2 22000000 3 168 144
+Duna TV
+2 12149000 2 27500000 3 96 97
+EWTN Europe
+2 10723000 4 29900000 3 1001 1201
+MTA International
+2 10723000 4 29900000 3 1004 1304
 arte
 0 11837000 4 27500000 2 401 402
 Bloomberg TV Germany
@@ -70,10 +104,28 @@ ZDFinfokanal
 0 11954000 4 27500000 2 610 620
 MTV Central
 0 12699000 2 22000000 3 3031 3032
+MTV Germany
+0 11739000 2 27500000 3 3031 3032
+MTV Pop
+0 11739000 2 27500000 3 3081 3082
 VIVA
 0 12670000 2 22000000 3 309 310
 VIVA PLUS
 0 12552000 2 22000000 3 171 172
+DeeJay TV
+2 11604000 4 27500000 5 160 161
+VIVA Polska
+2 11604000 4 27500000 5 190 191
+102&5 Hit Channel
+2 11623000 2 27500000 3 224 244
+123 Sat
+2 11623000 2 27500000 3 230 250
+Channel X / Ultra Blue TV
+2 11623000 2 27500000 3 223 243
+TV NRW
+2 11604000 4 27500000 5 111 112
+Arte German
+2 11060000 2 6510000 5 98 99
 3sat
 0 11954000 4 27500000 2 210 220
 SFB1
@@ -94,18 +146,14 @@ NDR Fernsehen
 0 12109000 4 27500000 2 2401 2402
 ORB-Fernsehen
 0 12109000 4 27500000 2 501 502
-SÜDWEST RP
+SUEDWEST RP
 0 12109000 4 27500000 2 3101 3102
 tv.nrw
 2 11604000 4 27500000 3 111 112
 ONTV Regional
 0 12148000 4 27500000 2 2303 2304
-FASHION-TV
-0 12266000 4 27500000 2 169 116
 Eurosport
 0 11954000 4 27500000 2 410 420
-RTL TELE Letzebuerg
-0 12552000 2 22000000 3 168 144
 Iraq
 2 12654000 4 27500000 2 1960 1920
 Tele5
@@ -121,7 +169,7 @@ LCP
 TEST
 0 12188000 4 27500000 2 50 51
 FEED
-2 12437000 4 27500000 2 308 256
+0 12437000 4 27500000 2 308 256
 RTL2 AUSTRIA
 2 11054000 4 27500000 2 520 521
 ProSieben Schweiz
@@ -129,7 +177,7 @@ ProSieben Schweiz
 RTL Television
 2 11054000 4 27500000 2 160 80
 RAI 1
-0 10788000 2 22000000 3 289 290
+2 10788000 2 22000000 3 289 290
 ESC1 - EGYPTE
 0 10788000 2 22000000 3 163 104
 Canal Algerie
@@ -192,8 +240,6 @@ Canal Canarias
 0 12441000 2 27500000 2 160 80
 ETB SAT
 0 12441000 2 27500000 2 163 92
-FASHION TV
-0 12441000 2 27500000 2 165 100
 TAQUILLA 0
 0 12441000 2 27500000 2 166 104
 TM SAT/LA OTRA
@@ -215,23 +261,19 @@ Travel
 Promo
 2 12169000 4 27500000 2 521 740
 ASTRA Mosaik
-0 12552000 2 22000000 3 175 176
+0 12552000 2 22000000 5 175 176
 ASTRA-Mosaic 2
-0 12552000 2 22000000 3 179 120
+0 12552000 2 22000000 5 179 120
 ASTRA-Mosaic 3
-0 12552000 2 22000000 3 182 169
+0 12552000 2 22000000 5 182 169
 ASTRA-Mosaic 4
-0 12552000 2 22000000 3 185 170
+0 12552000 2 22000000 5 185 170
 ASTRA-Mosaic 5
-0 12552000 2 22000000 3 163 164
+0 12552000 2 22000000 5 163 164
 BVN
 0 12574000 4 22000000 2 164 96
 Liberty TV.com
 0 12610000 2 22000000 2 941 943
-LibertyTV.com
-0 12610000 2 22000000 2 941 942
-Motors TV
-0 12610000 2 22000000 2 191 192
 RTBF SAT
 0 12610000 2 22000000 2 48 49
 TV5 Europe
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 6a5b3c7a7..1e3fab08f 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -362,21 +362,8 @@ static int tuner_set_channel (tuner_t *this,
 
 static void osd_show_channel (dvb_input_plugin_t *this) {
 
-  printf ("input_dvb: channel=%d\n", this->channel);
-
-#if 0 /* FIXME */
   int i, channel ;
 
-  if (!this->osd) {
-    this->osd = this->stream->osd_renderer->new_object (this->stream->osd_renderer, 
-						      410, 410);
-    this->stream->osd_renderer->set_position (this->osd, 20, 20);
-    this->stream->osd_renderer->set_font (this->osd, "cetus", 32);
-    this->stream->osd_renderer->set_text_palette (this->osd,
-						TEXTPALETTE_WHITE_NONE_TRANSLUCID,
-						OSD_TEXT3);
-  }
-
   this->stream->osd_renderer->filled_rect (this->osd, 0, 0, 395, 400, 2); 
 
   channel = this->channel - 5;
@@ -396,7 +383,6 @@ static void osd_show_channel (dvb_input_plugin_t *this) {
   this->stream->osd_renderer->line (this->osd, 390, 183, 390, 219, 10);
 
   this->stream->osd_renderer->show (this->osd, 0);
-#endif
 
 }
 
@@ -429,9 +415,7 @@ static void switch_channel (dvb_input_plugin_t *this) {
   
   pthread_mutex_unlock (&this->mutex);
 
-#if 0 /* FIXME */  
   this->stream->osd_renderer->hide (this->osd, 0);
-#endif
 }
 
 static void dvb_event_handler (dvb_input_plugin_t *this) {
@@ -440,6 +424,10 @@ static void dvb_event_handler (dvb_input_plugin_t *this) {
 
   while ((event = xine_event_get (this->event_queue))) {
 
+#ifdef LOG
+    printf ("input_dvb: got event %08x\n", event->type);
+#endif
+
     if (this->fd<0) {
       xine_event_free (event);
       return;
@@ -477,7 +465,7 @@ static void dvb_event_handler (dvb_input_plugin_t *this) {
       switch_channel (this);
       break;
 
-    case XINE_EVENT_INPUT_MENU3:
+    case XINE_EVENT_INPUT_MENU1:
       this->stream->osd_renderer->hide (this->osd, 0);
       break;
 
@@ -537,18 +525,6 @@ static buf_element_t *dvb_plugin_read_block (input_plugin_t *this_gen,
   int                   total_bytes;
 
 
-#if 0
-  if (this->report_pids) {
-
-    printf ("input_dvb: reporting pids %d (video), %d (audio)\n",
-	    this->channels[this->channel].vpid,
-	    this->channels[this->channel].apid);
-
-    this->report_pids = 0;
-
-  }
-#endif
-
   buf->content = buf->mem;
   buf->type    = BUF_DEMUX_BLOCK;
   
@@ -776,10 +752,6 @@ static input_plugin_t *open_plugin (input_class_t *cls_gen,
   this->input_plugin.input_class       = cls_gen;
   this->cls                            = cls;
 
-  /*
-  xine_register_event_listener (this->stream, dvb_event_listener, this);
-  */
-
   pthread_mutex_init (&this->mutex, NULL);
 
 #if 0
@@ -790,6 +762,14 @@ static input_plugin_t *open_plugin (input_class_t *cls_gen,
 
   this->event_queue = xine_event_new_queue (this->stream);
 
+  this->osd = this->stream->osd_renderer->new_object (this->stream->osd_renderer, 
+						      410, 410);
+  this->stream->osd_renderer->set_position (this->osd, 20, 20);
+  this->stream->osd_renderer->set_font (this->osd, "cetus", 32);
+  this->stream->osd_renderer->set_text_palette (this->osd,
+						TEXTPALETTE_WHITE_NONE_TRANSLUCID,
+						OSD_TEXT3);
+
   return (input_plugin_t *) this;
 }