/*****************************************************************************
* access.c
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
- * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $
+ * Copyright (C) 1999-2004 the VideoLAN team
+ * $Id$
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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.
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-
-#include "ninput.h"
-
-int access_vaControl( input_thread_t *p_input, int i_query, va_list args )
-{
- if( p_input->pf_access_control )
- {
- return p_input->pf_access_control( p_input, i_query, args );
- }
- return VLC_EGENERIC;
-}
-
-int access_Control( input_thread_t *p_input, int i_query, ... )
-{
- va_list args;
- int i_result;
-
- va_start( args, i_query );
- i_result = access_vaControl( p_input, i_query, args );
- va_end( args );
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
- return i_result;
-}
+#include <vlc/vlc.h>
-int access_vaControlDefault( input_thread_t *p_input, int i_query, va_list args )
-{
- return VLC_EGENERIC;
-}
+#include "input_internal.h"
/*****************************************************************************
- * access2_New:
+ * access2_InternalNew:
*****************************************************************************/
-access_t *__access2_New( vlc_object_t *p_obj, char *psz_mrl )
+static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_access,
+ const char *psz_demux, const char *psz_path,
+ access_t *p_source )
{
access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
- char *psz_dup = strdup( psz_mrl ? psz_mrl : "" );
- char *psz = strchr( psz_dup, ':' );
-
if( p_access == NULL )
- {
- msg_Err( p_obj, "vlc_object_create( p_obj, VLC_OBJECT_ACCESS ) had failed" );
- free( psz_dup );
return NULL;
- }
/* Parse URL */
- p_access->psz_access = NULL;
- p_access->psz_path = NULL;
-
- if( psz )
+ p_access->p_source = p_source;
+ if( p_source )
{
- *psz++ = '\0';
-
- if( psz[0] == '/' && psz[1] == '/' )
- {
- psz += 2;
- }
- p_access->psz_path = strdup( psz );
-
- psz = strchr( psz_dup, '/' );
- if( psz )
- {
- *psz++ = '\0';
- }
- p_access->psz_access = strdup( psz_dup );
+ msg_Dbg( p_obj, "creating access filter '%s'", psz_access );
+ p_access->psz_access = strdup( p_source->psz_access );
}
else
{
- p_access->psz_path = strdup( psz_mrl );
- }
- free( psz_dup );
-
-
- p_access->psz_demux = strdup( "" );
- if( p_access->psz_access == NULL )
- {
- p_access->psz_access = strdup( "" );
- }
- if( p_access->psz_path == NULL )
- {
- p_access->psz_path = strdup( "" );
+ msg_Dbg( p_obj, "creating access '%s' path='%s'",
+ psz_access, psz_path );
+ p_access->psz_path = strdup( psz_path );
}
- msg_Dbg( p_obj, "access2_New: '%s' -> access='%s' path='%s'",
- psz_mrl,
- p_access->psz_access, p_access->psz_path );
+ p_access->psz_access = strdup( psz_access );
+ p_access->psz_demux = strdup( psz_demux );
p_access->pf_read = NULL;
p_access->pf_block = NULL;
p_access->info.i_update = 0;
p_access->info.i_size = 0;
p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
+ p_access->info.b_prebuffered = false;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
vlc_object_attach( p_access, p_obj );
p_access->p_module =
- module_Need( p_access, "access2", p_access->psz_access, VLC_FALSE );
+ module_Need( p_access, p_source ? "access_filter" : "access2",
+ psz_access, true );
if( p_access->p_module == NULL )
{
+ msg_StackAdd( "could not create access" );
vlc_object_detach( p_access );
free( p_access->psz_access );
free( p_access->psz_path );
free( p_access->psz_demux );
- vlc_object_destroy( p_access );
+ vlc_object_release( p_access );
return NULL;
}
}
/*****************************************************************************
- * demux2_Delete:
+ * access2_New:
+ *****************************************************************************/
+access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
+ const char *psz_demux, const char *psz_path )
+{
+ return access2_InternalNew( p_obj, psz_access, psz_demux,
+ psz_path, NULL );
+}
+
+/*****************************************************************************
+ * access2_FilterNew:
+ *****************************************************************************/
+access_t *access2_FilterNew( access_t *p_source, const char *psz_access_filter )
+{
+ return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
+ p_source->psz_demux, p_source->psz_path,
+ p_source );
+}
+
+/*****************************************************************************
+ * access2_Delete:
*****************************************************************************/
void access2_Delete( access_t *p_access )
{
free( p_access->psz_path );
free( p_access->psz_demux );
- vlc_object_destroy( p_access );
+ if( p_access->p_source )
+ {
+ access2_Delete( p_access->p_source );
+ }
+
+ vlc_object_release( p_access );
}
+
projects / vlc / blobdiff