From 7e765ed1396fb3e279c5435d35044b11d4b9d009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 11 Jul 2010 15:45:40 +0300
Subject: [PATCH] Remove legacy casts
---
modules/access/dshow/dshow.cpp | 4 ++--
modules/access/dv.c | 2 +-
modules/access/dvb/access.c | 2 +-
modules/access/dvdread.c | 2 +-
modules/access/ftp.c | 2 +-
modules/access/http.c | 2 +-
modules/access/jack.c | 3 +--
modules/access/mmap.c | 2 +-
modules/access/mms/mmsh.c | 2 +-
modules/access/mms/mmstu.c | 2 +-
modules/access/pvr.c | 2 +-
modules/access/rtsp/access.c | 2 +-
modules/access/screen/screen.c | 2 +-
modules/access/sftp.c | 2 +-
modules/access/smb.c | 2 +-
modules/access/tcp.c | 2 +-
modules/access/udp.c | 2 +-
modules/access/v4l.c | 2 +-
modules/access/vcd/vcd.c | 2 +-
modules/demux/live555.cpp | 2 +-
20 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 97d7b606d1d3..d2ad8cf4b3d5 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -1884,7 +1884,7 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "dshow-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "dshow-caching" ) * 1000;
break;
/* */
@@ -1924,7 +1924,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "dshow-caching" ) * 1000;
+ *pi64 = var_GetInteger( p_demux, "dshow-caching" ) * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
diff --git a/modules/access/dv.c b/modules/access/dv.c
index 084ef27ed86c..372bf7465330 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -292,7 +292,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_GET_PTS_DELAY:
*va_arg( args, int64_t * )
- = (int64_t)var_GetInteger( p_access, "dv-caching" ) * 1000;
+ = var_GetInteger( p_access, "dv-caching" ) * 1000;
break;
/* */
diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index e57fa399e56b..e41013046aba 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -728,7 +728,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "dvb-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
break;
/* */
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 95e680129d46..82b8194a74db 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -426,7 +426,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "dvdread-caching" )*1000;
+ *pi64 = var_GetInteger( p_demux, "dvdread-caching" )*1000;
return VLC_SUCCESS;
/* TODO implement others */
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 0dc1de124461..ca50e0cc1dff 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -595,7 +595,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000);
break;
/* */
diff --git a/modules/access/http.c b/modules/access/http.c
index 11f145e1814b..29da639b2182 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1074,7 +1074,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "http-caching" ) * 1000;
break;
/* */
diff --git a/modules/access/jack.c b/modules/access/jack.c
index 70c2c061a774..b7fb6d624406 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -364,8 +364,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = ( int64_t* )va_arg( args, int64_t * );
- *pi64 = ( int64_t )var_GetInteger( p_demux, "jack-input-caching" )
- * 1000;
+ *pi64 = var_GetInteger( p_demux, "jack-input-caching" ) * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index 24d894eacbaf..2a03fce52e93 100644
--- a/modules/access/mmap.c
+++ b/modules/access/mmap.c
@@ -290,7 +290,7 @@ static int Control (access_t *p_access, int query, va_list args)
case ACCESS_GET_PTS_DELAY:
{
- int delay_ms = var_CreateGetInteger (p_access, "file-caching");
+ int64_t delay_ms = var_CreateGetInteger (p_access, "file-caching");
*va_arg(args, int64_t *) = delay_ms * INT64_C (1000);
return VLC_SUCCESS;
}
diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 9833483df6e0..e191b2a48f3b 100644
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -250,7 +250,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
break;
case ACCESS_GET_PRIVATE_ID_STATE:
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index ce4f5df3d433..e58612f8dde1 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -253,7 +253,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
break;
case ACCESS_GET_PRIVATE_ID_STATE:
diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index 88a3070c6af6..666987932110 100644
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -970,7 +970,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "pvr-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "pvr-caching" ) * 1000;
break;
/* */
diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index 52c2b6b4a006..2a167d6e0749 100644
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -332,7 +332,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_GET_PTS_DELAY:
*va_arg( args, int64_t * ) =
- (int64_t)var_GetInteger(p_access,"realrtsp-caching")*1000;
+ var_GetInteger(p_access,"realrtsp-caching")*1000;
break;
/* */
diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 95c493fdc357..671f41a2b357 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -301,7 +301,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "screen-caching" ) *1000;
+ *pi64 = var_GetInteger( p_demux, "screen-caching" ) *1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index ac90b4936459..ce253cf64beb 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -309,7 +309,7 @@ static int Control( access_t* p_access, int i_query, va_list args )
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t* );
- *pi_64 = (int64_t)var_GetInteger( p_access, "sftp-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "sftp-caching" ) * INT64_C(1000);
break;
case ACCESS_SET_PAUSE_STATE:
diff --git a/modules/access/smb.c b/modules/access/smb.c
index c44394ce3ed9..abe67a7b237a 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -335,7 +335,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_GET_PTS_DELAY:
*va_arg( args, int64_t * )
- = (int64_t)var_GetInteger( p_access, "smb-caching" ) * 1000;
+ = var_GetInteger( p_access, "smb-caching" ) * 1000;
break;
case ACCESS_SET_PAUSE_STATE:
diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 3f33b9b1d768..7b111f0ca055 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -187,7 +187,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000);
break;
/* */
diff --git a/modules/access/udp.c b/modules/access/udp.c
index cb5068bcf484..5cc485f90756 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -205,7 +205,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger(p_access,"udp-caching") * 1000;
+ *pi_64 = var_GetInteger(p_access,"udp-caching") * 1000;
break;
/* */
diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index 995afc0b316c..fb866eaa4985 100644
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -444,7 +444,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "v4l-caching" ) * 1000;
+ *pi64 = var_GetInteger( p_demux, "v4l-caching" ) * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index d55ec016063a..e94dc617293b 100644
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -257,7 +257,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/* */
case ACCESS_GET_PTS_DELAY:
*va_arg( args, int64_t * )
- = (int64_t)var_GetInteger(p_access,"vcd-caching") * 1000;
+ = var_GetInteger(p_access,"vcd-caching") * 1000;
break;
/* */
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index e513f5da3667..c4973dcb64e4 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1476,7 +1476,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
+ *pi64 = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
return VLC_SUCCESS;
default:
--
GitLab