[MPlayer-cvslog] r28133 - trunk/libmpdemux/demux_nut.c

[ods15]

Author: ods15
Date: Fri Dec 12 05:58:54 2008
New Revision: 28133

Log:
Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut API

Modified:
   trunk/libmpdemux/demux_nut.c

Modified: trunk/libmpdemux/demux_nut.c
==============================================================================
--- trunk/libmpdemux/demux_nut.c	(original)
+++ trunk/libmpdemux/demux_nut.c	Fri Dec 12 05:58:54 2008
@@ -14,9 +14,9 @@
 
 typedef struct {
 	int last_pts; // FIXME
-	nut_context_t * nut;
-	nut_stream_header_t * s;
-} nut_priv_t;
+	nut_context_tt * nut;
+	nut_stream_header_tt * s;
+} nut_priv_tt;
 
 static size_t mp_read(void * h, size_t len, uint8_t * buf) {
 	stream_t * stream = (stream_t*)h;
@@ -65,7 +65,7 @@ static int nut_check_file(demuxer_t * de
 
 static demuxer_t * demux_open_nut(demuxer_t * demuxer) {
 	extern int index_mode;
-	nut_demuxer_opts_t dopts = {
+	nut_demuxer_opts_tt dopts = {
 		.input = {
 			.priv = demuxer->stream,
 			.seek = mp_seek,
@@ -77,9 +77,9 @@ static demuxer_t * demux_open_nut(demuxe
 		.read_index = index_mode,
 		.cache_syncpoints = 1,
 	};
-	nut_priv_t * priv = demuxer->priv = calloc(1, sizeof(nut_priv_t));
-	nut_context_t * nut = priv->nut = nut_demuxer_init(&dopts);
-	nut_stream_header_t * s;
+	nut_priv_tt * priv = demuxer->priv = calloc(1, sizeof(nut_priv_tt));
+	nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts);
+	nut_stream_header_tt * s;
 	int ret;
 	int i;
 
@@ -176,11 +176,11 @@ static demuxer_t * demux_open_nut(demuxe
 }
 
 static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) {
-	nut_priv_t * priv = demuxer->priv;
-	nut_context_t * nut = priv->nut;
+	nut_priv_tt * priv = demuxer->priv;
+	nut_context_tt * nut = priv->nut;
 	demux_packet_t *dp;
 	demux_stream_t *ds;
-	nut_packet_t pd;
+	nut_packet_tt pd;
 	int ret;
 	double pts;
 
@@ -238,8 +238,8 @@ static int demux_nut_fill_buffer(demuxer
 }
 
 static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_delay, int flags) {
-	nut_context_t * nut = ((nut_priv_t*)demuxer->priv)->nut;
-	nut_priv_t * priv = demuxer->priv;
+	nut_context_tt * nut = ((nut_priv_tt*)demuxer->priv)->nut;
+	nut_priv_tt * priv = demuxer->priv;
 	sh_audio_t * sh_audio = demuxer->audio->sh;
 	int nutflags = 0;
 	int ret;
@@ -263,7 +263,7 @@ static void demux_seek_nut(demuxer_t * d
 }
 
 static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) {
-	nut_priv_t * priv = demuxer->priv;
+	nut_priv_tt * priv = demuxer->priv;
 	switch (cmd) {
 		case DEMUXER_CTRL_GET_TIME_LENGTH:
 			*((double *)arg) = priv->s[0].max_pts *
@@ -282,7 +282,7 @@ static int demux_control_nut(demuxer_t *
 }
 
 static void demux_close_nut(demuxer_t *demuxer) {
-	nut_priv_t * priv = demuxer->priv;
+	nut_priv_tt * priv = demuxer->priv;
 	if (!priv) return;
 	nut_demuxer_uninit(priv->nut);
 	free(demuxer->priv);