diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2003-04-08 14:24:26 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2003-04-08 14:24:26 +0000 |
| commit | 2ce98e8fe09f25d4d42897c6c0891e294787e18a (patch) | |
| tree | 02e79dc3b0c7d89e571ee49a9b7b972d28b755e5 | |
| parent | b7dc399960075ecfc309d2e630c8ccc03cb6e899 (diff) | |
| download | xine-lib-2ce98e8fe09f25d4d42897c6c0891e294787e18a.tar.gz xine-lib-2ce98e8fe09f25d4d42897c6c0891e294787e18a.tar.bz2 | |
- added XINE_MSG_ENCRYPTED_SOURCE, made the demux_mpeg_block demuxer use it to report encrypted streams (for use with encrypted DVDs)
CVS patchset: 4573
CVS date: 2003/04/08 14:24:26
| -rw-r--r-- | include/xine.h.in | 3 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 79edf5138..3057b0212 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -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: xine.h.in,v 1.74 2003/04/06 23:58:18 miguelfreitas Exp $ + * $Id: xine.h.in,v 1.75 2003/04/08 14:24:26 hadess Exp $ * * public xine-lib (libxine) interface and documentation * @@ -1413,6 +1413,7 @@ typedef struct { #define XINE_MSG_FILE_NOT_FOUND 6 /* (file name or mrl) */ #define XINE_MSG_READ_ERROR 7 /* (device/file/mrl) */ #define XINE_MSG_LIBRARY_LOAD_ERROR 8 /* (library/decoder) */ +#define XINE_MSG_ENCRYPTED_SOURCE 9 /* none */ /* opaque xine_event_queue_t */ typedef struct xine_event_queue_s xine_event_queue_t; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 68b43f212..e12906382 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.167 2003/04/08 09:43:04 jcdutton Exp $ + * $Id: demux_mpeg_block.c,v 1.168 2003/04/08 14:24:27 hadess Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -454,7 +454,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_mpeg_block: too many errors, stopping playback. Maybe this stream is scrambled?\n")); this->status = DEMUX_FINISHED; - xine_message(this->stream, XINE_MSG_GENERAL_WARNING, "Encrypted media stream.\nPlayback aborted.\nMaybe libdvdcss is missing.", NULL); + xine_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Encrypted media stream.\nPlayback aborted.\nMaybe libdvdcss is missing.", NULL); } } |