From 774e5d941a70e45ff52591d927119a32a258ef8e Mon Sep 17 00:00:00 2001
From: Harm van der Heijden <hrm@users.sourceforge.net>
Date: Mon, 17 Dec 2001 16:20:42 +0000
Subject: - updated changelog - minor change in dxr3_decoder.c

CVS patchset: 1267
CVS date: 2001/12/17 16:20:42
---
 ChangeLog               |  4 ++--
 src/dxr3/dxr3_decoder.c | 23 ++++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88b9cce75..381b66591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
   * better looking OSD fonts
   * fix audio pause on discontinuities
-  * cleanup of dxr3enc driver. Now official support for librte-0.4 besides
-    the traditional libfame, via .xine/config file.
+  * merged dxr3 and dxr3enc drivers into single dxr3 driver. See README.dxr3 
+  * dxr3 encoding support for librte-0.4 besides the traditional libfame.
  
 xine (0.9.7) unstable; urgency=low
 
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index c3adeb6e8..9afd0d7b4 100644
--- a/src/dxr3/dxr3_decoder.c
+++ b/src/dxr3/dxr3_decoder.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: dxr3_decoder.c,v 1.44 2001/12/16 19:05:44 hrm Exp $
+ * $Id: dxr3_decoder.c,v 1.45 2001/12/17 16:20:42 hrm Exp $
  *
  * dxr3 video and spu decoder plugin. Accepts the video and spu data
  * from XINE and sends it directly to the corresponding dxr3 devices.
@@ -523,6 +523,17 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 		vpts = this->video_decoder.metronom->got_video_frame(
 		 this->video_decoder.metronom, buf->PTS, buf->SCR );
 	}
+	/* ensure video device is open */
+	if (this->fd_video < 0) {	
+		char tmpstr[128];
+		snprintf (tmpstr, sizeof(tmpstr), "%s_mv", devname);
+		if ((this->fd_video = open (tmpstr, O_WRONLY)) < 0) {
+			printf("dxr3: Failed to open video device %s (%s)\n",
+				tmpstr, strerror(errno)); 
+			return;
+		}
+	}
+
 	/* Now that we have a PTS value from the stream, not a metronom
 	   interpolated one, it's a good time to make sure the dxr3 pts
            is in sync. Checking every 0.5 seconds should be enough... */
@@ -547,16 +558,6 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 	if(this->enhanced_mode && !scanning_mode)
 		dxr3_mvcommand(this->fd_control, 6);
 
-	/* ensure video device is open */
-	if (this->fd_video < 0) {	
-		char tmpstr[128];
-		snprintf (tmpstr, sizeof(tmpstr), "%s_mv", devname);
-		if ((this->fd_video = open (tmpstr, O_WRONLY)) < 0) {
-			printf("dxr3: Failed to open video device %s (%s)\n",
-				tmpstr, strerror(errno)); 
-			return;
-		}
-	}
 	/* now write the content to the dxr3 mpeg device and, in a dramatic
 	   break with open source tradition, check the return value */
 	written = write(this->fd_video, buf->content, buf->size);
-- 
cgit v1.2.3