xine - a free video player

Hi Michael,

V Ne, 12. 09. 2004 v 21:38, Michael Roitzsch p=C3=AD=C5=A1e:
> >
> > Yes, I agree. Could you please do it? I won't have time now before
> > release. (or just revert my change and I'll do it later)
>=20
> Done. I added <unistd.h> to the affected files.
>=20

Thank you.

(I passed the final state exam at the university, yeah! :-))

Cheers,
  Franti=C5=A1ek

Update of /cvsroot/xine/xine_www/documentation/meta
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6342

Modified Files:
	releases.xine-lib 
Log Message:
Added 1-RC6a to the list of releases


Index: releases.xine-lib
===================================================================
RCS file: /cvsroot/xine/xine_www/documentation/meta/releases.xine-lib,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- releases.xine-lib	21 Jun 2004 01:34:23 -0000	1.14
+++ releases.xine-lib	16 Sep 2004 21:31:45 -0000	1.15
@@ -6,6 +6,7 @@
 extension: .tar.gz
 keep-old: 0.9.13
 
+1-rc6a
 1-rc5
 1-rc4a
 1-rc4

Update of /cvsroot/xine/xine-lib/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9883

Modified Files:
	de.po 
Log Message:
One day worth of translations

Index: de.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/de.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- de.po	16 Sep 2004 01:00:33 -0000	1.57
+++ de.po	16 Sep 2004 16:48:17 -0000	1.58
@@ -7,7 +7,7 @@
 "Project-Id-Version: xine-lib 1.0.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-15 19:10-0400\n"
-"PO-Revision-Date: 2004-04-07 23:11+0200\n"
+"PO-Revision-Date: 2004-09-16 18:46+0200\n"
 "Last-Translator: Philipp Hahn <pmhahn@..."
 "Language-Team: German <de@..."
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@
 
 #: src/audio_out/audio_alsa_out.c:1271
[...2642 lines suppressed...]
 #: src/libw32dll/w32codec.c:586
 #, c-format
@@ -4316,17 +4729,14 @@
 msgstr "w32codec: Fehler beim Initialisieren von DMO Audio\n"
 
 #: src/libspucmml/xine_decoder.c:478
-#, fuzzy
 msgid "font for external subtitles"
 msgstr "Zeichensatz für externe Untertitel"
 
 #: src/libspucmml/xine_decoder.c:484
-#, fuzzy
 msgid "subtitle vertical offset (relative window size)"
 msgstr "Vertikaler Versatz für Untertitel (Relativ zu Fenstergröße)"
 
 #: src/libspucmml/xine_decoder.c:530
-#, fuzzy
 msgid "encoding of subtitles"
 msgstr "Zeichenkodierung für Untertitel"

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20560

Modified Files:
	configure.ac 
Log Message:
Missed version change

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- configure.ac	16 Sep 2004 14:54:25 -0000	1.281
+++ configure.ac	16 Sep 2004 15:11:46 -0000	1.282
@@ -41,7 +41,7 @@
 if test -f .cvsversion; then
   XINE_PRE="cvs"
 else
-  XINE_PRE="rc6"
+  XINE_PRE="rc6a"
 fi
 
 AC_SUBST(XINE_MAJOR)

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16921

Modified Files:
	configure.ac 
Log Message:
Updated configure.ac version
Updated HOWTO to reflect incorrect cvs tag command. A -r is means to have a particular version in mind when tagging while -R means to recursively tag all files with a given tag name.


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- configure.ac	16 Sep 2004 01:00:35 -0000	1.280
+++ configure.ac	16 Sep 2004 14:54:25 -0000	1.281
@@ -33,8 +33,8 @@
 dnl       AGE = 0;
 dnl }
 
-LT_CURRENT=9
-LT_REVISION=2
+LT_CURRENT=10
+LT_REVISION=0
 LT_AGE=9
 
 dnl for a release tarball do "rm .cvsversion" before "make dist"

Update of /cvsroot/xine/xine-lib/doc/internal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16921/doc/internal

Modified Files:
	HOWTO.release 
