[libdvdcss-devel] [PATCH] Drop deprecated and undocumented APIs.

[Diego Biurrun]

---
 NEWS                |    8 ++++++++
 src/dvdcss/dvdcss.h |   10 ----------
 src/libdvdcss.c     |   12 +-----------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/NEWS b/NEWS
index 54ce859..b16d22d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Changes between 1.2.13 and 1.2.14:
+----------------------------------
+
+  * Dropped deprecated, undocumented API:
+    - the function dvdcss_title()
+    - the type dvdcss_handle
+
+
 Changes between 1.2.12 and 1.2.13:
 ----------------------------------
 
diff --git a/src/dvdcss/dvdcss.h b/src/dvdcss/dvdcss.h
index e010c31..f327aa2 100644
--- a/src/dvdcss/dvdcss.h
+++ b/src/dvdcss/dvdcss.h
@@ -91,16 +91,6 @@ LIBDVDCSS_EXPORT char *   dvdcss_error ( dvdcss_t );
 
 LIBDVDCSS_EXPORT int      dvdcss_is_scrambled ( dvdcss_t );
 
-
-/*
- * Deprecated stuff.
- */
-#ifndef _DOXYGEN_SKIP_ME
-#define dvdcss_title(a,b) dvdcss_seek(a,b,DVDCSS_SEEK_KEY)
-#define dvdcss_handle dvdcss_t
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index dcb99c1..cbda930 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -598,8 +598,7 @@ LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t dvdcss )
  * This flag is typically used when reading data from a VOB.
  *
  * If #DVDCSS_SEEK_KEY is specified, the title key will be always checked,
- * even with the "title" method. This is equivalent to using the now
- * deprecated dvdcss_title() call. This flag is typically used when seeking
+ * even with the "title" method. This flag is typically used when seeking
  * in a new title.
  */
 LIBDVDCSS_EXPORT int dvdcss_seek ( dvdcss_t dvdcss, int i_blocks, int i_flags )
@@ -800,15 +799,6 @@ LIBDVDCSS_EXPORT int dvdcss_close ( dvdcss_t dvdcss )
     return 0;
 }
 
-/*
- *  Deprecated. See dvdcss_seek().
- */
-#undef dvdcss_title
-LIBDVDCSS_EXPORT int dvdcss_title ( dvdcss_t dvdcss, int i_block )
-{
-    return _dvdcss_title( dvdcss, i_block );
-}
-
 /**
  * \brief Return 1 if the DVD is scrambled, 0 otherwise.
  *
-- 
1.7.9.5