[xine-cvs] HG: xine-lib-1.2: Allow DVB GUI to be disabled

[<sim...@on...>]

# HG changeset patch
# User Simon Farnsworth <sim...@on...>
# Date 1184235181 -3600
# Node ID 8e674d38d6e08f525f6d68cd4a171ee09fbb9b72
# Parent  994fb7956facce572757524a7a634cf042c7800c
Allow DVB GUI to be disabled

Make the DVB GUI configurable by config entry, for kiosk applications

diff -r 8e674d38d6e08f525f6d68cd4a171ee09fbb9b72 -r 994fb7956facce572757524a7a634cf042c7800c src/input/input_dvb.c
--- a/src/input/input_dvb.c	Thu Jul 12 11:13:01 2007 +0100
+++ b/src/input/input_dvb.c	Fri Jul 13 21:47:37 2007 +0100
@@ -336,6 +336,8 @@ typedef struct {
   /* scratch buffer for forward seeking */
   char                seek_buf[BUFSIZE];
 
+  /* Is the GUI enabled at all? */
+  int                 dvb_gui_enabled;
   /* simple vcr-like functionality */
   int                 record_fd;
   int		      record_paused;
@@ -2506,7 +2508,8 @@ static off_t dvb_plugin_read (input_plug
 
   if (!this->tuned_in)
       return 0;
-  dvb_event_handler (this);
+  if (this->dvb_gui_enabled)
+      dvb_event_handler (this);
 #ifdef LOG_READS
   xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,
 	  "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len);
@@ -2771,6 +2774,11 @@ static int dvb_plugin_open(input_plugin_
     xine_cfg_entry_t zoomdvb;
     xine_cfg_entry_t adapter;
     xine_cfg_entry_t lastchannel;
+    xine_cfg_entry_t gui_enabled;
+
+    xine_config_lookup_entry(this->stream->xine, "media.dvb.gui_enabled", &gui_enabled);
+    this->dvb_gui_enabled = gui_enabled.num_value;
+    xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("input_dvb: DVB GUI %s\n"), this->dvb_gui_enabled ? "enabled" : "disabled");
     
     xine_config_lookup_entry(this->stream->xine, "media.dvb.adapter", &adapter);
 
@@ -2997,15 +3005,16 @@ static int dvb_plugin_open(input_plugin_
     this->event_queue = xine_event_new_queue(this->stream);
 
 #ifdef EPG_UPDATE_IN_BACKGROUND
-    /* Start the EPG updater thread. */
-    this->epg_updater_stop = 0;
-    if (pthread_create(&this->epg_updater_thread, NULL, 
-		       epg_data_updater, this) != 0) {
-	xprintf(
-	    this->class->xine, XINE_VERBOSITY_LOG,
-	    _("input_dvb: cannot create EPG updater thread\n"));
-	return 0;
-
+    if (this->dvb_gui_enabled) {
+      /* Start the EPG updater thread. */
+      this->epg_updater_stop = 0;
+      if (pthread_create(&this->epg_updater_thread, NULL, 
+		         epg_data_updater, this) != 0) {
+	  xprintf(
+	      this->class->xine, XINE_VERBOSITY_LOG,
+	      _("input_dvb: cannot create EPG updater thread\n"));
+	  return 0;
+      }
     } 
 #endif
     /*
@@ -3295,6 +3304,13 @@ static void *init_class (xine_t *xine, v
 			 "Greater than 0 means wait that many seconds to get a lock. Minimum is 5 seconds."),
 		       0, NULL, (void *) this);
 
+  /* set to 0 to turn off the GUI built into this input plugin */
+  config->register_bool(config, "media.dvb.gui_enabled",
+			1,
+			_("Enable the DVB GUI"),
+			_("Enable the DVB GUI, mouse controlled recording and channel switching."),
+			21, NULL, NULL);
+
   config->register_num(config, "media.dvb.adapter",
 		       0,
 		       _("Number of dvb card to use."),