threads: Make sure we don't re-create a thread if the object has already one.

[vlc] / modules / demux / au.c

diff --git a/modules/demux/au.c b/modules/demux/au.c
index cebd0bc285f2539a861d19b8ed9adc7fe370ad86..58da050f6175464eaebb058ac23be30221b76a0f 100644 (file)
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * au.c : au file input module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: au.c,v 1.13 2004/01/29 15:11:17 fenrir Exp $
+ * Copyright (C) 2001-2007 the VideoLAN team
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -18,16 +18,20 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
 
 /* TODO:
  *  - all adpcm things (I _NEED_ samples)
@@ -41,8 +45,10 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("AU demuxer") );
-    set_capability( "demux2", 10 );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_DEMUX );
+    set_description( N_("AU demuxer") );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "au" );
 vlc_module_end();
@@ -87,7 +93,7 @@ struct demux_sys_t
     int             i_header_size;
 };
 
-static int DemuxPCM( demux_t * );
+static int Demux( demux_t * );
 static int Control ( demux_t *, int i_query, va_list args );
 
 /*****************************************************************************
@@ -99,18 +105,14 @@ static int Open( vlc_object_t *p_this )
     demux_sys_t *p_sys;
 
     uint8_t      hdr[20];
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
     int          i_cat;
     int          i_samples, i_modulo;
 
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        msg_Warn( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
-    if( strncmp( p_peek, ".snd", 4 ) )
+    CHECK_PEEK( p_peek, 4 );
+
+    if( memcmp( p_peek, ".snd", 4 ) )
     {
-        msg_Warn( p_demux, "AU module discarded" );
         return VLC_EGENERIC;
     }
 
@@ -130,8 +132,8 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    p_sys = p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
-    p_sys->i_time = 0;
+    DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
+    p_sys->i_time = 1;
     p_sys->i_header_size = GetDWBE( &hdr[0] );
 
     /* skip extra header data */
@@ -278,19 +280,15 @@ static int Open( vlc_object_t *p_this )
                             (mtime_t)i_samples /
                             (mtime_t)p_sys->fmt.audio.i_rate;
 
-    /* finish to set up p_demux */
-    p_demux->pf_demux   = DemuxPCM;
-    p_demux->pf_control = Control;
-
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
- * DemuxPCM: read packet and send them to decoders
+ * Demux: read packet and send them to decoders
  *****************************************************************************
  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
  *****************************************************************************/
-static int DemuxPCM( demux_t *p_demux )
+static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     block_t     *p_block;
@@ -331,75 +329,9 @@ static void Close( vlc_object_t * p_this )
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    double f, *pf;
-    int64_t *pi64;
-
-    switch( i_query )
-    {
-        case DEMUX_GET_POSITION:
-        {
-            int64_t i_tell = stream_Tell( p_demux->s );
-            int64_t i_end  = stream_Size( p_demux->s );
-
-            pf = (double*) va_arg( args, double* );
-
-            if( p_sys->i_header_size < i_end )
-            {
-                *pf = (double)( i_tell - p_sys->i_header_size ) /
-                      (double)(i_end - p_sys->i_header_size);
-                return VLC_SUCCESS;
-            }
-            return VLC_EGENERIC;
-        }
-        case DEMUX_SET_POSITION:
-        {
-            int64_t i_end  = stream_Size( p_demux->s );
-
-            f = (double) va_arg( args, double );
-
-            if( p_sys->i_header_size < i_end )
-            {
-                int64_t i_frame = (f * ( i_end - p_sys->i_header_size )) /
-                                  p_sys->fmt.audio.i_blockalign;
-
-                if( stream_Seek( p_demux->s, p_sys->i_header_size +
-                                             i_frame * p_sys->fmt.audio.i_blockalign ) )
-                {
-                    return VLC_EGENERIC;
-                }
-                p_sys->i_time = 1 + ( i_frame * p_sys->fmt.audio.i_blockalign / p_sys->i_frame_size ) * p_sys->i_frame_length;
-                return VLC_SUCCESS;
-            }
-            return VLC_EGENERIC;
-        }
 
-        case DEMUX_GET_TIME:
-            pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = p_sys->i_time;
-            return VLC_SUCCESS;
-
-        case DEMUX_GET_LENGTH:
-        {
-            int64_t i_size  = stream_Size( p_demux->s ) - p_sys->i_header_size;
-            if( i_size > 0 )
-            {
-                pi64 = (int64_t*)va_arg( args, int64_t * );
-                *pi64 = i_size / p_sys->i_frame_size * p_sys->i_frame_length;
-                return VLC_SUCCESS;
-            }
-            return VLC_EGENERIC;
-        }
-        case DEMUX_SET_TIME:
-        case DEMUX_GET_FPS:
-        default:
-            return VLC_EGENERIC;
-    }
+    return demux_vaControlHelper( p_demux->s, p_sys->i_header_size, -1,
+                                   p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign,
+                                   i_query, args );
 }
 
-
-
-
-
-
-
-