[vlc-devel] commit: Remove obsolete --sap-timeshift option ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jan 11 20:09:48 2009 +0200| [9e129c71882b15298a9ee3ca29a2a8ba62034f54] | committer: Rémi Denis-Courmont 

Remove obsolete --sap-timeshift option

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

 modules/services_discovery/sap.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index f18470b..de9a933 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -113,9 +113,6 @@
        "This enables a SAP caching mechanism. " \
        "This will result in lower SAP startup time, but you could end up " \
        "with items corresponding to legacy streams." )
-#define SAP_TIMESHIFT_TEXT N_("Allow timeshifting")
-#define SAP_TIMESHIFT_LONGTEXT N_( "This automatically enables timeshifting " \
-        "for streams discovered through SAP announcements." )
 
 /* Callbacks */
     static int  Open ( vlc_object_t * );
@@ -145,8 +142,7 @@ vlc_module_begin ()
     add_bool( "sap-cache", 0 , NULL,
                SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true );
 #endif
-    add_bool( "sap-timeshift", 0 , NULL,
-              SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, true );
+    add_obsolete_bool( "sap-timeshift" ) /* Redumdant since 1.0.0 */
 
     set_capability( "services_discovery", 0 )
     set_callbacks( Open, Close )
@@ -246,7 +242,6 @@ struct services_discovery_sys_t
     /* Modes */
     bool  b_strict;
     bool  b_parse;
-    bool  b_timeshift;
 
     int i_timeout;
 };
@@ -318,9 +313,6 @@ static int Open( vlc_object_t *p_this )
     }
 #endif
 
-    /* Cache sap_timeshift value */
-    p_sys->b_timeshift = var_CreateGetInteger( p_sd, "sap-timeshift" );
-
     p_sys->i_announces = 0;
     p_sys->pp_announces = NULL;
     /* TODO: create sockets here, and fix racy sockets table */
@@ -883,9 +875,6 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
         return NULL;
     }
 
-    if( p_sys->b_timeshift )
-        input_item_AddOption( p_input, ":access-filter=timeshift" );
-
     if( p_sdp->rtcp_port )
     {
         char *rtcp;