Log Message:
Updated configure.ac version
Updated HOWTO to reflect incorrect cvs tag command. A -r is means to have a particular version in mind when tagging while -R means to recursively tag all files with a given tag name.


Index: HOWTO.release
===================================================================
RCS file: /cvsroot/xine/xine-lib/doc/internal/HOWTO.release,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HOWTO.release	12 Sep 2004 16:03:52 -0000	1.4
+++ HOWTO.release	16 Sep 2004 14:54:25 -0000	1.5
@@ -93,7 +93,7 @@
 The tests have now all passed. you've got the release tarball in your
 hands.
 
-7) Tag the release: cvs tag -r xine-1_2_3-release
+7) Tag the release: cvs tag -R xine-1_2_3-release
    (this would be the tag for xine-lib-1.2.3, for example)
 
 8) upload the tarball to ftp:/upload.sf.net/incoming

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25701/src/input

Modified Files:
	input_dvd.c 
Log Message:
new DVD MRL parser (refactored into two new functions to be more readable and
easier extensible)

behaviour:
dvd:/           opens default device (this is a temporary special case)
dvd:/1.2        opens given title/part on default device (dito)
dvd:/path/      opens given device, directory or single-file image
dvd:/path       same as above, so fully compatible with old behaviour
dvd:/path/1.2   tries to open /path/1.2, falling back to /path with title/part


Index: input_dvd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- input_dvd.c	1 Sep 2004 16:17:39 -0000	1.190
+++ input_dvd.c	16 Sep 2004 13:10:09 -0000	1.191
@@ -108,8 +108,9 @@
 /* #define LOG_DVD_EJECT */
 
 /* Current play mode (title only or menus?) */
-#define MODE_NAVIGATE 0
-#define MODE_TITLE 1
+#define MODE_FAIL	0
+#define MODE_NAVIGATE	1
+#define MODE_TITLE	2
 
 /* Is seeking enabled? 1 - Yes, 0 - No */
 #define CAN_SEEK 1
@@ -197,7 +198,7 @@
   int               seekable;     /* are we seekable? */
   
   /* xine specific variables */
-  char             *current_dvd_device; /* DVD device currently open */
+  const char       *current_dvd_device; /* DVD device currently open */
   char             *mrl;          /* Current MRL                     */
   dvdnav_t         *dvdnav;       /* Handle for libdvdnav            */
   const char       *dvd_name;
@@ -1319,66 +1320,36 @@
 }
 #endif
 
