claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Revise play_audio_msf for start/end as it should be.

Browse Source 
_cdio_*driver*.c -> *driver*.c
This commit is contained in:
rocky
2005-03-05 09:26:52 +00:00
parent d496ca3dbc
commit d76eddad1b
9 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cdio/audio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: audio.h,v 1.4 2005/03/05 09:11:44 rocky Exp $ $Id: audio.h,v 1.5 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -83,7 +83,9 @@ extern "C" {
@param p_cdio the CD object to be acted upon. @param p_cdio the CD object to be acted upon.
*/ */
driver_return_code_t cdio_audio_play_msf (CdIo_t *p_cdio, msf_t *p_msf); driver_return_code_t cdio_audio_play_msf (CdIo_t *p_cdio,
msf_t *p_start_msf,
msf_t *p_end_msf);
/*! /*!
Playing CD through analog output at the desired track and index Playing CD through analog output at the desired track and index

14
lib/driver/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.8 2005/03/01 00:41:34 rocky Exp $ # $Id: Makefile.am,v 1.9 2005/03/05 09:26:52 rocky Exp $
# #
# Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> # Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
# #
@@ -52,16 +52,13 @@ EXTRA_DIST = image/Makefile FreeBSD/Makefile MSWindows/Makefile \
noinst_HEADERS = cdio_assert.h cdio_private.h portable.h noinst_HEADERS = cdio_assert.h cdio_private.h portable.h
libcdio_sources = \ libcdio_sources = \
_cdio_aix.c \
_cdio_bsdi.c \
_cdio_generic.c \ _cdio_generic.c \
_cdio_linux.c \
_cdio_osx.c \
_cdio_stdio.c \ _cdio_stdio.c \
_cdio_stdio.h \ _cdio_stdio.h \
_cdio_stream.c \ _cdio_stream.c \
_cdio_stream.h \ _cdio_stream.h \
_cdio_sunos.c \ aix.c \
bsdi.c \
audio.c \ audio.c \
cd_types.c \ cd_types.c \
cdio.c \ cdio.c \
@@ -75,6 +72,7 @@ libcdio_sources = \
FreeBSD/freebsd_cam.c \ FreeBSD/freebsd_cam.c \
FreeBSD/freebsd_ioctl.c \ FreeBSD/freebsd_ioctl.c \
generic.h \ generic.h \
gnu_linux.c \
image.h \ image.h \
image/bincue.c \ image/bincue.c \
image/cdrdao.c \ image/cdrdao.c \
@@ -82,6 +80,7 @@ libcdio_sources = \
image_common.h \ image_common.h \
image/nrg.c \ image/nrg.c \
image/nrg.h \ image/nrg.h \
logging.c \
mmc.c \ mmc.c \
mmc_private.h \ mmc_private.h \
MSWindows/aspi32.c \ MSWindows/aspi32.c \
@@ -89,9 +88,10 @@ libcdio_sources = \
MSWindows/win32_ioctl.c \ MSWindows/win32_ioctl.c \
MSWindows/win32.c \ MSWindows/win32.c \
MSWindows/win32.h \ MSWindows/win32.h \
logging.c \ osx.c \
read.c \ read.c \
sector.c \ sector.c \
solaris.c \
track.c \ track.c \
util.c util.c

4
lib/driver/_cdio_aix.c → lib/driver/aix.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_aix.c,v 1.11 2005/02/07 03:36:02 rocky Exp $ $Id: aix.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -37,7 +37,7 @@
#ifdef HAVE_AIX_CDROM #ifdef HAVE_AIX_CDROM
static const char _rcsid[] = "$Id: _cdio_aix.c,v 1.11 2005/02/07 03:36:02 rocky Exp $"; static const char _rcsid[] = "$Id: aix.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>

6
lib/driver/audio.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: audio.c,v 1.3 2005/03/05 09:11:44 rocky Exp $ $Id: audio.c,v 1.4 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -68,12 +68,12 @@ cdio_audio_pause (CdIo_t *p_cdio)
@param p_cdio the CD object to be acted upon. @param p_cdio the CD object to be acted upon.
*/ */
driver_return_code_t driver_return_code_t
cdio_audio_play_msf (CdIo_t *p_cdio, msf_t *p_msf) cdio_audio_play_msf (CdIo_t *p_cdio, msf_t *p_start_msf, msf_t *p_end_msf)
{ {
if (!p_cdio) return DRIVER_OP_UNINIT; if (!p_cdio) return DRIVER_OP_UNINIT;
if (p_cdio->op.audio_play_msf) { if (p_cdio->op.audio_play_msf) {
return p_cdio->op.audio_play_msf (p_cdio->env, p_msf); return p_cdio->op.audio_play_msf (p_cdio->env, p_start_msf, p_end_msf);
} else { } else {
return DRIVER_OP_UNSUPPORTED; return DRIVER_OP_UNSUPPORTED;
} }

4
lib/driver/_cdio_bsdi.c → lib/driver/bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bsdi.c,v 1.16 2005/03/03 10:32:44 rocky Exp $ $Id: bsdi.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.16 2005/03/03 10:32:44 rocky Exp $"; static const char _rcsid[] = "$Id: bsdi.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>

6
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio_private.h,v 1.18 2005/03/05 09:11:44 rocky Exp $ $Id: cdio_private.h,v 1.19 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -75,7 +75,9 @@ extern "C" {
@param p_env the CD object to be acted upon. @param p_env the CD object to be acted upon.
*/ */
driver_return_code_t (*audio_play_msf) ( void *p_env, msf_t *p_msf ); driver_return_code_t (*audio_play_msf) ( void *p_env,
msf_t *p_start_msf,
msf_t *p_end_msf );
/*! /*!
Playing CD through analog output Playing CD through analog output

18
lib/driver/_cdio_linux.c → lib/driver/gnu_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.36 2005/03/05 09:11:44 rocky Exp $ $Id: gnu_linux.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.36 2005/03/05 09:11:44 rocky Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
#include <string.h> #include <string.h>
@@ -227,11 +227,21 @@ audio_pause_linux (void *p_user_data)
@param p_cdio the CD object to be acted upon. @param p_cdio the CD object to be acted upon.
*/ */
static driver_return_code_t static driver_return_code_t
audio_play_msf_linux (void *p_user_data, msf_t *p_msf) audio_play_msf_linux (void *p_user_data, msf_t *p_start_msf, msf_t *p_end_msf)
{ {
const _img_private_t *p_env = p_user_data; const _img_private_t *p_env = p_user_data;
return ioctl(p_env->gen.fd, CDROMPLAYMSF, p_msf); struct cdrom_msf cdrom_msf;
cdrom_msf.cdmsf_min0 = p_start_msf->m;
cdrom_msf.cdmsf_sec0 = p_start_msf->s;
cdrom_msf.cdmsf_frame0 = p_start_msf->f;
cdrom_msf.cdmsf_min1 = p_end_msf->m;
cdrom_msf.cdmsf_sec1 = p_end_msf->s;
cdrom_msf.cdmsf_frame1 = p_end_msf->f;
return ioctl(p_env->gen.fd, CDROMPLAYMSF, &cdrom_msf);
} }
/*! /*!

4
lib/driver/_cdio_osx.c → lib/driver/osx.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_osx.c,v 1.20 2005/03/01 10:53:15 rocky Exp $ $Id: osx.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
from vcdimager code: from vcdimager code:
@@ -34,7 +34,7 @@
#include "config.h" #include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.20 2005/03/01 10:53:15 rocky Exp $"; static const char _rcsid[] = "$Id: osx.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>

4
lib/driver/_cdio_sunos.c → lib/driver/solaris.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.29 2005/03/03 08:43:39 rocky Exp $ $Id: solaris.c,v 1.1 2005/03/05 09:26:52 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.29 2005/03/03 08:43:39 rocky Exp $"; static const char _rcsid[] = "$Id: solaris.c,v 1.1 2005/03/05 09:26:52 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>