[MPlayer-cvslog] r18685 - in trunk: Gui/interface.c libmpdemux/stream.h libmpdemux/stream_dvd.c mencoder.c mplayer.c

[nicodvb]

Author: nicodvb
Date: Sun Jun 11 23:29:00 2006
New Revision: 18685

Modified:
   trunk/Gui/interface.c
   trunk/libmpdemux/stream.h
   trunk/libmpdemux/stream_dvd.c
   trunk/mencoder.c
   trunk/mplayer.c

Log:
include stream_dvd's interface from libmpdemux/stream_dvd.h

Modified: trunk/Gui/interface.c
==============================================================================
--- trunk/Gui/interface.c	(original)
+++ trunk/Gui/interface.c	Sun Jun 11 23:29:00 2006
@@ -41,6 +41,11 @@
 #include "libmpdemux/stheader.h"
 #include "libmpcodecs/dec_video.h"
 
+#ifdef USE_DVDREAD
+#include "libmpdemux/stream_dvd.h"
+#endif
+
+
 #include "m_config.h"
 #include "m_option.h"
 

Modified: trunk/libmpdemux/stream.h
==============================================================================
--- trunk/libmpdemux/stream.h	(original)
+++ trunk/libmpdemux/stream.h	Sun Jun 11 23:29:00 2006
@@ -283,12 +283,10 @@
 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 @@
 #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 @@
  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

Modified: trunk/libmpdemux/stream_dvd.c
==============================================================================
--- trunk/libmpdemux/stream_dvd.c	(original)
+++ trunk/libmpdemux/stream_dvd.c	Sun Jun 11 23:29:00 2006
@@ -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;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Sun Jun 11 23:29:00 2006
@@ -76,6 +76,10 @@
 
 #include "get_path.c"
 
+#ifdef USE_DVDREAD
+#include "libmpdemux/stream_dvd.h"
+#endif
+
 #ifdef USE_LIBAVCODEC
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sun Jun 11 23:29:00 2006
@@ -185,6 +185,10 @@
 //#include "parse_es.h"
 #include "libmpdemux/matroska.h"
 
+#ifdef USE_DVDREAD
+#include "libmpdemux/stream_dvd.h"
+#endif
+
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/mp_image.h"