* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include "input_internal.h"
*****************************************************************************/
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, vlc_bool_t b_quick )
+ access_t *p_source )
{
access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
if( p_access == NULL )
- {
- msg_Err( p_obj, "vlc_object_create() failed" );
return NULL;
- }
/* Parse URL */
p_access->p_source = p_source;
{
msg_Dbg( p_obj, "creating access filter '%s'", psz_access );
p_access->psz_access = strdup( p_source->psz_access );
- p_access->psz_path = strdup( p_source->psz_path );
- p_access->psz_demux = strdup( p_source->psz_demux );
}
else
{
+ msg_Dbg( p_obj, "creating access '%s' path='%s'",
+ psz_access, psz_path );
p_access->psz_path = strdup( psz_path );
- if( b_quick )
- {
- if( strstr( psz_path, "file://" ) )
- p_access->psz_access = strdup( "" );
- else
- p_access->psz_access = strdup( "file" );
- }
- else
- p_access->psz_access = strdup( psz_access );
-
- p_access->psz_demux = strdup( psz_demux );
-
- if( !b_quick )
- msg_Dbg( p_obj, "creating access '%s' path='%s'",
- psz_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;
/* Before module_Need (for var_Create...) */
vlc_object_attach( p_access, p_obj );
- if( p_source )
- {
- p_access->p_module =
- module_Need( p_access, "access_filter", psz_access, VLC_TRUE );
- }
- else
- {
- p_access->p_module =
- module_Need( p_access, "access2", p_access->psz_access, b_quick );
- }
+ p_access->p_module =
+ module_Need( p_access, p_source ? "access_filter" : "access2",
+ psz_access, VLC_TRUE );
if( p_access->p_module == NULL )
{
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;
}
* access2_New:
*****************************************************************************/
access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
- const char *psz_demux, const char *psz_path, vlc_bool_t b_quick )
+ const char *psz_demux, const char *psz_path )
{
return access2_InternalNew( p_obj, psz_access, psz_demux,
- psz_path, NULL, b_quick );
+ psz_path, NULL );
}
/*****************************************************************************
access_t *access2_FilterNew( access_t *p_source, const char *psz_access_filter )
{
return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
- NULL, NULL, p_source, VLC_FALSE );
+ p_source->psz_demux, p_source->psz_path,
+ p_source );
}
/*****************************************************************************
access2_Delete( p_access->p_source );
}
- vlc_object_destroy( p_access );
+ vlc_object_release( p_access );
}