[vlc-devel] [v3 6/9] modules: set 0 for items which value is actually 0
Steve Lhomme
robux4 at ycbcr.xyz
Thu Jul 26 10:03:59 CEST 2018
And it should not be set explicitly to INPUT_DURATION_NONE which is for nodes
and directories.
---
modules/demux/playlist/asx.c | 2 +-
modules/demux/playlist/podcast.c | 2 +-
modules/demux/playlist/sgimb.c | 2 +-
test/libvlc/media.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 4ea05fed3f..ceea2b24cf 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -208,7 +208,7 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
do
{
- i_duration = INPUT_DURATION_ZERO;
+ i_duration = 0;
i_type = xml_ReaderNextNode( p_xml_reader, &psz_node );
if( i_type == XML_READER_ERROR || i_type == XML_READER_NONE )
diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index c1cb90ab4e..afc5658516 100644
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -385,6 +385,6 @@ static vlc_tick_t strTimeToMTime( const char *psz )
case 2:
return (vlc_tick_t)( h*60 + m ) * CLOCK_FREQ;
default:
- return INPUT_DURATION_ZERO;
+ return 0;
}
}
diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index e1a772a1a9..bb85bbdcb2 100644
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -171,7 +171,7 @@ int Import_SGIMB( vlc_object_t * p_this )
p_sys->psz_mcast_ip = NULL;
p_sys->i_mcast_port = 0;
p_sys->i_packet_size = 0;
- p_sys->i_duration = INPUT_DURATION_ZERO;
+ p_sys->i_duration = 0;
p_sys->i_port = 0;
p_sys->i_sid = 0;
p_sys->b_rtsp_kasenna = false;
diff --git a/test/libvlc/media.c b/test/libvlc/media.c
index dd6d10c2ac..4de30c7187 100644
--- a/test/libvlc/media.c
+++ b/test/libvlc/media.c
@@ -148,7 +148,7 @@ static void test_input_metadata_timeout(libvlc_instance_t *vlc, int timeout,
char psz_fd_uri[strlen("fd://") + 11];
sprintf(psz_fd_uri, "fd://%u", (unsigned) p_pipe[1]);
- input_item_t *p_item = input_item_NewFile(psz_fd_uri, "test timeout", INPUT_DURATION_ZERO,
+ input_item_t *p_item = input_item_NewFile(psz_fd_uri, "test timeout", 0,
ITEM_LOCAL);
assert(p_item != NULL);
--
2.17.0
More information about the vlc-devel
mailing list