separate the two semantics of querying a port's status with a NULL stream;

before, NULL could mean two things: no stream at all or a stream that does not
want to be addressed; now the latter is represented by the new XINE_ANON_STREAM
resulting changes:
* the status() functions now behave differently for NULL and XINE_ANON_STREAM
  (as the commentary always implied, but this was not the case, so post
  plugin rewiring went wrong, because it relies on the status() function)
* the NULL_STREAM defines in audio_out and video_out are obsolete
* update the function comments in the headers
* update the post plugin rewire functions to use the status() functions to
  check, if the old port was opened and handle the new one accordingly;
  this makes open_count obsolete
* change all post plugins accordingly (mostly using XINE_ANON_STREAM instead
  of NULL)
additional change:
* the status() function of audio port now returns the bits/rate/mode values
  of the input and not the output; this is more likely to be what a post plugin
  wants
* the reimplementation of status() in the upmix plugin is obsolete

CVS patchset: 6603
CVS date: 2004/05/29 14:45:25

1 files changed, 5 insertions, 10 deletions

diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h
index e5cc9acf2..d30539c60 100644
--- a/src/xine-engine/post.h
+++ b/src/xine-engine/post.h
@@ -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: post.h,v 1.20 2004/05/18 03:16:12 miguelfreitas Exp $
+ * $Id: post.h,v 1.21 2004/05/29 14:45:25 mroi Exp $
  *
  * post plugin definitions
  *
@@ -42,8 +42,6 @@
 
 #define POST_PLUGIN_IFACE_VERSION 9
 
-#define POST_NULL_STREAM    (xine_stream_t *)-1
-
 
 typedef struct post_class_s post_class_t;
 typedef struct post_plugin_s post_plugin_t;
@@ -199,8 +197,8 @@ struct post_video_port_s {
   int                       usage_count;
   pthread_mutex_t           usage_lock;
   
-  /* the stream we are being fed by; NULL means no stream is connected,
-   * POST_NULL_STREAM means a NULL stream is connected */
+  /* the stream we are being fed by; NULL means no stream is connected;
+   * this may be an anonymous stream */
   xine_stream_t            *stream;
   
   /* point to a mutex here, if you need some synchronization */
@@ -297,8 +295,8 @@ struct post_audio_port_s {
   int                usage_count;
   pthread_mutex_t    usage_lock;
   
-  /* the stream we are being fed by; NULL means no stream is connected,
-   * POST_NULL_STREAM means a NULL stream is connected */
+  /* the stream we are being fed by; NULL means no stream is connected;
+   * this may be an anonymous stream */
   xine_stream_t     *stream;
   
   /* some values remembered by port->open() */
@@ -306,9 +304,6 @@ struct post_audio_port_s {
   uint32_t           rate;
   uint32_t           mode;
   
-  /* ++ for every open, -- for every close */
-  int                open_count;
-  
   /* point to a mutex here, if you need some synchronization */
   pthread_mutex_t   *port_lock;