Revert "Add SNR and signal level for access_demux"

This reverts commit 7a15955acd1adb65a71f17a19b78fa9c545bf37d.
This was never actually used; it was inadequate for V4L.

Conflicts:
	include/vlc_demux.h

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index c0cea070a3cccc4e7f61082bfa70d3ac30ae4323..332d61985c4b24c0b872a856185ef641511df0e1 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -160,8 +160,6 @@ enum demux_query_e
 
     DEMUX_CAN_SEEK,            /* arg1= bool*    can fail (assume false)*/
 
-    DEMUX_GET_SIGNAL,          /* arg1= double * arg2= double * can fail */
-
     /* Navigation */
     DEMUX_NAV_ACTIVATE,        /* res=can fail */
     DEMUX_NAV_UP,              /* res=can fail */

diff --git a/src/input/input.c b/src/input/input.c
index d8ed8d6d9815d527b792d1d6ebb3f0e404e4b7df..306a91a434fa4d9240ccda0819dfca1c58f5767e 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2250,18 +2250,6 @@ static void UpdateGenericFromDemux( input_thread_t *p_input )
         }
         p_demux->info.i_update &= ~INPUT_UPDATE_META;
     }
-    if( p_demux->info.i_update & INPUT_UPDATE_SIGNAL )
-    {
-        double quality;
-        double strength;
-
-        if( demux_Control( p_demux, DEMUX_GET_SIGNAL, &quality, &strength ) )
-            quality = strength = -1.;
-
-        input_SendEventSignal( p_input, quality, strength );
-
-        p_demux->info.i_update &= ~INPUT_UPDATE_SIGNAL;
-    }
 
     p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
 }