Skip to content

V
vlc-2-2
Commit 7e6e2154 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* access2, demux2: not needed anymore.

parent 5ff3113f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 613 deletions
modules/access/access2.c deleted 100644 → 0
View file @ 5ff3113f
This diff is collapsed.
modules/demux/demux2.c deleted 100644 → 0
View file @ 5ff3113f
/*****************************************************************************
* demux2 adaptation layer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
* (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.
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/input.h>
#include "vlc_playlist.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Demux2Open ( vlc_object_t * );
static void Demux2Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("Demux2 adaptation layer" ) );
set_capability( "demux", 10 );
set_callbacks( Demux2Open, Demux2Close );
add_shortcut( "demux2" );
/* Hack */
add_shortcut( "nsv" );
add_shortcut( "live" );
add_shortcut( "ts" );
add_shortcut( "ps2" );
add_shortcut( "dvdnav" );
add_shortcut( "dvdnavsimple" );
add_shortcut( "ffmpeg" );
add_shortcut( "mp3" );
add_shortcut( "mpga" );
add_shortcut( "aac" );
add_shortcut( "a52" );
add_shortcut( "dts" );
add_shortcut( "mod" );
add_shortcut( "flac" );
add_shortcut( "m3u" );
add_shortcut( "playlist" );
add_shortcut( "m4v" );
add_shortcut( "mp4v" );
add_shortcut( "mpgv" );
add_shortcut( "rawdv" );
add_shortcut( "ogg" );
add_shortcut( "h264" );
add_shortcut( "avi" );
add_shortcut( "mjpeg" );
add_shortcut( "directory" );
add_shortcut( "wav" );
add_shortcut( "v4l" );
add_shortcut( "dshow" );
vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Demux2Demux ( input_thread_t * );
static int Demux2Control( input_thread_t *, int, va_list );
typedef struct
{
demux_t *p_demux;
} demux2_sys_t;
/*****************************************************************************
* Demux2Open: initializes structures
*****************************************************************************/
static int Demux2Open( vlc_object_t * p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
demux2_sys_t *p_sys = malloc( sizeof( demux2_sys_t ) );
demux_t *p_demux;
playlist_t *p_playlist;
if( input_InitStream( p_input, 0 ) )
{
return VLC_EGENERIC;
}
p_demux = demux2_New( p_input,
p_input->psz_access, p_input->psz_demux,
p_input->psz_name,
p_input->s, p_input->p_es_out );
if( !p_demux )
{
/* We should handle special access+demuxer but later */
free( p_sys );
return VLC_EGENERIC;
}
/* Now retreive meta info from demuxer */
if( ( p_playlist = vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ) ) )
{
int64_t i_length;
if( !demux2_Control( p_demux, DEMUX_GET_LENGTH, &i_length ) )
{
playlist_SetDuration( p_playlist, -1, i_length );
}
vlc_object_release( p_playlist );
}
p_input->pf_demux = Demux2Demux;
p_input->pf_demux_control = Demux2Control;
p_input->p_demux_data = (demux_sys_t*)p_sys;
p_sys->p_demux = p_demux;
return VLC_SUCCESS;
}
/*****************************************************************************
* Demux2Demux: reads and demuxes data packets
*****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/
static int Demux2Demux( input_thread_t * p_input )
{
demux2_sys_t *p_sys = (demux2_sys_t*)p_input->p_demux_data;
p_sys->p_demux->b_die = p_input->b_die;
return demux2_Demux( p_sys->p_demux );
}
/*****************************************************************************
* Demux2Control:
*****************************************************************************/
static int Demux2Control( input_thread_t *p_input, int i_query, va_list args )
{
demux2_sys_t *p_sys = (demux2_sys_t*)p_input->p_demux_data;
return demux2_vaControl( p_sys->p_demux, i_query, args );
}
/*****************************************************************************
* Demux2Close: frees unused data
*****************************************************************************/
static void Demux2Close( vlc_object_t * p_this )
{
input_thread_t *p_input = (input_thread_t*)p_this;
demux2_sys_t *p_sys = (demux2_sys_t*)p_input->p_demux_data;
demux2_Delete( p_sys->p_demux );
free( p_sys );
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment