diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-11 21:29:00 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-11 21:29:00 +0000 |
commit | 2831b49bb5f40df4bd3452e5166d6e2ac1d0b48c (patch) | |
tree | 7a0a26e96a831d15144fb32608d374352e456ffc /libmpdemux | |
parent | 689316c4d6dca6ad3398da3e6f8e8a881116a3c3 (diff) | |
download | mpv-2831b49bb5f40df4bd3452e5166d6e2ac1d0b48c.tar.bz2 mpv-2831b49bb5f40df4bd3452e5166d6e2ac1d0b48c.tar.xz |
include stream_dvd's interface from libmpdemux/stream_dvd.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18685 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/stream.h | 50 | ||||
-rw-r--r-- | libmpdemux/stream_dvd.c | 2 |
2 files changed, 2 insertions, 50 deletions
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index cbda02669b..3fd9e35453 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -283,12 +283,10 @@ stream_t* new_memory_stream(unsigned char* data,int len); stream_t* open_stream(char* filename,char** options,int* file_format); stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format); -//#ifdef USE_DVDREAD extern int dvd_title; extern int dvd_chapter; extern int dvd_last_chapter; extern int dvd_angle; -//#endif extern char * audio_stream; @@ -296,20 +294,6 @@ extern char * audio_stream; #include "dvdnav_stream.h" #endif -#ifdef USE_DVDREAD - -#ifdef USE_MPDVDKIT -#include "libmpdvdkit2/dvd_reader.h" -#include "libmpdvdkit2/ifo_types.h" -#include "libmpdvdkit2/ifo_read.h" -#include "libmpdvdkit2/nav_read.h" -#else -#include <dvdread/dvd_reader.h> -#include <dvdread/ifo_types.h> -#include <dvdread/ifo_read.h> -#include <dvdread/nav_read.h> -#endif - typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm int language; @@ -317,38 +301,4 @@ typedef struct { int channels; } stream_language_t; -typedef struct { - dvd_reader_t *dvd; - dvd_file_t *title; - ifo_handle_t *vmg_file; - tt_srpt_t *tt_srpt; - ifo_handle_t *vts_file; - vts_ptt_srpt_t *vts_ptt_srpt; - pgc_t *cur_pgc; -// - int cur_title; - int cur_cell; - int last_cell; - int cur_pack; - int cell_last_pack; -// Navi: - int packs_left; - dsi_t dsi_pack; - int angle_seek; -// audio datas - int nr_of_channels; - stream_language_t audio_streams[32]; -// subtitles - int nr_of_subtitles; - stream_language_t subtitles[32]; -} dvd_priv_t; - -int dvd_number_of_subs(stream_t *stream); -int dvd_lang_from_sid(stream_t *stream, int id); -int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); -int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); -int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); - -#endif - #endif // __STREAM_H diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c index 341f706ef9..7cdf6e9532 100644 --- a/libmpdemux/stream_dvd.c +++ b/libmpdemux/stream_dvd.c @@ -25,6 +25,8 @@ #include "m_option.h" #include "m_struct.h" +#include "stream_dvd.h" + /// We keep these 2 for the gui atm, but they will be removed. extern int dvd_title; extern int dvd_chapter; |