-static int dvd_plugin_open (input_plugin_t *this_gen) {
-  dvd_input_plugin_t    *this = (dvd_input_plugin_t*)this_gen;
-  dvd_input_class_t     *class = (dvd_input_class_t*)this_gen->input_class;
-  
-  char                  *locator;
-  int                    last_colon = 0, mode;
-  int                    locator_len;
-  dvdnav_status_t        ret;
-  char                  *intended_dvd_device;
-  xine_event_t           event;
-  xine_cfg_entry_t       region_entry, lang_entry, cache_entry;
-  
-  trace_print("Called\n");
-
-  mode = MODE_NAVIGATE;
-  /* we already checked the "dvd:/" MRL before */
-  locator = &this->mrl[strlen("dvd:/")];
-
-  /* Attempt to parse MRL */
-  /* FIXME: strlen is dangerous, we should use a bounded max len version of strlen. */
-  last_colon = locator_len = strlen(locator);
-  /* Special case if mrl is dvd:/  just play DVD from DVD drive.
-   * If is it not the special case, we want to backstep over the "/"
-   */
-  if (locator_len > 0) {
-    locator--;
-    locator_len++;
-    last_colon++;
-  }
- 
-  while (last_colon && locator[last_colon] != ':' )
-    last_colon--;
 
-  if((last_colon == 0) && (locator_len > 0)) {
-    last_colon = locator_len;
-  }
-  if(last_colon) {
+static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
+{
+  const char *intended_dvd_device;
+  
+  /* FIXME: we temporarily special-case "dvd:/" for compatibility;
+   * actually "dvd:/" should play a DVD image stored in /, but for
+   * now we have it use the default device */
+#if 0
+  if (strlen(locator)) {
+#else
+  if (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) {
+#endif
     /* we have an alternative dvd_path */
     intended_dvd_device = locator;
-    intended_dvd_device[last_colon] = '\0';
-    locator += last_colon; /* Set locator to null string */
-    if ( (last_colon + 1) < locator_len ) {
-      locator++; /* Only if there are more characters after the colon, use them for Title mode */
-      mode = MODE_TITLE;
-    }
-
     /* do not use the raw device for the alternative */
     xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
-
-  }else{
+  } else {
+    /* use default DVD device */
+    dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class;
     xine_cfg_entry_t raw_device;
-    
     if (xine_config_lookup_entry(this->stream->xine,
-        "input.dvd_raw_device", &raw_device))
+	"input.dvd_raw_device", &raw_device))
       xine_setenv("DVDCSS_RAW_DEVICE", raw_device.str_value, 1);
-    intended_dvd_device=class->dvd_device;
+    intended_dvd_device = class->dvd_device;
   }
-
-  if(this->opened) {
-    if ( intended_dvd_device==this->current_dvd_device ) {
+  
+  /* attempt to open DVD */
+  if (this->opened) {
+    if (intended_dvd_device == this->current_dvd_device) {
       /* Already open, so skip opening */
       dvdnav_reset(this->dvdnav);
     } else {
@@ -1386,26 +1357,85 @@
       dvdnav_close(this->dvdnav);
       this->dvdnav = NULL;
       this->opened = 0; 
-      ret = dvdnav_open(&this->dvdnav, intended_dvd_device);
-      if(ret == DVDNAV_STATUS_ERR) {
-	xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
-	_x_message (this->stream, XINE_MSG_READ_ERROR,
-		      intended_dvd_device, NULL);
-        return 0;
-      }
-      this->opened=1;
-      this->current_dvd_device=intended_dvd_device;
     }
+  }
+  if (!this->opened) {
+    if (dvdnav_open(&this->dvdnav, intended_dvd_device) == DVDNAV_STATUS_OK) {
+      this->opened = 1;
+      this->current_dvd_device = intended_dvd_device;
+    }
+  }
+  
+  return this->opened;
+}
+
+static int dvd_parse_mrl(dvd_input_plugin_t *this, char **locator, char **title_part)
+{
+  *title_part      = NULL;
+  
+  if (dvd_parse_try_open(this, *locator)) {
+    return MODE_NAVIGATE;
   } else {
-    ret = dvdnav_open(&this->dvdnav, intended_dvd_device);
-    if(ret == DVDNAV_STATUS_ERR) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
-      _x_message (this->stream, XINE_MSG_READ_ERROR,
-		    intended_dvd_device, NULL);
-      return 0;
+    /* opening failed, but we can still try cutting off <title>.<part> */
+    char *last_slash;
+    for (last_slash = *locator + strlen(*locator) - 1; last_slash >= *locator; last_slash--) {
+      if (*last_slash == '.') continue;
+      if (*last_slash >= '0' && *last_slash <= '9') continue;
+      break;
     }
-    this->opened=1;
-    this->current_dvd_device=intended_dvd_device;
+    if (last_slash > *locator && *last_slash == '/') {
+      *title_part = last_slash + 1;
+      *last_slash = '\0';
+    } else if (last_slash == *locator && *last_slash == '/') {
+      /* we must never delete the very first slash, since this will turn an
+       * absolute into a relative URL and overthrow further opening */
+      *title_part = last_slash + 1;
+      *locator = "/";
+    } else if (last_slash < *locator) {
+      /* there could be a dvd:<title>.<part> MRL without any path */
+      *title_part = *locator;
+      *locator = "";
+    } else
+      return MODE_FAIL;
+    
+    if (dvd_parse_try_open(this, *locator))
+      if (strlen(*title_part))
+	return MODE_TITLE;
+      else
+	return MODE_NAVIGATE;
+    else
+      return MODE_FAIL;
+  }
+}
+
+static int dvd_plugin_open (input_plugin_t *this_gen) {
+  dvd_input_plugin_t    *this = (dvd_input_plugin_t*)this_gen;
+  dvd_input_class_t     *class = (dvd_input_class_t*)this_gen->input_class;
+  
+  char                  *locator;
+  char                  *title_part;
+  int                    mode;
+  xine_event_t           event;
+  xine_cfg_entry_t       region_entry, lang_entry, cache_entry;
+  
+  trace_print("Called\n");
+
+  /* we already checked the "dvd:/" MRL before */
+  locator = this->mrl + (sizeof("dvd:") - 1);
+
+  /* FIXME: call a generic xine-lib MRL parser here to pre-parse
+   * the MRL for ?title=<title>&part=<part> stuff and to expand 
+   * escaped characters properly */
+  
+  mode = dvd_parse_mrl(this, &locator, &title_part);
+  
+  if (mode == MODE_FAIL) {
+    /* opening failed and we have nothing left to try */
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
+    _x_message(this->stream, XINE_MSG_READ_ERROR,
+      /* FIXME: see FIXME in dvd_parse_try_open() */
+      (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
+    return 0;
   }
   
   dvdnav_get_title_string(this->dvdnav, &this->dvd_name);
@@ -1430,18 +1460,18 @@
 			       &cache_entry))
     seek_mode_cb(class, &cache_entry);  
 
-  if(mode == MODE_TITLE) {
+  if (mode == MODE_TITLE) {
     char *delimiter;
     int tt, pr;
     int titles, parts;
     
-    /* A program and/or VTS was specified */
+    /* a <title>.<part> was specified -> resume parsing */
 
     /* See if there is a period. */
-    delimiter = strchr(locator, '.');
+    delimiter = strchr(title_part, '.');
     if (delimiter) *delimiter = '\0';
 
-    tt = strtol(locator, NULL, 10);
+    tt = strtol(title_part, NULL, 10);
     dvdnav_get_number_of_titles(this->dvdnav, &titles);
     if((tt <= 0) || (tt > titles)) {
       xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,

Update of /cvsroot/xine/xine-lib/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30327/po

Modified Files:
	xine-lib.pot sk.po pt_BR.po pl.po it.po fr.po es.po de.po 
	cs.po POTFILES.in 
Log Message:
Update the interface numbering
Adding update po files


Index: xine-lib.pot
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/xine-lib.pot,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xine-lib.pot	7 Apr 2004 19:35:41 -0000	1.40
+++ xine-lib.pot	16 Sep 2004 01:00:30 -0000	1.41
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@..."
 "Language-Team: LANGUAGE <LL@..."
@@ -16,136 +16,229 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
[...4209 lines suppressed...]
+
+#: src/libw32dll/w32codec.c:1235
+msgid "w32codec: Error initializing DirectShow Audio\n"
+msgstr ""
+
+#: src/libw32dll/w32codec.c:1253
+msgid "w32codec: Error initializing DMO Audio\n"
+msgstr ""
+
+#: src/libspucmml/xine_decoder.c:478
+msgid "font for external subtitles"
+msgstr ""
+
+#: src/libspucmml/xine_decoder.c:484
+msgid "subtitle vertical offset (relative window size)"
+msgstr ""
+
+#: src/libspucmml/xine_decoder.c:530
+msgid "encoding of subtitles"
+msgstr ""

Index: sk.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/sk.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sk.po	7 Apr 2004 19:35:41 -0000	1.36
+++ sk.po	16 Sep 2004 01:00:30 -0000	1.37
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2002-02-15 15:08+0200\n"
 "Last-Translator: Tomáš Kovár <tomask@..."
 "Language-Team: Slovak <ski18n@..."
@@ -17,137 +17,230 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
[...4300 lines suppressed...]
+#~ msgstr "input_net: nemožno zistiť adresu '%s'.\n"
+
+#, fuzzy
+#~ msgid "input_cdda: unable to connect to '%s'.\n"
+#~ msgstr "input_net: nemožno sa pripojiť k '%s'.\n"
+
 #~ msgid ""
 #~ "demux_mpeg_block: too many errors, stopping playback. Maybe this stream "
 #~ "is scrambled?\n"
@@ -2768,10 +3961,6 @@
 #~ msgid "Opening >%s<\n"
 #~ msgstr "Otvára sa >%s<\n"
 
-#, fuzzy
-#~ msgid "input_rip: stat on the file %s failed: %s\n"
-#~ msgstr "input_cda: zlyhala funkcia fopen(%s): %s.\n"
-
 #~ msgid "video_out: can't create thread (%s)\n"
 #~ msgstr "video_out: nemožno vytvoriť vlákno (%s)\n"
 

Index: pt_BR.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/pt_BR.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pt_BR.po	7 Apr 2004 19:35:41 -0000	1.39
+++ pt_BR.po	16 Sep 2004 01:00:31 -0000	1.40
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2002-01-22 18:31GMT-3\n"
 "Last-Translator: Marcelo Roberto Jimenez <mroberto@..."
 "Language-Team: Portuguese (Brazilian) <pt_BR@..."
@@ -16,137 +16,230 @@
 "X-Generator: KBabel 0.9.5\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
[...4304 lines suppressed...]
+#~ msgstr "input_net: incapaz de resolver '%s'.\n"
+
+#, fuzzy
+#~ msgid "input_cdda: unable to connect to '%s'.\n"
+#~ msgstr "input_net: incapaz de conectar em '%s'.\n"
+
 #~ msgid ""
 #~ "demux_mpeg_block: too many errors, stopping playback. Maybe this stream "
 #~ "is scrambled?\n"
@@ -2770,10 +3963,6 @@
 #~ msgstr "Abrindo >%s<\n"
 
 #, fuzzy
-#~ msgid "input_rip: stat on the file %s failed: %s\n"
-#~ msgstr "input_cda: fopen(%s) failed: %s\n"
-
-#, fuzzy
 #~ msgid "video_out: can't create thread (%s)\n"
 #~ msgstr "video_out : não consigo criar thread (%s)\n"
 

Index: pl.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/pl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pl.po	7 Apr 2004 19:35:41 -0000	1.4
+++ pl.po	16 Sep 2004 01:00:31 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pl_PL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2003-05-24 12:36+0200\n"
 "Last-Translator: Bartłomiej Muryn <_4ever_@..."
 "Language-Team: Polish <pl@..."
@@ -18,151 +18,240 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
[...4840 lines suppressed...]
-
-# src/libsputext/xine_decoder.c:1078
-#~ msgid "encoding of subtitles"
-#~ msgstr "kodowanie napisów"
-
 #~ msgid ""
 #~ "FLI: in chunk FLI_COPY : source data (%d bytes) bigger than image, "
 #~ "skipping chunk\n"
@@ -3071,11 +4456,6 @@
 #~ msgstr ""
 #~ "MS RLE: zakończono dekodowanie ramki z pozostałymi bajtami (%d < %d)\n"
 
-# src/input/input_rtp.c:339
-#, fuzzy
-#~ msgid "input_rip: stat on the file %s failed: %s\n"
-#~ msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
-
 # src/xine-engine/video_out.c:890
 #~ msgid "video_out: can't create thread (%s)\n"
 #~ msgstr "video_out: nie mogę utworzyć wątku (%s)\n"

Index: it.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/it.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- it.po	12 Jul 2004 21:15:48 -0000	1.13
+++ it.po	16 Sep 2004 01:00:32 -0000	1.14
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2004-07-11 19:54+0200\n"
 "Last-Translator: Giovanni Venturi <jumpyj@..."
 "Language-Team: Italian <kde-i18n-it@..."
@@ -19,44 +19,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
[...4665 lines suppressed...]
+#~ "metodo di deiterlacciamento software (Key I con deinterlacciatori on/off)"
+
+#~ msgid ""
+#~ "'resample' might be better if you use a DXR3/H+ card and (analog) audio "
+#~ "is processed by your sound card"
+#~ msgstr ""
+#~ "'ricampiona' dovrebbe essere migliore se si usa una scheda DXR3/H+ e se "
+#~ "si elabora audio (analogico) con la scheda sonora"
+
+#~ msgid "adjust whether resampling is done or not"
+#~ msgstr "aggiusta indipendentemente dal ricampionamento"
+
+#~ msgid "adjust if audio is offsync"
+#~ msgstr "aggiusta se l'audio non è più sincrono"
+
+#~ msgid "Streams will be saved only into this directory"
+#~ msgstr "Gli stream saranno salvati sono in questa directory"
+
+#~ msgid "Memcopy method to use in xine for large data chunks."
+#~ msgstr "Metodo memcopy per far usare a xine grossi pezzi di molti dati."

Index: fr.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/fr.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- fr.po	7 Apr 2004 19:35:40 -0000	1.43
+++ fr.po	16 Sep 2004 01:00:32 -0000	1.44
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2002-06-07 15:08 +0200\n"
 "Last-Translator: Daniel Caujolle-Bert <segfault@..."
 "Language-Team: French <fr@..."
@@ -15,142 +15,234 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
[...4378 lines suppressed...]
+#~ msgstr "input_net: impossible de resoudre '%s'.\n"
+
+#, fuzzy
+#~ msgid "input_cdda: unable to connect to '%s'.\n"
+#~ msgstr "input_net: impossible de se connecter à '%s'.\n"
+
 #~ msgid "/dev/dsp# device to use for oss output, -1 => auto_detect"
 #~ msgstr ""
 #~ "périphérique /dev/dsp# a utiliser pour la sortie oss, -1 => détection auto"
@@ -2759,10 +3988,6 @@
 #~ msgid "Opening >%s<\n"
 #~ msgstr "Ouvre >%s<\n"
 
-#, fuzzy
-#~ msgid "input_rip: stat on the file %s failed: %s\n"
-#~ msgstr "input_cda: fopen(%s) à échoué: %s\n"
-
 #~ msgid "Enable A52 / AC5 digital audio output via spdif"
 #~ msgstr "Active la sortie audio numérique A52 / AC5 par spdif"
 

Index: es.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/es.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- es.po	7 Apr 2004 19:35:40 -0000	1.35
+++ es.po	16 Sep 2004 01:00:33 -0000	1.36
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2002-02-20 00:00+0100\n"
 "Last-Translator: Juan Manuel García Molina <juanma_gm@..."
 "Language-Team: Spanish <es@..."
@@ -16,136 +16,229 @@
 "X-Generator: KBabel 0.9.5\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
[...4297 lines suppressed...]
+#~ msgstr "input_net: no se puede resolver '%s'.\n"
+
+#, fuzzy
+#~ msgid "input_cdda: unable to connect to '%s'.\n"
+#~ msgstr "input_net: no se puede conectar a '%s'.\n"
+
 #~ msgid ""
 #~ "demux_mpeg_block: too many errors, stopping playback. Maybe this stream "
 #~ "is scrambled?\n"
@@ -2757,10 +3950,6 @@
 #~ msgid "Opening >%s<\n"
 #~ msgstr "Abriendo >%s<\n"
 
-#, fuzzy
-#~ msgid "input_rip: stat on the file %s failed: %s\n"
-#~ msgstr "input_cda: falló fopen(%s): %s\n"
-
 #~ msgid "video_out: can't create thread (%s)\n"
 #~ msgstr "video_out: no se puede crear un hilo (%s)\n"
 

Index: de.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/de.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- de.po	7 Apr 2004 20:59:21 -0000	1.56
+++ de.po	16 Sep 2004 01:00:33 -0000	1.57
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 1.0.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 08:34+0100\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2004-04-07 23:11+0200\n"
 "Last-Translator: Philipp Hahn <pmhahn@..."
 "Language-Team: German <de@..."
@@ -15,45 +15,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
[...4920 lines suppressed...]
@@ -3257,9 +4719,6 @@
 #~ msgid "Dxr3: saturation control"
 #~ msgstr "DXR3: Sättigungseinstellung"
 
-#~ msgid "Dxr3: brightness control"
-#~ msgstr "DXR3: Helligkeitseinstellung"
-
 #~ msgid "OUCH - ran out of buffers\n"
 #~ msgstr "OUCH - Es steht kein Speicher mehr zur Verfügung\n"
 
@@ -4395,9 +5854,6 @@
 #~ msgid "path to your local dvd device file"
 #~ msgstr "Pfad zum lokalen DVD-Laufwerk"
 
-#~ msgid "path to a raw device set up for dvd access"
-#~ msgstr "Pfad zum RAW-Device des DVD-Laufwerks"
-
 #~ msgid "channels"
 #~ msgstr "Kanäle"
 

Index: cs.po
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/cs.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cs.po	25 Aug 2004 19:26:47 -0000	1.46
+++ cs.po	16 Sep 2004 01:00:34 -0000	1.47
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-29 12:53+0200\n"
+"POT-Creation-Date: 2004-09-15 19:10-0400\n"
 "PO-Revision-Date: 2004-08-25 17:54+0200\n"
 "Last-Translator: Frantisek Dvorak <valtri@..."
 "Language-Team: Czech <cs@..."
@@ -16,1303 +16,1650 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
[...7428 lines suppressed...]
+msgstr "Kódování titulků"
 
 #~ msgid "device used for 5+ channel output"
 #~ msgstr "zařízení použité pro 5+ kanálový výstup"
@@ -4470,15 +4518,6 @@
 #~ msgid "Subtitle size (relative window size)"
 #~ msgstr "Velikost titulků (vzhledem k velikosti okna)"
 
-#~ msgid "Subtitle vertical offset (relative window size)"
-#~ msgstr "Vertikální posun titulků (vzhledem k velikosti okna)"
-
-#~ msgid "Font for external subtitles"
-#~ msgstr "Font titulků"
-
-#~ msgid "Encoding of subtitles"
-#~ msgstr "Kódování titulků"
-
 #~ msgid ""
 #~ "xvid: there is mismatch between API used by currently installed XviD\n"
 #~ "xvid: library (%d.%d) and library used to compile this plugin (%d.%d).\n"

Index: POTFILES.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/po/POTFILES.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- POTFILES.in	17 Mar 2004 08:38:41 -0000	1.10
+++ POTFILES.in	16 Sep 2004 01:00:35 -0000	1.11
@@ -7,19 +7,20 @@
 src/audio_out/audio_irixal_out.c
 src/audio_out/audio_oss_out.c
 src/audio_out/audio_sun_out.c
+src/audio_out/audio_directx_out.c
 src/audio_out/audio_none_out.c
 src/audio_out/audio_file_out.c
-src/audio_out/audio_directx_out.c
+src/audio_out/audio_coreaudio_out.c
 src/demuxers/demux_asf.c
 src/demuxers/demux_avi.c
 src/demuxers/demux_film.c
-src/demuxers/demux_iff.c
 src/demuxers/demux_mpeg_block.c
-src/demuxers/demux_mpeg_pes.c
 src/demuxers/demux_ogg.c
 src/demuxers/demux_snd.c
 src/demuxers/demux_voc.c
 src/demuxers/demux_wc3movie.c
+src/demuxers/demux_mpeg_pes.c
+src/demuxers/demux_iff.c
 src/dxr3/dxr3.h
 src/dxr3/dxr3_decode_spu.c
 src/dxr3/dxr3_decode_video.c
@@ -30,70 +31,71 @@
 src/input/input_dvb.c
 src/input/input_dvd.c
 src/input/input_file.c
-src/input/vcd/vcdio.c
-src/input/vcd/vcdplayer.c
-src/input/vcd/vcdplayer.h
-src/input/vcd/xineplug_inp_vcd.c
+src/input/input_gnome_vfs.c
 src/input/input_http.c
 src/input/input_mms.c
 src/input/input_net.c
 src/input/input_pnm.c
+src/input/input_pvr.c
 src/input/input_rtp.c
 src/input/input_rtsp.c
 src/input/input_stdin_fifo.c
+src/input/input_v4l.c
 src/input/input_vcd.c
-src/input/mms.c
 src/input/media_helper.c
+src/input/mms.c
+src/input/mmsh.c
 src/input/net_buf_ctrl.c
 src/input/pnm.c
 src/input/librtsp/rtsp.c
 src/input/librtsp/rtsp_session.c
-src/input/mmsh.c
-src/input/input_v4l.c
-src/input/input_pvr.c
-src/input/input_gnome_vfs.c
+src/input/vcd/vcdio.c
+src/input/vcd/vcdplayer.c
+src/input/vcd/vcdplayer.h
+src/input/vcd/xineplug_inp_vcd.c
 src/liba52/xine_decoder.c
-src/libdivx4/xine_decoder.c
+src/libdts/xine_decoder.c
 src/libfaad/xine_decoder.c
 src/libffmpeg/xine_encoder.c
 src/libffmpeg/audio_decoder.c
 src/libffmpeg/video_decoder.c
+src/libffmpeg/dvaudio_decoder.c
 src/libreal/audio_decoder.c
 src/libreal/xine_decoder.c
 src/libspucc/xine_decoder.c
 src/libsputext/demux_sputext.c
 src/libsputext/xine_decoder.c
-src/libw32dll/qt_decoder.c
-src/libw32dll/w32codec.c
 src/libxinevdec/bitplane.c
-src/libxvid/xine_decoder.c
 src/post/goom/xine_goom.c
-src/post/planar/pp.c
+src/post/mosaico/mosaico.c
+src/post/mosaico/switch.c
 src/post/planar/expand.c
 src/post/planar/boxblur.c
 src/post/planar/denoise3d.c
 src/post/planar/eq.c
 src/post/planar/eq2.c
 src/post/planar/unsharp.c
-src/post/mosaico/mosaico.c
-src/post/mosaico/switch.c
+src/post/planar/pp.c
 src/post/deinterlace/xine_plugin.c
+src/post/audio/upmix.c
+src/post/audio/stretch.c
 src/video_out/video_out_aa.c
+src/video_out/video_out_caca.c
 src/video_out/video_out_directfb.c
+src/video_out/video_out_directx.c
 src/video_out/video_out_fb.c
 src/video_out/video_out_none.c
 src/video_out/video_out_opengl.c
+src/video_out/video_out_pgx32.c
 src/video_out/video_out_pgx64.c
 src/video_out/video_out_sdl.c
+src/video_out/video_out_stk.c
 src/video_out/video_out_syncfb.c
 src/video_out/video_out_vidix.c
 src/video_out/video_out_xshm.c
 src/video_out/video_out_xv.c
 src/video_out/video_out_xvmc.c
-src/video_out/video_out_stk.c
-src/video_out/video_out_caca.c
 src/video_out/x11osd.c
-src/video_out/video_out_directx.c
 src/xine-engine/audio_decoder.c
 src/xine-engine/audio_out.c
 src/xine-engine/configfile.c
@@ -103,5 +105,10 @@
 src/xine-engine/video_out.c
 src/xine-engine/vo_scale.c
 src/xine-engine/xine.c
+src/xine-engine/io_helper.c
 src/xine-engine/input_rip.c
 src/xine-utils/memcpy.c
+src/xine-utils/utils.c
+src/libw32dll/qt_decoder.c
+src/libw32dll/w32codec.c
+src/libspucmml/xine_decoder.c

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30327

Modified Files:
	configure.ac 
Log Message:
Update the interface numbering
Adding update po files


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- configure.ac	9 Sep 2004 06:35:44 -0000	1.279
+++ configure.ac	16 Sep 2004 01:00:35 -0000	1.280
@@ -34,14 +34,14 @@
 dnl }
 
 LT_CURRENT=9
-LT_REVISION=1
-LT_AGE=8
+LT_REVISION=2
+LT_AGE=9
 
 dnl for a release tarball do "rm .cvsversion" before "make dist"
 if test -f .cvsversion; then
   XINE_PRE="cvs"
 else
-  XINE_PRE="rc5"
+  XINE_PRE="rc6"
 fi
 
 AC_SUBST(XINE_MAJOR)