macosx: add missing retains when exchanging views

[vlc] / include / vlc_sout.h

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index b0d2841198ab03a7aa2781d9779ea9d7bccb887b..87d8229baee6c6e09e9fe11e1ee4c4761d749af4 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * stream_output.h : stream output module
+ * vlc_sout.h : stream output module
  *****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -10,19 +10,19 @@
  *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
  *          Rémi Denis-Courmont
  *
- * This program 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLC_SOUT_H_
@@ -37,26 +37,22 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
 #include <vlc_es.h>
 
-/** Stream output instance */
+/** Stream output instance (FIXME: should be private to src/ to avoid
+ * invalid unsynchronized access) */
 struct sout_instance_t
 {
     VLC_COMMON_MEMBERS
 
     char *psz_sout;
 
-    /* meta data (Read only) XXX it won't be set before the first packet received */
-    vlc_meta_t          *p_meta;
-
     /** count of output that can't control the space */
     int                 i_out_pace_nocontrol;
 
     vlc_mutex_t         lock;
     sout_stream_t       *p_stream;
-
-    /** Private */
-    sout_instance_sys_t *p_sys;
 };
 
 /****************************************************************************
@@ -72,10 +68,6 @@ struct sout_access_out_t
     module_t                *p_module;
     char                    *psz_access;
 
-    int                      i_writes;
-    /** Local counter reset each time it is transferred to stats */
-    int64_t                  i_sent_bytes;
-
     char                    *psz_path;
     sout_access_out_sys_t   *p_sys;
     int                     (*pf_seek)( sout_access_out_t *, off_t );
@@ -153,8 +145,6 @@ enum sout_mux_query_e
 
 struct sout_input_t
 {
-    sout_instance_t *p_sout;
-
     es_format_t     *p_fmt;
     block_fifo_t    *p_fifo;
 
@@ -194,17 +184,14 @@ struct sout_stream_t
     config_chain_t        *p_cfg;
     sout_stream_t     *p_next;
 
-    /* Subpicture unit */
-    spu_t             *p_spu;
-
     /* add, remove a stream */
     sout_stream_id_t *(*pf_add)( sout_stream_t *, es_format_t * );
     int               (*pf_del)( sout_stream_t *, sout_stream_id_t * );
     /* manage a packet */
     int               (*pf_send)( sout_stream_t *, sout_stream_id_t *, block_t* );
 
-    /* private */
     sout_stream_sys_t *p_sys;
+    bool pace_nocontrol;
 };
 
 VLC_API void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last );