[vlc-commits] input: remove INPUT_GET_VIDEO_FPS control

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 24 21:28:49 2015 +0300| [37c38fd3e09191974d42c9f4b39657893cd32486] | committer: Rémi Denis-Courmont

input: remove INPUT_GET_VIDEO_FPS control

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=37c38fd3e09191974d42c9f4b39657893cd32486
---

 include/vlc_input.h |    3 ---
 src/input/control.c |    8 --------
 src/input/input.c   |    4 ----
 3 files changed, 15 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 81a93d7..6ec99e7 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -441,9 +441,6 @@ enum input_query_e
     INPUT_DEL_INFO,   /* arg1= char* arg2= char*              res=can fail */
     INPUT_SET_NAME,   /* arg1= char* res=can fail    */
 
-    /* Input properties */
-    INPUT_GET_VIDEO_FPS,         /* arg1= double *        res=can fail */
-
     /* bookmarks */
     INPUT_GET_BOOKMARK,    /* arg1= seekpoint_t *               res=can fail */
     INPUT_GET_BOOKMARKS,   /* arg1= seekpoint_t *** arg2= int * res=can fail */
diff --git a/src/input/control.c b/src/input/control.c
index 79a1029..a0c55cd 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -427,14 +427,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
-        case INPUT_GET_VIDEO_FPS:
-            pf = (double*)va_arg( args, double * );
-
-            vlc_mutex_lock( &p_input->p->p_item->lock );
-            *pf = p_input->p->f_fps;
-            vlc_mutex_unlock( &p_input->p->p_item->lock );
-            return VLC_SUCCESS;
-
         case INPUT_ADD_SLAVE:
             psz = (char*)va_arg( args, char * );
             if( psz && *psz )
diff --git a/src/input/input.c b/src/input/input.c
index 52b3939..16d9aac 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2273,11 +2273,7 @@ static input_source_t *InputSourceNew( input_thread_t *p_input,
     }
 
     if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) && f_fps > 0.0 )
-    {
-        vlc_mutex_lock( &p_input->p->p_item->lock );
         p_input->p->f_fps = f_fps;
-        vlc_mutex_unlock( &p_input->p->p_item->lock );
-    }
 
     if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
         in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" );