Skip to content

V
vlc
Commit 26b2eff7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

access: simplify control default case, remove dummy warnings

parent 64cbdb74
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 304 deletions
modules/access/avio.c
View file @ 26b2eff7
......@@ -447,15 +447,6 @@ static int Control(access_t *access, int query, va_list args)
return VLC_EGENERIC;
return VLC_SUCCESS;
}
case ACCESS_GET_TITLE_INFO:
case ACCESS_GET_META:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_SIGNAL:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_SET_PRIVATE_ID_CA:
case ACCESS_GET_PRIVATE_ID_STATE:
default:
return VLC_EGENERIC;
}
......
modules/access/cdda.c
View file @ 26b2eff7
......@@ -345,16 +345,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_SET_PAUSE_STATE:
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_GET_META:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
......
modules/access/directory.c
View file @ 26b2eff7
......@@ -469,7 +469,6 @@ int DirControl( access_t *p_access, int i_query, va_list args )
{
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
*va_arg( args, bool* ) = false;
......@@ -480,23 +479,11 @@ int DirControl( access_t *p_access, int i_query, va_list args )
*va_arg( args, bool* ) = true;
break;
/* */
case ACCESS_GET_PTS_DELAY:
*va_arg( args, int64_t * ) = DEFAULT_PTS_DELAY * 1000;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
......
modules/access/dshow/dshow.cpp
View file @ 26b2eff7
......@@ -1934,7 +1934,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
......@@ -1943,23 +1942,13 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
*pb_bool = false;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 =
INT64_C(1000) * var_InheritInteger( p_access, "live-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
......
modules/access/dtv/access.c
View file @ 26b2eff7
......@@ -540,34 +540,19 @@ static int Control (access_t *access, int query, va_list args)
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
{
bool *v = va_arg (args, bool *);
*v = false;
return VLC_SUCCESS;
}
*va_arg (args, bool *) = false;
break;
case ACCESS_GET_PTS_DELAY:
{
int64_t *v = va_arg (args, int64_t *);
*v = var_InheritInteger (access, "live-caching") * INT64_C(1000);
return VLC_SUCCESS;
break;
}
case ACCESS_GET_TITLE_INFO:
case ACCESS_GET_META:
return VLC_EGENERIC;
case ACCESS_GET_CONTENT_TYPE:
{
char **pt = va_arg (args, char **);
*pt = strdup ("video/MP2T");
return VLC_SUCCESS;
}
case ACCESS_SET_PAUSE_STATE:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
*va_arg (args, char **) = strdup ("video/MP2T");
break;
case ACCESS_GET_SIGNAL:
*va_arg (args, double *) = dvb_get_snr (dev);
......@@ -588,7 +573,7 @@ static int Control (access_t *access, int query, va_list args)
}
else
dvb_remove_pid (dev, pid);
return VLC_SUCCESS;
break;
}
case ACCESS_SET_PRIVATE_ID_CA:
......@@ -597,16 +582,15 @@ static int Control (access_t *access, int query, va_list args)
struct dvbpsi_pmt_s *pmt = va_arg (args, struct dvbpsi_pmt_s *);
dvb_set_ca_pmt (dev, pmt);
return VLC_SUCCESS;
break;
}
#endif
case ACCESS_GET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
/*case ACCESS_GET_PRIVATE_ID_STATE: TODO? */
}
msg_Warn (access, "unimplemented query %d in control", query);
return VLC_EGENERIC;
return VLC_SUCCESS;
}
......
modules/access/dv.c
View file @ 26b2eff7
......@@ -294,15 +294,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
AVCPause( p_access, p_access->p_sys->i_node );
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
......
modules/access/dvb/access.c
View file @ 26b2eff7
......@@ -378,7 +378,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
......@@ -386,20 +385,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
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;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
case ACCESS_GET_SIGNAL:
pf1 = (double*)va_arg( args, double * );
pf2 = (double*)va_arg( args, double * );
......@@ -410,14 +401,9 @@ static int Control( access_t *p_access, int i_query, va_list args )
*pf1 = (double)stat.i_snr / 65535.0;
*pf2 = (double)stat.i_signal_strenth / 65535.0;
}
return VLC_SUCCESS;
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_SET_PRIVATE_ID_CA:
return VLC_EGENERIC;
break;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
......
modules/access/eyetv.m
View file @ 26b2eff7
......@@ -295,26 +295,13 @@ static int Control(access_t *p_access, int i_query, va_list args)
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 =
INT64_C(1000) * var_InheritInteger(p_access, "live-caching");
break;
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn(p_access, "unimplemented query in control");
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
modules/access/file.c
View file @ 26b2eff7
......@@ -375,7 +375,6 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
......@@ -398,7 +397,6 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
break;
}
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
if (IsRemote (p_sys->fd, p_access->psz_filepath))
......@@ -408,22 +406,11 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
*pi_64 *= 1000;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
......
modules/access/ftp.c
View file @ 26b2eff7
......@@ -874,7 +874,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = !p_access->p_sys->directory;
......@@ -895,30 +894,19 @@ static int Control( access_t *p_access, int i_query, va_list args )
*va_arg( args, uint64_t * ) = p_access->p_sys->size;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = INT64_C(1000)
* var_InheritInteger( p_access, "network-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
pb_bool = (bool*)va_arg( args, bool* );
if ( !pb_bool )
return Seek( p_access, p_access->info.i_pos );
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control: %d", i_query);
return VLC_EGENERIC;
}
......
modules/access/gnomevfs.c
View file @ 26b2eff7
......@@ -345,7 +345,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
......@@ -367,23 +366,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
*pi_64 = DEFAULT_PTS_DELAY; /* FIXME */
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
modules/access/http.c
View file @ 26b2eff7
......@@ -1019,14 +1019,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
p_sys->psz_mime ? strdup( p_sys->psz_mime ) : NULL;
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
......
modules/access/imem.c
View file @ 26b2eff7
......@@ -356,13 +356,6 @@ static int ControlAccess(access_t *access, int i_query, va_list args)
case ACCESS_SET_PAUSE_STATE:
return VLC_SUCCESS;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
default:
return VLC_EGENERIC;
}
......
modules/access/mms/mmsh.c
View file @ 26b2eff7
......@@ -223,7 +223,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = !p_sys->b_broadcast;
......@@ -247,7 +246,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
return VLC_SUCCESS;
}
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = INT64_C(1000)
......@@ -263,7 +261,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
*pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
b_bool = (bool)va_arg( args, int );
if( b_bool )
......@@ -272,18 +269,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
Seek( p_access, p_access->info.i_pos );
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
......
modules/access/mms/mmstu.c
View file @ 26b2eff7
......@@ -224,7 +224,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_seekable;
......@@ -254,7 +253,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
*va_arg( args, uint64_t * ) = p_sys->i_size;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = INT64_C(1000)
......@@ -270,7 +268,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
*pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
b_bool = (bool)va_arg( args, int );
if( b_bool )
......@@ -285,19 +282,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
}
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
......
modules/access/mtp.c
View file @ 26b2eff7
......@@ -230,7 +230,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = ( bool* )va_arg( args, bool* );
......@@ -262,22 +261,11 @@ static int Control( access_t *p_access, int i_query, va_list args )
* var_InheritInteger( p_access, "file-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
......
modules/access/rtsp/access.c
View file @ 26b2eff7
......@@ -305,7 +305,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
{
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
......@@ -321,21 +320,11 @@ static int Control( access_t *p_access, int i_query, va_list args )
* var_InheritInteger(p_access, "network-caching");
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
......
modules/access/sftp.c
View file @ 26b2eff7
......@@ -351,17 +351,7 @@ static int Control( access_t* p_access, int i_query, va_list args )
case ACCESS_SET_PAUSE_STATE:
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
......
modules/access/smb.c
View file @ 26b2eff7
......@@ -332,17 +332,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
......
modules/access/tcp.c
View file @ 26b2eff7
......@@ -158,7 +158,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
......@@ -179,22 +178,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
* var_InheritInteger( p_access, "network-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
modules/access/udp.c
View file @ 26b2eff7
......@@ -204,7 +204,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
......@@ -212,26 +211,15 @@ static int Control( access_t *p_access, int i_query, va_list args )
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 = INT64_C(1000)
* var_InheritInteger(p_access, "network-caching");
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
......
modules/access/v4l2/access.c
View file @ 26b2eff7
......@@ -263,7 +263,6 @@ static int AccessControl( access_t *access, int query, va_list args )
{
switch( query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
......@@ -271,27 +270,16 @@ static int AccessControl( access_t *access, int query, va_list args )
*va_arg( args, bool* ) = false;
break;
/* */
case ACCESS_GET_PTS_DELAY:
*va_arg(args,int64_t *) = INT64_C(1000)
* var_InheritInteger( access, "live-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
case ACCESS_GET_META:
return VLC_EGENERIC;
default:
msg_Warn( access, "Unimplemented query %d in control", query );
return VLC_EGENERIC;
}
......
modules/access/vcd/vcd.c
View file @ 26b2eff7
......@@ -301,17 +301,11 @@ static int Control( access_t *p_access, int i_query, va_list args )
p_access->info.i_pos = (uint64_t)(p_sys->i_sector -
p_sys->p_sectors[1+p_access->info.i_title]) *VCD_DATA_SIZE;
}
return VLC_SUCCESS;
break;
}
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
......
modules/access/vcdx/access.c
View file @ 26b2eff7
......@@ -1011,12 +1011,12 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
#if 0
/* Pass back a copy of meta information that was gathered when we
during the Open/Initialize call.
*/
case ACCESS_GET_META:
dbg_print( INPUT_DBG_EVENT, "get meta info" );
#if 0
if( p_vcdplayer->p_meta )
{
vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg(args,vlc_meta_t**);
......@@ -1025,30 +1025,25 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
}
else
#endif
msg_Warn( p_access, "tried to copy NULL meta info" );
return VLC_SUCCESS;
#endif
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
dbg_print( INPUT_DBG_EVENT,
"seek/fastseek/pause/can_control_pace" );
*((bool*)va_arg( args, bool* )) = true;
return VLC_SUCCESS;
break;
/* */
case ACCESS_GET_PTS_DELAY:
*(int64_t*)va_arg(args,int64_t *) = INT64_C(1000) *
var_InheritInteger( p_access, "disc-caching" );
return VLC_SUCCESS;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
return VLC_SUCCESS;
break;
case ACCESS_GET_TITLE_INFO:
{
......@@ -1076,7 +1071,7 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
if( p_vcdplayer->i_titles == 0 )
{
*pi_int = 0; ppp_title = NULL;
return VLC_SUCCESS;
break;
}
*pi_int = p_vcdplayer->i_titles;
*ppp_title = malloc(sizeof(input_title_t **)*p_vcdplayer->i_titles);
......@@ -1163,17 +1158,11 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
VCDSetOrigin(p_access,vcdinfo_get_entry_lsn(p_vcdplayer->vcd,i),
i_track,&(p_vcdplayer->play_item));
}
return VLC_SUCCESS;
break;
}
case ACCESS_SET_PRIVATE_ID_STATE:
dbg_print( INPUT_DBG_EVENT, "set private id" );
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
modules/access/vdr.c
View file @ 26b2eff7
......@@ -312,12 +312,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
vlc_meta_Merge( p_meta, p_sys->p_meta );
break;
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
......
modules/access/zip/zipaccess.c
View file @ 26b2eff7
......@@ -225,7 +225,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
......@@ -253,24 +252,12 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
*pi_64 = DEFAULT_PTS_DELAY;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
......
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