Extended demuxer API with the methods get_capabilities() and get_optional_data(). Bumped API version to 18. Added calls to these methods in xine_get_{spu,audio}_lang(). Added DVBSUB support in demux_ts.c

CVS patchset: 3386
CVS date: 2002/11/28 10:21:05

1 files changed, 13 insertions, 2 deletions

diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index 68a2b6290..b555f11b9 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_cda.c,v 1.34 2002/11/20 11:57:40 mroi Exp $
+ * $Id: demux_cda.c,v 1.35 2002/11/28 10:21:05 petli Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -169,6 +169,15 @@ static int demux_cda_get_stream_length (demux_plugin_t *this_gen) {
   return 0;
 }
 
+static uint32_t demux_cda_get_capabilities(demux_plugin_t *this_gen) {
+  return DEMUX_CAP_NOCAP;
+}
+
+static int demux_cda_get_optional_data(demux_plugin_t *this_gen,
+					void *data, int data_type) {
+  return DEMUX_OPTIONAL_UNSUPPORTED;
+}
+
 static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream,
                                     input_plugin_t *input_gen) {
 
@@ -192,6 +201,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.get_stream_length = demux_cda_get_stream_length;
   this->demux_plugin.get_video_frame   = NULL;
   this->demux_plugin.got_video_frame_cb= NULL;
+  this->demux_plugin.get_capabilities  = demux_cda_get_capabilities;
+  this->demux_plugin.get_optional_data = demux_cda_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
 
   this->status = DEMUX_FINISHED;
@@ -283,6 +294,6 @@ static void *init_plugin (xine_t *xine, void *data) {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 17, "cda", XINE_VERSION_CODE, NULL, init_plugin },
+  { PLUGIN_DEMUX, 18, "cda", XINE_VERSION_CODE, NULL, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };