From 8aaeb8d71ccc3a36b9c827c635fad670023a0bbb Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Tue, 15 Mar 2005 04:16:17 +0000
Subject: [PATCH] read_subchannel sets format MSF. So caller no longer has to.

---
 lib/driver/gnu_linux.c | 5 +++--
 lib/driver/solaris.c   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c
index 30d4dc7b..7235bf1d 100644
--- a/lib/driver/gnu_linux.c
+++ b/lib/driver/gnu_linux.c
@@ -1,5 +1,5 @@
 /*
-    $Id: gnu_linux.c,v 1.8 2005/03/08 04:10:36 rocky Exp $
+    $Id: gnu_linux.c,v 1.9 2005/03/15 04:16:17 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: gnu_linux.c,v 1.8 2005/03/08 04:10:36 rocky Exp $";
+static const char _rcsid[] = "$Id: gnu_linux.c,v 1.9 2005/03/15 04:16:17 rocky Exp $";
 
 #include <string.h>
 
@@ -271,6 +271,7 @@ audio_read_subchannel_linux (void *p_user_data,
 {
 
   const _img_private_t *p_env = p_user_data;
+  p_subchannel->format = CDIO_CDROM_MSF;
   return ioctl(p_env->gen.fd, CDROMSUBCHNL, p_subchannel);
 }
 
diff --git a/lib/driver/solaris.c b/lib/driver/solaris.c
index 82a41ad2..a572f584 100644
--- a/lib/driver/solaris.c
+++ b/lib/driver/solaris.c
@@ -1,5 +1,5 @@
 /*
-    $Id: solaris.c,v 1.7 2005/03/08 04:10:36 rocky Exp $
+    $Id: solaris.c,v 1.8 2005/03/15 04:16:17 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: solaris.c,v 1.7 2005/03/08 04:10:36 rocky Exp $";
+static const char _rcsid[] = "$Id: solaris.c,v 1.8 2005/03/15 04:16:17 rocky Exp $";
 
 #ifdef HAVE_GLOB_H
 #include <glob.h>
@@ -181,6 +181,7 @@ audio_read_subchannel_solaris (void *p_user_data,
 {
 
   const _img_private_t *p_env = p_user_data;
+  p_subchannel->format = CDIO_CDROM_MSF;
   return ioctl(p_env->gen.fd, CDROMSUBCHNL, p_subchannel);
 }