summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/input/input_dvd.c12
-rw-r--r--src/input/input_file.c4
2 files changed, 11 insertions, 5 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index f12f541a2..649280e4c 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.79 2002/09/14 19:04:07 guenter Exp $
+ * $Id: input_dvd.c,v 1.80 2002/09/15 14:05:37 mroi Exp $
*
*/
@@ -1256,7 +1256,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
if(this && this->xine && this->dvdnav) {
if(!(dvdnav_is_domain_vts(this->dvdnav))) {
- sprintf(data, "%3s", "off");
+ sprintf(data, "%3s", "none");
goto __spu_success;
}
@@ -1280,7 +1280,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
else {
channel = xine_get_spu_channel(this->xine);
if(channel == -1)
- sprintf(data, "%3s", "off");
+ sprintf(data, "%3s", "none");
else
sprintf(data, "%3i", channel);
}
@@ -1483,6 +1483,12 @@ static void *init_input_plugin (xine_t *xine, void *data) {
/*
* $Log: input_dvd.c,v $
+ * Revision 1.80 2002/09/15 14:05:37 mroi
+ * be more distinct with UI info texts for
+ * "no subtitles because user switched it off"
+ * and
+ * "no subtitles because none are available"
+ *
* Revision 1.79 2002/09/14 19:04:07 guenter
* latest xine_config api changes as proposed by james
*
diff --git a/src/input/input_file.c b/src/input/input_file.c
index d0a522fef..87bb5319b 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.57 2002/09/06 18:13:11 mroi Exp $
+ * $Id: input_file.c,v 1.58 2002/09/15 14:05:37 mroi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -823,7 +823,7 @@ static int file_plugin_get_optional_data (input_plugin_t *this_gen,
break;
case INPUT_OPTIONAL_DATA_SPULANG:
- sprintf(data, "%3s", (this->sub) ? "on" : "off");
+ sprintf(data, "%3s", (this->sub) ? "sub" : "none");
return INPUT_OPTIONAL_SUCCESS;
break;