Merge from 1.2 main.

1 files changed, 33 insertions, 33 deletions

diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index 2a75d7f9b..1d2e0bb43 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2004 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -33,7 +33,7 @@
 #endif
 
 #define INPUT_PLUGIN_IFACE_VERSION   18
- 
+
 typedef struct input_class_s input_class_t ;
 typedef struct input_plugin_s input_plugin_t;
 
@@ -61,7 +61,7 @@ struct input_class_s {
    * @brief Optional non-standard catalog to use with dgettext() for description.
    */
   const char *text_domain;
-  
+
   /*
    * ls function, optional: may be NULL
    * return value: NULL => filename is a file, **char=> filename is a dir
@@ -101,7 +101,7 @@ struct input_plugin_s {
    * return capabilities of the current playable entity. See
    * get_current_pos below for a description of a "playable entity"
    * Capabilities a created by "OR"ing a mask of constants listed
-   * below which start "INPUT_CAP".  
+   * below which start "INPUT_CAP".
    *
    * depending on the values set, some of the functions below
    * will or will not get called or should (not) be able to
@@ -132,7 +132,7 @@ struct input_plugin_s {
 
 
   /*
-   * seek position, return new position 
+   * seek position, return new position
    *
    * if seeking failed, -1 is returned
    */
@@ -140,7 +140,7 @@ struct input_plugin_s {
 
 
   /*
-   * seek to time position, return new position 
+   * seek to time position, return new position
    * time_offset is given in miliseconds
    *
    * if seeking failed, -1 is returned
@@ -157,7 +157,7 @@ struct input_plugin_s {
    */
   off_t (*get_current_pos) (input_plugin_t *this);
 
-  
+
   /*
    * get current time position in stream in miliseconds.
    *
@@ -169,7 +169,7 @@ struct input_plugin_s {
   /*
    * return number of bytes in the next playable entity or -1 if the
    * input is unlimited, as would be the case in a network stream.
-   * 
+   *
    * A "playable entity" tends to be the entities listed in a playback
    * list or the units on which playback control generally works on.
    * It might be the number of bytes in a VCD "segment" or "track" (if
@@ -190,7 +190,7 @@ struct input_plugin_s {
    * return block size in bytes of next complete playable entity (if
    * supported, 0 otherwise). See the description above under
    * get_length for a description of a "complete playable entity".
-   * 
+   *
    * this block size is only used for mpeg streams stored on
    * a block oriented storage media, e.g. DVDs and VCDs, to speed
    * up the demuxing process. only set this (and the INPUT_CAP_BLOCK
@@ -245,11 +245,11 @@ struct input_plugin_s {
 #define INPUT_CAP_NOCAP                0x00000000
 
 /*
- * INPUT_CAP_SEEKABLE: 
- *   seek () works reliably. 
+ * INPUT_CAP_SEEKABLE:
+ *   seek () works reliably.
  *   even for plugins that do not have this flag set
- *   it is a good idea to implement the seek() function 
- *   in a "best effort" style anyway, so at least 
+ *   it is a good idea to implement the seek() function
+ *   in a "best effort" style anyway, so at least
  *   throw away data for network streams when seeking forward
  */
 
@@ -257,9 +257,9 @@ struct input_plugin_s {
 
 /*
  * INPUT_CAP_BLOCK:
- *   means more or less that a block device sits behind 
- *   this input plugin. get_blocksize must be implemented. 
- *   will be used for fast and efficient demuxing of 
+ *   means more or less that a block device sits behind
+ *   this input plugin. get_blocksize must be implemented.
+ *   will be used for fast and efficient demuxing of
  *   mpeg streams (demux_mpeg_block).
  */
 
@@ -268,8 +268,8 @@ struct input_plugin_s {
 /*
  * INPUT_CAP_AUDIOLANG:
  * INPUT_CAP_SPULANG:
- *   input plugin knows something about audio/spu languages, 
- *   e.g. knows that audio stream #0 is english, 
+ *   input plugin knows something about audio/spu languages,
+ *   e.g. knows that audio stream #0 is english,
  *   audio stream #1 is german, ...
  *   *((int *)data) will provide the requested channel number
  *   and awaits the language back in (char *)data
@@ -277,20 +277,20 @@ struct input_plugin_s {
 
 #define INPUT_CAP_AUDIOLANG            0x00000008
 #define INPUT_CAP_SPULANG              0x00000010
- 
-/* 
+
+/*
  * INPUT_CAP_PREVIEW:
- *   get_optional_data can handle INPUT_OPTIONAL_DATA_PREVIEW 
- *   so a non-seekable stream plugin can povide the first 
- *   few bytes for demuxers to look at them and decide wheter 
- *   they can handle the stream or not. the preview data must 
- *   be buffered and delivered again through subsequent 
+ *   get_optional_data can handle INPUT_OPTIONAL_DATA_PREVIEW
+ *   so a non-seekable stream plugin can povide the first
+ *   few bytes for demuxers to look at them and decide wheter
+ *   they can handle the stream or not. the preview data must
+ *   be buffered and delivered again through subsequent
  *   read() calls.
- *   caller must provide a buffer allocated with at least 
+ *   caller must provide a buffer allocated with at least
  *   MAX_PREVIEW_SIZE bytes.
  */
 
-#define INPUT_CAP_PREVIEW              0x00000040  
+#define INPUT_CAP_PREVIEW              0x00000040
 
 /*
  * INPUT_CAP_CHAPTERS:
@@ -373,13 +373,13 @@ struct input_plugin_s {
 #define MRL_DUPLICATE(s, d) {						\
     _x_assert((s) != NULL);						\
     _x_assert((d) != NULL);						\
-    									\
+									\
     free((d)->origin);							\
     (d)->origin = (s)->origin ? strdup((s)->origin) : NULL;		\
-    									\
+									\
     free((d)->mrl);							\
     (d)->mrl = (s)->mrl ? strdup((s)->mrl) : NULL;			\
-    									\
+									\
     free((d)->link);							\
     (d)->link = (s)->link ? strdup((s)->link) : NULL;			\
 									\