Commit e4f5a0fe authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Dummy: remove dummy (indeed) access, convert demux to access_demux

parent e157f6ea
...@@ -67,14 +67,9 @@ vlc_module_begin () ...@@ -67,14 +67,9 @@ vlc_module_begin ()
add_category_hint( N_("Interface"), NULL, false ) add_category_hint( N_("Interface"), NULL, false )
add_bool( "dummy-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) add_bool( "dummy-quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, false )
#endif #endif
add_submodule ()
set_description( N_("Dummy access function") )
set_capability( "access", 0 )
set_callbacks( OpenAccess, NULL )
add_shortcut( "vlc" )
add_submodule () add_submodule ()
set_description( N_("Dummy demux function") ) set_description( N_("Dummy demux function") )
set_capability( "demux", 0 ) set_capability( "access_demux", 0 )
set_callbacks( OpenDemux, CloseDemux ) set_callbacks( OpenDemux, CloseDemux )
add_shortcut( "vlc" ) add_shortcut( "vlc" )
add_submodule () add_submodule ()
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
*****************************************************************************/ *****************************************************************************/
int OpenIntf ( vlc_object_t * ); int OpenIntf ( vlc_object_t * );
int OpenAccess ( vlc_object_t * );
int OpenDemux ( vlc_object_t * ); int OpenDemux ( vlc_object_t * );
void CloseDemux ( vlc_object_t * ); void CloseDemux ( vlc_object_t * );
......
...@@ -31,86 +31,11 @@ ...@@ -31,86 +31,11 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include <vlc_access.h>
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_charset.h> #include <vlc_charset.h>
#include "dummy.h" #include "dummy.h"
/*****************************************************************************
* Access functions.
*****************************************************************************/
static ssize_t AccessRead( access_t *p_access, uint8_t *p, size_t i_size )
{
VLC_UNUSED(p_access);
memset( p, 0, i_size );
return i_size;
}
static int AccessControl( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool;
int64_t *pi_64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = DEFAULT_PTS_DELAY * 1000;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_GET_META:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
default:
msg_Err( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
int OpenAccess( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
/* Init p_access */
p_access->pf_read = AccessRead;
p_access->pf_block = NULL;
p_access->pf_seek = NULL;
p_access->pf_control = AccessControl;
p_access->info.i_update = 0;
p_access->info.i_size = 0;
p_access->info.i_pos = 0;
p_access->info.b_eof = false;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = NULL;
/* Force dummy demux plug-in */
free( p_access->psz_demux );
p_access->psz_demux = strdup( "vlc" );
return VLC_SUCCESS;
}
/*****************************************************************************
* Demux
*****************************************************************************/
static int DemuxControl( demux_t *, int, va_list ); static int DemuxControl( demux_t *, int, va_list );
static int DemuxNoOp( demux_t *demux ) static int DemuxNoOp( demux_t *demux )
...@@ -191,7 +116,6 @@ void CloseDemux ( vlc_object_t *p_this ) ...@@ -191,7 +116,6 @@ void CloseDemux ( vlc_object_t *p_this )
static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{ {
return demux_vaControlHelper( p_demux->s, (void)p_demux; (void)i_query; (void)args;
0, 0, 0, 1, return VLC_EGENERIC;
i_query, args );
} }
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